Update for CMS 33, Django 1.9 and Python 3.5 (#216)

* Remove .in files pip-compile happily accepts .txt files too now. * Update Dj1.6 requirements. Rename .txt files Rename for consistency with related projects * Update Travis matrix * Re-pin CMS requirement in setup.py * Update Tox config for Py35, Dj19, CMS33 * Update changelog * Bump to 1.1.1 * Disable FE tests As agreed, these will be disabled until they are rebuilt with PhantomJS for CMS 3.3.
aldryn · May 20, 2016 · d54e4d2 · d54e4d2
1 parent 00e401a
commit d54e4d2
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 105 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,14 +22,20 @@ env:
     #                different Python ENVs if possible.
     - TOXENV=flake8
 
+    - TOXENV=py35-dj19-cms33
     - TOXENV=py35-dj19-cms32
+    - TOXENV=py34-dj19-cms33
     - TOXENV=py34-dj19-cms32
+    - TOXENV=py27-dj19-cms33
     - TOXENV=py27-dj19-cms32
 
+    - TOXENV=py35-dj18-cms33
     - TOXENV=py35-dj18-cms32
     - TOXENV=py35-dj18-cms31
+    - TOXENV=py34-dj18-cms33
     - TOXENV=py34-dj18-cms32
     - TOXENV=py34-dj18-cms31
+    - TOXENV=py27-dj18-cms33
     - TOXENV=py27-dj18-cms32
     - TOXENV=py27-dj18-cms31
 
@@ -43,13 +49,14 @@ env:
     - TOXENV=py27-dj16-cms32
     - TOXENV=py27-dj16-cms31
     - TOXENV=py27-dj16-cms30
+    - TOXENV=py26-dj16-cms32
     - TOXENV=py26-dj16-cms31
     - TOXENV=py26-dj16-cms30
 
-    - FRONTEND=1 TOXENV=py35-dj19-cms32-fe
-    - FRONTEND=1 TOXENV=py34-dj18-cms32-fe
-    - FRONTEND=1 TOXENV=py27-dj17-cms32-fe
-    - FRONTEND=1 TOXENV=py26-dj16-cms32-fe
+#    - FRONTEND=1 TOXENV=py35-dj19-cms32-fe
+#    - FRONTEND=1 TOXENV=py34-dj18-cms32-fe
+#    - FRONTEND=1 TOXENV=py27-dj17-cms32-fe
+#    - FRONTEND=1 TOXENV=py26-dj16-cms32-fe
 
     - TOXENV=doctest
 

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,13 +1,16 @@
 CHANGELOG
 =========
 
-1.1.1 (2016-xx-xx)
--------------------
+1.1.1 (2016-05-20)
+------------------
+
+* Changed form field width in admin
+* Updated tests to include Python 3.5, Django 1.9 and CMS 3.3 combinations
+* Improved documentation regarding appconfig during upgrades.
 
-* Changes form field width in admin
 
 1.1.0 (2016-03-10)
--------------------
+------------------
 
 * Add stripped default django templates to `/aldryn_events/templates`
 * Remove unused render_placeholder configs

diff --git a/aldryn_events/__init__.py b/aldryn_events/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '1.1.0'
+__version__ = '1.1.1'
 
 default_app_config = 'aldryn_events.apps.AldrynEvents'
 

diff --git a/setup.py b/setup.py
@@ -14,7 +14,7 @@
     'django-appconf',
     'django-appdata<0.2',
     'django-bootstrap3',
-    'django-cms>=3.0.12',
+    'django-cms>=3.0.12,<3.4',
     'django-extended-choices',
     'django-filer',
     'django-parler>=1.6.1',

diff --git a/test_requirements/django_1.6.txt b/test_requirements/django_1.6.txt
@@ -0,0 +1,9 @@
+Django>=1.6,<1.7
+South
+
+# Special fork of django-formtools that doesn't force Django 1.7
+--extra-index-url https://devpi.divio.ch/aldryn/extras/+simple/
+django-formtools==1.0.0.1
+django-mptt>0.6, <0.8
+
+-r base.txt
diff --git a/test_requirements/django_17.txt → test_requirements/django_1.7.txt b/test_requirements/django_17.txt → test_requirements/django_1.7.txt
diff --git a/test_requirements/django_18.txt → test_requirements/django_1.8.txt b/test_requirements/django_18.txt → test_requirements/django_1.8.txt
diff --git a/test_requirements/django_19.txt → test_requirements/django_1.9.txt b/test_requirements/django_19.txt → test_requirements/django_1.9.txt
diff --git a/test_requirements/django_16.in b/test_requirements/django_16.in
diff --git a/test_requirements/django_16.txt b/test_requirements/django_16.txt
diff --git a/test_requirements/django_17.in b/test_requirements/django_17.in
diff --git a/test_requirements/django_18.in b/test_requirements/django_18.in
diff --git a/test_requirements/django_19.in b/test_requirements/django_19.in
diff --git a/tox.ini b/tox.ini
@@ -2,8 +2,8 @@
 toxworkdir = {homedir}/.toxenvs/aldryn-events
 envlist =
     flake8
-    py{35,34,27}-dj19-cms32
-    py{35,34,27}-dj18-cms{32,31}
+    py{35,34,27}-dj19-cms{33,32}
+    py{35,34,27}-dj18-cms{33,32,31}
     py{34,27}-dj17-cms{32,31,30}
     py{27,26}-dj16-cms{32,31,30}
     doctest
@@ -32,20 +32,24 @@ commands =
     fe: sleep 60
     fe: gulp tests:integration
 deps=
-    dj16: -rtest_requirements/django_16.txt
-    dj17: -rtest_requirements/django_17.txt
-    dj18: -rtest_requirements/django_18.txt
-    dj19: -rtest_requirements/django_19.txt
+    dj16: -rtest_requirements/django_1.6.txt
+    dj17: -rtest_requirements/django_1.7.txt
+    dj18: -rtest_requirements/django_1.8.txt
+    dj19: -rtest_requirements/django_1.9.txt
     py26: unittest2
+    py26: django-filer<1.2.0
     py26-fe: ordereddict
     py{26,27}: importlib
-    cms32: django-cms>=3.2.1,<3.3
     dj{19,18,17}-cms32: django-reversion<1.11
-    cms31: django-cms>3.1.1,<3.2
     dj{18,17}-cms31: django-reversion<1.10
-    cms30: django-cms<3.1
     dj17-cms30: django-reversion<1.9
     dj16: django-reversion<1.9
+    cms30: django-cms<3.1
+    cms31: django-cms>3.1.1,<3.2
+    cms32: django-cms>=3.2.1,<3.3
+    cms33: https://github.com/divio/django-cms/archive/develop.zip
+    cms33: https://github.com/divio/djangocms-text-ckeditor/archive/develop.zip
+
 basepython =
     py26: python2.6
     py27: python2.7