Added support for CMS 3.7 and Django 2.2 (django-cms#168)

* Added support for Django 2.2 * Fixed django 2.2 version * Fixed Django 2.2 range * Fixed version in changelog * Fixed travis * Fixed travis * Updated readme * Fix typo * updates * update tox * fix tests
kapt-labs · Apr 16, 2019 · 74aaaf9 · 74aaaf9
1 parent 666b565
commit 74aaaf9
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@
 .idea/
 .project/
 .pydevproject/
+.vscode/
 .settings/
 .tox/
 __pycache__/

diff --git a/.travis.yml b/.travis.yml
@@ -15,19 +15,28 @@ matrix:
       env: DJANGO='dj111' CMS='cms35'
     - python: 3.5
       env: DJANGO='dj111' CMS='cms36'
-    # Django 2.0
-    - python: 3.5
-      env: DJANGO='dj20' CMS='cms36'
+    - python: 3.6
+      env: DJANGO='dj111' CMS='cms37'
     # Django 2.1
     - python: 3.6
       env: DJANGO='dj21' CMS='cms36'
+    - python: 3.6
+      env: DJANGO='dj21' CMS='cms37'
+    # Django 2.2
+    - python: 3.6
+      env: DJANGO='dj22' CMS='cms37'
+    - python: 3.7
+      env: DJANGO='dj22' CMS='cms37'
+      dist: xenial
+      sudo: true
 
 install:
   - pip install coverage isort tox
   - "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PY_VER=py27; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then export PY_VER=py34; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then export PY_VER=py35; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then export PY_VER=py36; fi"
+  - "if [[ $TRAVIS_PYTHON_VERSION == '3.7' ]]; then export PY_VER=py37; fi"
   - "if [[ ${DJANGO}z != 'z' ]]; then export TOX_ENV=$PY_VER-$DJANGO-$CMS; fi"
 
 script:

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,9 +3,11 @@ Changelog
 =========
 
 
-2.3.2 (unreleased)
+2.4.0 (unreleased)
 ==================
 
+* Added support for Django 2.2 and django CMS 3.7
+* Removed support for Django 2.0
 * Extended test matrix
 * Added isort and adapted imports
 * Adapted code base to align with other supported addons

diff --git a/README.rst b/README.rst
@@ -125,7 +125,7 @@ You can run tests by executing::
 
 .. |python| image:: https://img.shields.io/badge/python-2.7%20%7C%203.4+-blue.svg
     :target: https://pypi.org/project/djangocms-link/
-.. |django| image:: https://img.shields.io/badge/django-1.11%20%7C%202.0%20%7C%202.1-blue.svg
+.. |django| image:: https://img.shields.io/badge/django-1.11%20%7C%202.1%20%7C%202.2-blue.svg
     :target: https://www.djangoproject.com/
 .. |djangocms| image:: https://img.shields.io/badge/django%20CMS-3.4%2B-blue.svg
     :target: https://www.django-cms.org/
diff --git a/setup.py b/setup.py
@@ -17,17 +17,23 @@
     'Intended Audience :: Developers',
     'License :: OSI Approved :: BSD License',
     'Operating System :: OS Independent',
-    'Framework :: Django',
-    'Framework :: Django :: 1.11',
-    'Framework :: Django :: 2.0',
-    'Framework :: Django :: 2.1',
     'Programming Language :: Python',
     'Programming Language :: Python :: 2',
     'Programming Language :: Python :: 2.7',
     'Programming Language :: Python :: 3',
     'Programming Language :: Python :: 3.4',
     'Programming Language :: Python :: 3.5',
     'Programming Language :: Python :: 3.6',
+    'Programming Language :: Python :: 3.7',
+    'Framework :: Django',
+    'Framework :: Django :: 1.11',
+    'Framework :: Django :: 2.1',
+    'Framework :: Django :: 2.2',
+    # 'Framework :: Django CMS',
+    # 'Framework :: Django CMS :: 3.4',
+    # 'Framework :: Django CMS :: 3.5',
+    # 'Framework :: Django CMS :: 3.6',
+    # 'Framework :: Django CMS :: 3.7',
     'Topic :: Internet :: WWW/HTTP',
     'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
     'Topic :: Software Development',

diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -1,5 +1,5 @@
 # requirements from setup.py
-django-select2>=5.11
+django-select2>=5.11,<7 # 7 works in Django 2+
 djangocms-text-ckeditor
 html5lib<0.99999999
 # other requirements

diff --git a/tox.ini b/tox.ini
@@ -3,8 +3,8 @@ envlist =
     flake8
     isort
     py{27,34,35,36}-dj111-cms{34,35,36}
-    py{34,35,36}-dj20-cms36
-    py{35,36}-dj21-cms36
+    py{27,35,36}-dj111-cms37
+    py{35,36,37}-dj{21,22}-cms{36,37}
 
 skip_missing_interpreters=True
 
@@ -41,11 +41,12 @@ known_django = django
 deps =
     -r{toxinidir}/tests/requirements.txt
     dj111: Django>=1.11,<2.0
-    dj20: Django>=2.0,<2.1
     dj21: Django>=2.1,<2.2
+    dj22: Django>=2.2,<3.0
     cms34: django-cms>=3.4,<3.5
     cms35: django-cms>=3.5,<3.6
-    cms36: https://github.com/divio/django-cms/archive/release/3.6.x.zip
+    cms36: django-cms>=3.6,<3.7
+    cms37: https://github.com/divio/django-cms/archive/release/3.7.x.zip
 commands =
     {envpython} --version
     {env:COMMAND:coverage} erase