Merge 1bd1313 into bc88df3

.gitignore

@@ -1,4 +1,5 @@
 *.py[cod]
+.idea
 
 # C extensions
 *.so

.travis.yml

@@ -1,43 +1,38 @@
 language: python
 
-python: 3.6
-
-# Use container based infrastructure
 sudo: false
 
-env:
-  matrix:
-    - TOXENV=flake8
-    - TOXENV=isort
-    - TOXENV=py36-django111-cms35
-    - TOXENV=py36-django110-cms35
-    - TOXENV=py36-django19-cms35
-    - TOXENV=py36-django18-cms35
-    - TOXENV=py36-django111-cms34
-    - TOXENV=py36-django110-cms34
-    - TOXENV=py36-django19-cms34
-    - TOXENV=py36-django18-cms34
-    - TOXENV=py35-django111-cms35
-    - TOXENV=py35-django111-cms34
-    - TOXENV=py34-django111-cms35
-    - TOXENV=py34-django111-cms34
-    - TOXENV=py27-django111-cms35
-    - TOXENV=py27-django111-cms34
-    - TOXENV=py27-django18-cms35
-    - TOXENV=py27-django18-cms34
-
-
-cache:
-  directories:
-    - $HOME/.wheelhouse
+matrix:
+  include:
+    - python: 3.5
+      env: TOX_ENV='flake8'
+    - python: 3.5
+      env: TOX_ENV='isort'
+    # Django 1.11
+    - python: 2.7
+      env: DJANGO='dj111' CMS='cms34'
+    - python: 3.5
+      env: DJANGO='dj111' CMS='cms35'
+    - python: 3.5
+      env: DJANGO='dj111' CMS='cms36'
+    # Django 2.0
+    - python: 3.5
+      env: DJANGO='dj20' CMS='cms36'
+    # Django 2.1
+    - python: 3.5
+      env: DJANGO='dj21' CMS='cms36'
 
 install:
-  - pip install tox
-  - pip install coveralls
+  - pip install tox coveralls
+  - "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PY_VER=py27; fi"
+  - "if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then export PY_VER=py35; fi"
+  - "if [[ ${DJANGO}z != 'z' ]]; then export TOX_ENV=$PY_VER-$DJANGO-$CMS; fi"
 
-script: COMMAND='coverage run' tox -e"$TOXENV"
+script:
+  - COMMAND='coverage run' tox -e"$TOX_ENV"
 
-after_success: coveralls
+after_success:
+  - coveralls
 
 notifications:
   webhooks: http://addons.us-iad-rs.aldryn.io/en/travis-endpoint/

CHANGELOG.rst

@@ -1,27 +1,31 @@
-=========
 Changelog
 =========
 
-
-0.4.2 (unreleased)
+0.5.0 (unreleased)
 ==================
 
-* Fix issue with Django 1.10 and below in AppHookConfigWidget 
+* Added support for Django 2.0 and 2.1
+* Removed support for Django < 1.11
+* Adapted testing infrastructure (tox/travis) to incorporate django CMS 3.6
+* Fixed issue with Django 1.10 and below in AppHookConfigWidget
+
 
 0.4.1 (2018-04-10)
 ==================
 
 * django-appdata>=0.2.0 is now required
 
+
 0.4.0 (2018-03-19)
 ==================
 
-* Add Django 1.11 compatibility
-* Add django CMS 3.5 compatibility
-* Implement django-appdata 0.2 interface
-* Remove south migrations
-* Drop support for django CMS 3.3 and below
-* Allow use setup_config as decorators
+* Added Django 1.11 compatibility
+* Added django CMS 3.5 compatibility
+* Implemented django-appdata 0.2 interface
+* Removed south migrations
+* Dropped support for django CMS 3.3 and below
+* Allowed use setup_config as decorators
+
 
 0.3.3 (2017-03-06)
 ==================
@@ -44,47 +48,47 @@ Changelog
 
 
 0.3.0 (2017-01-06)
-++++++++++++++++++
+==================
 
 * Allowed override AppHookConfigField attributes
-* Drop Django 1.7 and below
-* Drop django CMS 3.1 and below
-* Add Django 1.10 support
+* Dropped Django 1.7 and below
+* Dropped django CMS 3.1 and below
+* Added Django 1.10 support
 
 
 0.2.7 (2016-03-03)
-++++++++++++++++++
+==================
 
 * Set namespace as readonly
-* Add official Django 1.9 support
-* Update readme
-* Use path_info instead of path in resolve
+* Added official Django 1.9 support
+* Updated readme
+* Used path_info instead of path in resolve
 
 
 0.2.6 (2015-10-05)
-++++++++++++++++++
+==================
 
-* Add support for Python 3.5
-* Add support for Django 1.9a1
+* Added support for Python 3.5
+* Added support for Django 1.9a1
 * Code style cleanup and tests
 
 
 0.2.5 (2015-09-25)
-++++++++++++++++++
+==================
 
-* Add support for Django 1.8, django CMS 3.2
+* Added support for Django 1.8, django CMS 3.2
 * AppHookConfigTranslatableManager.get_queryset should use queryset_class
-* Skip overriding admin form if app_config field not present
+* Skipped overriding admin form if app_config field not present
 
 
 0.2.4 (2015-04-20)
-++++++++++++++++++
+==================
 
-* Fixes issue where an apphook could not be changed, once set.
-* Addes optional 'default' kwarg to namespace_url templatetag
+* Fixed issue where an apphook could not be changed, once set.
+* Added optional 'default' kwarg to namespace_url templatetag
 
 
 0.1.0 (2014-01-01)
-++++++++++++++++++
+==================
 
-* First release on PyPI.
+* Released first version on PyPI.

README.rst

@@ -27,40 +27,44 @@ plain namespaces.
 Supported django CMS versions
 -----------------------------
 
-+----------------+-------+-------+-------+
-|                | 0.2.x | 0.3.x | 0.4.x |
-+----------------+-------+-------+-------+
-| django CMS 3.1 |   ✔   |   ✗   |   ✗   |
-+----------------+-------+-------+-------+
-| django CMS 3.2 |   ✔   |   ✔   |   ✗   |
-+----------------+-------+-------+-------+
-| django CMS 3.3 |   ✗   |   ✔   |   ✗   |
-+----------------+-------+-------+-------+
-| django CMS 3.4 |   ✗   |   ✔   |   ✔   |
-+----------------+-------+-------+-------+
-| django CMS 3.5 |   ✗   |   ✗   |   ✔   |
-+----------------+-------+-------+-------+
++----------------+-------+-------+-------+-------+
+|                | 0.2.x | 0.3.x | 0.4.x | 0.5.x |
++----------------+-------+-------+-------+-------+
+| django CMS 3.1 |   ✔   |   ✗   |   ✗   |   ✗   |
++----------------+-------+-------+-------+-------+
+| django CMS 3.2 |   ✔   |   ✔   |   ✗   |   ✗   |
++----------------+-------+-------+-------+-------+
+| django CMS 3.3 |   ✗   |   ✔   |   ✗   |   ✗   |
++----------------+-------+-------+-------+-------+
+| django CMS 3.4 |   ✗   |   ✔   |   ✔   |   ✔   |
++----------------+-------+-------+-------+-------+
+| django CMS 3.5 |   ✗   |   ✗   |   ✔   |   ✔   |
++----------------+-------+-------+-------+-------+
+| django CMS 3.6 |   ✗   |   ✗   |   ✔   |   ✔   |
++----------------+-------+-------+-------+-------+
 
 Supported Django versions
 -------------------------
 
-+----------------+-------+-------+-------+
-|                | 0.2.x | 0.3.x | 0.4.x |
-+----------------+-------+-------+-------+
-| django 1.6     |   ✔   |   ✗   |   ✗   |
-+----------------+-------+-------+-------+
-| django 1.7     |   ✔   |   ✗   |   ✗   |
-+----------------+-------+-------+-------+
-| django 1.8     |   ✔   |   ✔   |   ✔   |
-+----------------+-------+-------+-------+
-| django 1.9     |   ✔   |   ✔   |   ✔   |
-+----------------+-------+-------+-------+
-| django 1.10    |   ✗   |   ✔   |   ✔   |
-+----------------+-------+-------+-------+
-| django 1.11    |   ✗   |   ✔   |   ✔   |
-+----------------+-------+-------+-------+
-| django 2.0     |   ✗   |   ✗   |   ✗   |
-+----------------+-------+-------+-------+
++----------------+-------+-------+-------+-------+
+|                | 0.2.x | 0.3.x | 0.4.x | 0.5.x |
++----------------+-------+-------+-------+-------+
+| django 1.6     |   ✔   |   ✗   |   ✗   |   ✗   |
++----------------+-------+-------+-------+-------+
+| django 1.7     |   ✔   |   ✗   |   ✗   |   ✗   |
++----------------+-------+-------+-------+-------+
+| django 1.8     |   ✔   |   ✔   |   ✔   |   ✗   |
++----------------+-------+-------+-------+-------+
+| django 1.9     |   ✔   |   ✔   |   ✔   |   ✗   |
++----------------+-------+-------+-------+-------+
+| django 1.10    |   ✗   |   ✔   |   ✔   |   ✗   |
++----------------+-------+-------+-------+-------+
+| django 1.11    |   ✗   |   ✔   |   ✔   |   ✔   |
++----------------+-------+-------+-------+-------+
+| django 2.0     |   ✗   |   ✗   |   ✗   |   ✔   |
++----------------+-------+-------+-------+-------+
+| django 2.1     |   ✗   |   ✗   |   ✗   |   ✔   |
++----------------+-------+-------+-------+-------+
 
 
 Implementation step-guide

aldryn_apphooks_config/managers/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, print_function, unicode_literals
 
-from .base import AppHookConfigManager, AppHookConfigQuerySet  # NOQA
+from .base import AppHookConfigManager, AppHookConfigQuerySet  # noqa

aldryn_apphooks_config/tests/test_config.py

@@ -107,7 +107,7 @@ def test_admin_url(self):
         try:
             self.assertEqual(url, reverse('admin:%s_%s_add' % (ExampleConfig._meta.app_label,
                                                                ExampleConfig._meta.model_name)))
-        except AttributeError:  #NOQA
+        except AttributeError:  # noqa
             self.assertEqual(url, reverse('admin:%s_%s_add' % (ExampleConfig._meta.app_label,
                                                                ExampleConfig._meta.module_name)))
 

aldryn_apphooks_config/tests/utils/example/admin.py

@@ -19,6 +19,7 @@ class ArticleAdmin(FrontendEditableAdminMixin,
         'published_default': 'published'
     }
 
+
 admin.site.register(Article, ArticleAdmin)
 
 
@@ -33,4 +34,5 @@ def get_fieldsets(self, request, obj):
     def get_config_fields(self):
         return ['config.property', 'config.published_default']
 
+
 admin.site.register(ExampleConfig, ExampleConfigAdmin)