Merge pull request #35 from edx/christina/django-upgrade

Support django 1.11.

.gitignore

@@ -53,4 +53,6 @@ reports/
 coverage/
 htmlcov/
 acceptance_tests/*.png
+.tox/
+
 

.travis.yml

@@ -1,7 +1,16 @@
 language: python
 
 python:
-  - "2.7"
+  - 2.7
+
+env:
+  - TOXENV=django18
+  - TOXENV=django111
+
+matrix:
+  include:
+    - python: 2.7
+      env: TOXENV=quality
 
 before_install:
   - "export DISPLAY=:99.0"
@@ -16,7 +25,6 @@ install:
 
 script:
     - make test
-    - make quality
 
 after_success: coveralls
 

AUTHORS

@@ -1,3 +1,4 @@
 Matt Drayer <[email protected]>
 Zia Fazal <[email protected]>
 Ahsan Ulhaq <[email protected]>
+Christina Roberts <[email protected]>

Makefile

@@ -1,17 +1,15 @@
+all: requirements quality test
+
 clean:
 	coverage erase
 	find . -name '*.pyc' -delete
 
 quality:
-	pep8 --config=.pep8 organizations
-	pylint --rcfile=pylintrc organizations
+	tox -e quality
 
 requirements:
 	pip install -e .    # Install this package and its dependencies
 	pip install -r test-requirements.txt
 
 test:
-	django-admin.py test organizations --settings=test_settings --with-coverage --cover-package=organizations
-	coverage report
-
-.PHONY: clean, quality, requirements, test
+	tox

organizations/__init__.py

@@ -1,4 +1,4 @@
 """
 edx-organizations app initialization module
 """
-__version__ = '0.4.4'  # pragma: no cover
+__version__ = '0.4.5'  # pragma: no cover

setup.py

@@ -23,11 +23,11 @@
     ],
     packages=find_packages(exclude=['tests']),
     install_requires=[
-        'django>=1.8,<1.9',
+        'django>=1.8,<2.0',
         'django-model-utils>=1.4.0',
         'djangorestframework>=3.2.0,<3.4.0',
         'djangorestframework-oauth>=1.1.0,<2.0.0',
-        'edx-django-oauth2-provider>=0.5.0,<1.0.0',
+        'edx-django-oauth2-provider>=1.2.0',
         'edx-drf-extensions>=0.5.1,<1.0.0',
         'edx-opaque-keys>=0.1.2,<1.0.0',
         'Pillow',

test-requirements.txt

@@ -5,3 +5,5 @@ factory-boy>=2.6.0,<3.0.0
 httpretty>=0.8.14,<1.0.0
 nose>=1.3.7,<2.0.0
 pep8>=1.7.0,<2.0.0
+tox>=2.3.1,<3.0.0
+

tox.ini

@@ -0,0 +1,21 @@
+[tox]
+envlist = py27-django{18,111}
+
+[testenv]
+setenv =
+    DJANGO_SETTINGS_MODULE = test_settings
+    PYTHONPATH = {toxinidir}
+
+deps =
+    django18: Django>=1.8,<1.9
+    django111: Django>=1.11,<2.0
+    -rtest-requirements.txt
+
+commands =
+    django-admin.py test organizations --with-coverage --cover-package=organizations
+    coverage report
+
+[testenv:quality]
+commands =
+    pep8 --config=.pep8 organizations
+    pylint --rcfile=pylintrc organizations