Merge pull request #54 from jonathan-s/support-django-22

Support django 2.2
django-cms · Feb 26, 2020 · 9a9f302 · 9a9f302
2 parents 4dcd63e + 228fe70
commit 9a9f302
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -24,6 +24,18 @@ py36default: &py36default
    - run: docker load -i /tmp/images/py36.tar || true
    - run: docker run py36 tox -e $CIRCLE_STAGE
 
+py37default: &py37default
+  docker:
+    - image: circleci/python:3.7
+  steps:
+   - setup_remote_docker:
+       docker_layer_caching: false
+   - checkout
+   - attach_workspace:
+       at: /tmp/images
+   - run: docker load -i /tmp/images/py37.tar || true
+   - run: docker run py37 tox -e $CIRCLE_STAGE
+
 py35_requires: &py35_requires
   requires:
     - py35_base
@@ -32,6 +44,10 @@ py36_requires: &py36_requires
   requires:
     - py36_base
 
+py37_requires: &py37_requires
+  requires:
+    - py37_base
+
 jobs:
   py35_base:
     docker:
@@ -59,24 +75,55 @@ jobs:
       - persist_to_workspace:
          root: images
          paths: py36.tar
+  py37_base:
+    docker:
+      - image: circleci/python:3.7
+    steps:
+      - checkout
+      - setup_remote_docker:
+          docker_layer_caching: false
+      - run: docker build -f .circleci/Dockerfile --build-arg PYTHON_VERSION=3.7 -t py37 .
+      - run: mkdir images
+      - run: docker save -o images/py37.tar py37
+      - persist_to_workspace:
+         root: images
+         paths: py37.tar
 
   flake8:
     <<: *py35default
   isort:
     <<: *py35default
   py36-dj111-sqlite-cms40-default:
     <<: *py36default
+
+
   py35-dj20-sqlite-cms40-default:
     <<: *py35default
+  py35-dj20-sqlite-cms40-versioning:
+    <<: *py35default
   py36-dj20-sqlite-cms40-default:
     <<: *py36default
+
   py36-dj21-sqlite-cms40-default:
     <<: *py36default
-  py35-dj20-sqlite-cms40-versioning:
-    <<: *py35default
   py36-dj21-sqlite-cms40-versioning:
     <<: *py36default
 
+  py35-dj22-sqlite-cms40-default:
+    <<: *py35default
+  py35-dj22-sqlite-cms40-versioning:
+    <<: *py35default
+  py36-dj22-sqlite-cms40-default:
+    <<: *py36default
+  py36-dj22-sqlite-cms40-versioning:
+    <<: *py36default
+  py37-dj22-sqlite-cms40-default:
+    <<: *py37default
+  py37-dj22-sqlite-cms40-versioning:
+    <<: *py37default
+
+
+
 #######################
 
 workflows:
@@ -85,6 +132,7 @@ workflows:
     jobs:
       - py35_base
       - py36_base
+      - py37_base
       - flake8:
           requires:
             - py35_base
@@ -97,15 +145,34 @@ workflows:
       - py35-dj20-sqlite-cms40-default:
           requires:
             - py35_base
+      - py35-dj20-sqlite-cms40-versioning:
+          requires:
+            - py35_base
       - py36-dj20-sqlite-cms40-default:
           requires:
             - py36_base
+
+
       - py36-dj21-sqlite-cms40-default:
           requires:
             - py36_base
-      - py35-dj20-sqlite-cms40-versioning:
+      - py36-dj21-sqlite-cms40-versioning:
+          requires:
+            - py36_base
+
+
+      - py35-dj22-sqlite-cms40-versioning:
           requires:
             - py35_base
-      - py36-dj21-sqlite-cms40-versioning:
+      - py36-dj22-sqlite-cms40-default:
+          requires:
+            - py36_base
+      - py36-dj22-sqlite-cms40-versioning:
           requires:
             - py36_base
+      - py37-dj22-sqlite-cms40-default:
+          requires:
+            - py37_base
+      - py37-dj22-sqlite-cms40-versioning:
+          requires:
+            - py37_base
diff --git a/setup.py b/setup.py
@@ -20,14 +20,19 @@
     'Framework :: Django :: 1.11',
     'Framework :: Django :: 2.0',
     'Framework :: Django :: 2.1',
+    'Framework :: Django :: 2.2',
 ]
 
 INSTALL_REQUIREMENTS = [
-    'Django>=1.11,<2.2',
+    'Django>=1.11,<3.0',
     'django-parler>=1.4',
     'django-cms'
 ]
 
+TEST_REQUIRE = [
+    'djangocms-versioning'
+]
+
 setup(
     name='djangocms-alias',
     author='Divio AG',
@@ -43,8 +48,10 @@
     packages=find_packages(),
     include_package_data=True,
     zip_safe=False,
+    tests_require=TEST_REQUIRE,
     test_suite='test_settings.run',
     dependency_links=[
         'http://github.com/divio/django-cms/tarball/release/4.0.x#egg=django-cms-4.0.0',
+        'http://github.com/divio/djangocms-versioning/tarball/master#egg=djangocms-versioning-0.0.23',
     ]
 )
diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -2,5 +2,4 @@ coverage
 djangocms_helper
 flake8
 isort
-https://github.com/divio/djangocms-versioning/archive/master.zip
 pyflakes>=2.1.1
diff --git a/tox.ini b/tox.ini
@@ -2,7 +2,7 @@
 envlist =
     flake8
     isort
-    py{34,35,36}-dj{111,20,21}-sqlite-cms40-{default,versioning}
+    py{35,36,37}-dj{111,20,21,22}-sqlite-cms40-{default,versioning}
 
 skip_missing_interpreters=True
 
@@ -14,13 +14,15 @@ deps =
 
     dj111: Django>=1.11,<2.0
     dj20: Django>=2.0,<2.1
+    dj21: Django>=2.1,<2.2
+    dj22: Django>=2.2,<3.0
 
     cms40: https://github.com/divio/django-cms/archive/release/4.0.x.zip
 
 basepython =
-    py34: python3.4
     py35: python3.5
     py36: python3.6
+    py37: python3.7
 
 commands =
     {envpython} --version