Merge pull request #135 from django-oscar/update-matrix

Update travis matrix, test with python 3.7

.travis.yml

@@ -4,30 +4,31 @@ sudo: false
 
 language: python
 
-python:
-    - 2.7
-    - 3.5
-    - 3.6
+matrix:
+  include:
+    - { python: "2.7", env: "DJANGO='Django>=1.11,<2.0' OSCAR='django-oscar>1.5,<1.6'" }
+    - { python: "2.7", env: "DJANGO='Django>=1.11,<2.0' OSCAR='django-oscar>1.6,<1.7'" }
 
-env:
-    - DJANGO='Django<2.0' OSCAR='django-oscar<1.6'
-    - DJANGO='Django<2.0' OSCAR='django-oscar<1.7'
-    - DJANGO='Django<2.1' OSCAR='django-oscar<1.7'
-    - DJANGO='Django<2.2' OSCAR='django-oscar<1.7'
+    - { python: "3.5", env: "DJANGO='Django>=1.11,<2.0' OSCAR='django-oscar>1.5,<1.6'" }
+    - { python: "3.5", env: "DJANGO='Django>=1.11,<2.0' OSCAR='django-oscar>1.6,<1.7'" }
+    - { python: "3.5", env: "DJANGO='Django>=2.0,<2.1' OSCAR='django-oscar>1.6,<1.7'" }
+    - { python: "3.5", env: "DJANGO='Django>=2.1,<2.2' OSCAR='django-oscar>1.6,<1.7'" }
 
-matrix:
-  exclude:
-    - python: 2.7
-      env: DJANGO='Django<2.1' OSCAR='django-oscar<1.7'
-    - python: 2.7
-      env: DJANGO='Django<2.2' OSCAR='django-oscar<1.7'
+    - { python: "3.6", env: "DJANGO='Django>=1.11,<2.0' OSCAR='django-oscar>1.5,<1.6'" }
+    - { python: "3.6", env: "DJANGO='Django>=1.11,<2.0' OSCAR='django-oscar>1.6,<1.7'" }
+    - { python: "3.6", env: "DJANGO='Django>=2.0,<2.1' OSCAR='django-oscar>1.6,<1.7'" }
+    - { python: "3.6", env: "DJANGO='Django>=2.1,<2.2' OSCAR='django-oscar>1.6,<1.7'" }
+
+    # see https://github.com/travis-ci/travis-ci/issues/9815
+    - { python: "3.7", env: "DJANGO='Django>=2.0,<2.1' OSCAR='django-oscar>1.6,<1.7'", dist: xenial, sudo: true }
+    - { python: "3.7", env: "DJANGO='Django>=2.1,<2.2' OSCAR='django-oscar>1.6,<1.7'", dist: xenial, sudo: true }
 
 before_install:
     - pip install codecov
 
 install:
     - pip install $OSCAR $DJANGO
-    - if ! [ ${DJANGO} == "Django<2.0" ]; then pip install "djangorestframework>=3.7"; fi
+    - if ! [ ${DJANGO} == "Django>=1.11,<2.0" ]; then pip install "djangorestframework>=3.7"; fi
     - pip freeze
     - make install
 

Makefile

@@ -12,8 +12,8 @@ sandbox: install
 	python sandbox/manage.py migrate
 	python sandbox/manage.py loaddata product productcategory productattribute productclass productattributevalue category option attributeoptiongroup attributeoption stockrecord partner voucher country
 
-test: 
-	python sandbox/manage.py test oscarapi --settings=sandbox.settings.nomigrations
+test:
+	python sandbox/manage.py test oscarapi test --settings=sandbox.settings.nomigrations
 
 coverage:
 	coverage run sandbox/manage.py test oscarapi --settings=sandbox.settings.nomigrations

docs/source/index.rst

@@ -13,18 +13,18 @@ This package provides a RESTful API for `django-oscar`_, it's based on `django-r
 
 Requirements:
 -------------
-This version of Oscar API is compatbile with python 2.7 / 3.5 / 3.6 and the following django versions:
+This version of Oscar API is compatbile with python 2.7 / 3.5 / 3.6 / 3.7 and the following django versions:
 
 Django 1.11:
 ~~~~~~~~~~~~
-- Osccar 1.5.3 / 1.6
+- Osccar 1.5.3 / 1.6.x
 - requires `djangorestframework>=3.4`
 
 Django 2.0 and 2.1:
 ~~~~~~~~~~~~~~~~~~~
-- Oscar 1.6
+- Oscar 1.6.x
 - requires `djangorestframework>=3.7`
-- requires python 3.x
+- requires python >=3.5
 
 See `Travis`_ for the current tested platforms.
 

setup.cfg

@@ -3,3 +3,16 @@ exclude=oscarapi/migrations, oscarapi/tests
 ignore=E731,F405,D1,D400,D401,D205,D300
 application-import-names = oscarapi
 max-line-length=99
+
+[coverage:paths]
+source = oscarapi
+
+[coverage:run]
+omit =
+   *oscarapi/migrations*
+   *oscarapi/settings/*
+   *sandbox/*
+   *oscarapi/tests/*
+   *site-packages*
+   *demosite/*
+