adapted test matrix (#57)

Author: FinalAngel

.travis.yml

@@ -2,20 +2,29 @@ language: python
 
 sudo: false
 
-env:
-  - TOX_ENV=flake8
-  # Django 1.11
-  - TOX_ENV=py27-dj111-cms35
-  - TOX_ENV=py35-dj111-cms35
-  # Django 2.0
-  - TOX_ENV=py35-dj20-cms35
-  - TOX_ENV=py35-dj20-cms40
-  # Django 2.1
-  - TOX_ENV=py35-dj21-cms35
-  - TOX_ENV=py35-dj21-cms40
+matrix:
+  include:
+    - python: 3.5
+      env: TOX_ENV='flake8'
+    # 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 coverage
+  - "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:
   - tox -e $TOX_ENV

CHANGELOG.rst

@@ -2,6 +2,13 @@
 Changelog
 =========
 
+2.1.1 (unreleased)
+==================
+
+* Fixed test matrix
+* Exclude ``tests`` folder from release build
+
+
 2.1.0 (2018-11-15)
 ==================
 

setup.py

@@ -4,7 +4,6 @@
 
 from djangocms_snippet import __version__
 
-
 REQUIREMENTS = [
     'django-cms>=3.4.5',
 ]
@@ -39,7 +38,7 @@
     url='https://github.com/divio/djangocms-snippet',
     license='BSD',
     long_description=open('README.rst').read(),
-    packages=find_packages(),
+    packages=find_packages(exclude=['tests']),
     include_package_data=True,
     zip_safe=False,
     install_requires=REQUIREMENTS,

tests/requirements.txt

@@ -1,5 +1,5 @@
 # requirements from setup.py
 # other requirements
-djangocms-helper>=0.9.2,<0.10
+djangocms-helper
 tox
 coverage

tests/settings.py

@@ -3,14 +3,14 @@
 
 HELPER_SETTINGS = {
     'INSTALLED_APPS': [],
-    'ALLOWED_HOSTS': ['localhost'],
     'CMS_LANGUAGES': {
         1: [{
             'code': 'en',
             'name': 'English',
         }]
     },
     'LANGUAGE_CODE': 'en',
+    'ALLOWED_HOSTS': ['localhost'],
 }
 
 def run():

tox.ini

@@ -1,13 +1,12 @@
 [tox]
 envlist =
     flake8
-    py{27,34,35,36}-dj111-cms{34,35}
-    py{34,35,36}-dj20-cms{35,36,40}
-    py{35,36}-dj21-cms{35,36,40}
+    py{27,34,35,36}-dj111-cms{34,35,36}
+    py{34,35,36}-dj20-cms36
+    py{35,36}-dj21-cms36
 
 skip_missing_interpreters=True
 
-
 [testenv]
 deps =
     -r{toxinidir}/tests/requirements.txt
@@ -16,7 +15,7 @@ deps =
     dj21: Django>=2.1,<2.2
     cms34: django-cms>=3.4,<3.5
     cms35: django-cms>=3.5,<3.6
-    cms40: https://github.com/divio/django-cms/archive/release/4.0.x.zip
+    cms36: https://github.com/divio/django-cms/archive/release/3.6.x.zip
 commands =
     {envpython} --version
     {env:COMMAND:coverage} erase