Merge pull request #18 from wesokes/develop

tox

.travis.yml

@@ -1,20 +1,45 @@
 language: python
+
+sudo: false
+
 python:
-  - '3.5'
-  - '3.6'
+  - "2.7"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+
 env:
-  global:
-    - DB=postgres
   matrix:
-    - DJANGO=">=1.11,<2.0"
-    - DJANGO=">=2.0,<2.1"
+    - DJANGO=1.11
+    - DJANGO=2.0
+    - DJANGO=master
+
+addons:
+  postgresql: '9.5'
+
+matrix:
+  include:
+    - { python: "3.6", env: TOXENV=flake8 }
+
+  exclude:
+    - { python: "2.7", env: DJANGO=master }
+    - { python: "2.7", env: DJANGO=2.0 }
+    - { python: "3.4", env: DJANGO=master }
+
+  allow_failures:
+    - env: DJANGO=master
+
 install:
-  - pip install -q coverage flake8 Django$DJANGO django-nose>=1.4
-  - pip install -r requirements/docs.txt
+    - pip install tox-travis
+
 before_script:
   - psql -c 'CREATE DATABASE django_kmatch;' -U postgres
+
 script:
-  - flake8 .
-  - coverage run setup.py test
-  - coverage report --fail-under=100
-  - python setup.py build_sphinx
+    - tox
+
+after_success:
+  coveralls
+
+notifications:
+    email: false

django_kmatch/urls.py

@@ -0,0 +1,2 @@
+
+urlpatterns = []  # pragma: no cover

django_kmatch/version.py

@@ -1 +1 @@
-__version__ = '1.0.0'
+__version__ = '1.1.0'

docs/release_notes.rst

@@ -1,6 +1,10 @@
 Release Notes
 =============
 
+v1.1.0
+------
+* Add tox to support more versions
+
 v1.0.0
 ------
 * Remove python 2.7 support

requirements/requirements-testing.txt

@@ -0,0 +1,5 @@
+coverage
+django-nose
+flake8
+mock
+psycopg2

settings.py

@@ -13,22 +13,17 @@ def configure_settings():
         if test_db is None:
             db_config = {
                 'ENGINE': 'django.db.backends.postgresql_psycopg2',
-                'NAME': 'ambition_dev',
-                'USER': 'ambition_dev',
-                'PASSWORD': 'ambition_dev',
-                'HOST': 'localhost'
+                'NAME': 'ambition',
+                'USER': 'ambition',
+                'PASSWORD': 'ambition',
+                'HOST': 'db'
             }
         elif test_db == 'postgres':
             db_config = {
                 'ENGINE': 'django.db.backends.postgresql_psycopg2',
                 'USER': 'postgres',
                 'NAME': 'django_kmatch',
             }
-        elif test_db == 'sqlite':
-            db_config = {
-                'ENGINE': 'django.db.backends.sqlite3',
-                'NAME': 'django_kmatch',
-            }
         else:
             raise RuntimeError('Unsupported test DB {0}'.format(test_db))
 

setup.py

@@ -29,6 +29,8 @@ def get_version():
     packages=find_packages(),
     classifiers=[
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Intended Audience :: Developers',
@@ -38,7 +40,7 @@ def get_version():
     ],
     license='MIT',
     install_requires=[
-        'jsonfield>=0.9.20',
+        'jsonfield==0.9.23',
         'Django>=1.11',
         'kmatch>=0.1.7'
     ],

tox.ini

@@ -0,0 +1,28 @@
+[tox]
+envlist =
+    flake8
+    py{27,34,35,36}-django111
+    py{34,35,36}-django20
+    py{35,36}-djangomaster
+
+[testenv]
+setenv =
+    DB = postgres
+deps =
+    django111: Django>=1.11,<2.0
+    django20: Django>=2.0,<2.1
+    djangomaster: https://github.com/django/django/archive/master.tar.gz
+    -rrequirements/requirements-testing.txt
+commands =
+    coverage run setup.py test
+    coverage report --fail-under=100
+
+[testenv:flake8]
+deps = flake8
+commands = flake8 django_kmatch
+
+[travis:env]
+DJANGO =
+    1.11: django111
+    2.0: django20
+    master: djangomaster