Merge pull request #46 from edx/feanil/unpin_drf

Unpin DRF and test with multiple versions of it.
openedx · Apr 23, 2019 · 5c23806 · 5c23806
2 parents 57644e3 + 01ac81d
commit 5c23806
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,22 @@
 language: python
 python:
 - 2.7
-- 3.5
+- 3.6
 env:
-- TOXENV=django18
-- TOXENV=django111
+- TOXENV=django111-drf37
+- TOXENV=django111-drf38
+- TOXENV=django111-drf39
+- TOXENV=django111-drflatest
+- TOXENV=py36-django20-drflatest
 matrix:
   include:
-  - python: 3.5
+  - python: 3.6
     env: TOXENV=quality
-  - python: 3.5
+  - python: 3.6
     env: TOXENV=django20
+  exclude:
+  - python: 2.7
+    env: TOXENV=py36-django20-drflatest
 cache:
 - pip
 before_install:

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -13,6 +13,12 @@ Change Log
 
 Unreleased
 ~~~~~~~~~~
+[2.0.0] - 2019-04-23
+--------------------
+* Unpin django-rest-framework requirements. This is a potentially **breaking change** if people were
+  relying on this package to ensure the correct version of djangorestframework was being installed.
+* Remove the AUTHORS file and references to it.
+
 [1.0.2] - 2019-03-11
 --------------------
 

diff --git a/Makefile b/Makefile
@@ -49,8 +49,9 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
 	pip-compile --upgrade -o requirements/test.txt requirements/test.in
 	pip-compile --upgrade -o requirements/travis.txt requirements/travis.in
 	# Let tox control the Django version for tests
-	sed '/^django==/d' requirements/test.txt > requirements/test.tmp
-	mv requirements/test.tmp requirements/test.txt
+	sed -i.tmp '/^[d|D]jango==/d' requirements/test.txt
+	sed -i.tmp '/^djangorestframework==/d' requirements/test.txt
+	rm requirements/test.txt.tmp
 
 quality: ## check coding style with pycodestyle and pylint
 	tox -e quality

diff --git a/completion/__init__.py b/completion/__init__.py
@@ -5,6 +5,6 @@
 from __future__ import unicode_literals
 
 
-__version__ = '1.0.3'
+__version__ = '2.0.0'
 
 default_app_config = 'completion.apps.CompletionAppConfig'  # pylint: disable=invalid-name
diff --git a/requirements/base.in b/requirements/base.in
@@ -3,7 +3,7 @@
 
 Django>=1.8,<2.0          # Web application framework
 django-model-utils        # Provides TimeStampedModel abstract base class
-djangorestframework>=3.2.0,<3.7.0  # REST API framework
+djangorestframework>=3.2.0  # REST API framework
 edx-opaque-keys[django]   # Create and introspect course and xblock identities
 edx-drf-extensions>=1.11.0,<3.0.0 # Provides JWT authentication
 pytz                      # Time zone support

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -26,7 +26,7 @@ django-model-utils==3.1.2
 django-waffle==0.16.0     # via edx-django-utils, edx-drf-extensions
 django==1.11.20
 djangorestframework-jwt==1.11.0  # via edx-drf-extensions
-djangorestframework==3.6.4
+djangorestframework==3.9.2
 edx-django-utils==1.0.3   # via edx-drf-extensions
 edx-drf-extensions==2.2.0
 edx-i18n-tools==0.4.8
@@ -40,7 +40,7 @@ freezegun==0.3.11
 fs==2.4.4                 # via xblock
 funcsigs==1.0.2           # via mock, pytest
 future==0.17.1            # via backports.os, pyjwkest
-futures==3.2.0 ; python_version == "2.7"
+futures==3.2.0 ; python_version == "2.7"  # via caniusepython3, isort
 idna==2.8                 # via requests
 importlib-metadata==0.9   # via path.py
 inflect==2.1.0            # via jinja2-pluralize
@@ -74,7 +74,7 @@ pylint-celery==0.3        # via edx-lint
 pylint-django==0.7.2      # via edx-lint
 pylint-plugin-utils==0.5  # via pylint-celery, pylint-django
 pylint==1.7.6             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
-pymongo==3.7.2            # via edx-opaque-keys
+pymongo==3.8.0            # via edx-opaque-keys
 pyparsing==2.4.0          # via packaging
 pytest-cov==2.6.1
 pytest-django==3.4.8

diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -19,7 +19,7 @@ django-model-utils==3.1.2
 django-waffle==0.16.0     # via edx-django-utils, edx-drf-extensions
 django==1.11.20
 djangorestframework-jwt==1.11.0  # via edx-drf-extensions
-djangorestframework==3.6.4
+djangorestframework==3.9.2
 doc8==0.8.0
 docutils==0.14            # via doc8, readme-renderer, restructuredtext-lint, sphinx
 edx-django-utils==1.0.3   # via edx-drf-extensions
@@ -52,7 +52,7 @@ pycryptodomex==3.8.1      # via pyjwkest
 pygments==2.3.1           # via readme-renderer, sphinx
 pyjwkest==1.3.2           # via edx-drf-extensions
 pyjwt==1.7.1              # via djangorestframework-jwt
-pymongo==3.7.2            # via edx-opaque-keys
+pymongo==3.8.0            # via edx-opaque-keys
 pyparsing==2.4.0          # via packaging
 pytest-cov==2.6.1
 pytest-django==3.4.8

diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -24,7 +24,7 @@ django-model-utils==3.1.2
 django-waffle==0.16.0     # via edx-django-utils, edx-drf-extensions
 django==1.11.20
 djangorestframework-jwt==1.11.0  # via edx-drf-extensions
-djangorestframework==3.6.4
+djangorestframework==3.9.2
 edx-django-utils==1.0.3   # via edx-drf-extensions
 edx-drf-extensions==2.2.0
 edx-lint==1.1.2
@@ -36,7 +36,7 @@ freezegun==0.3.11
 fs==2.4.4                 # via xblock
 funcsigs==1.0.2           # via mock, pytest
 future==0.17.1            # via backports.os, pyjwkest
-futures==3.2.0 ; python_version == "2.7"
+futures==3.2.0 ; python_version == "2.7"  # via caniusepython3, isort
 idna==2.8                 # via requests
 ipaddress==1.0.22         # via faker
 isort==4.3.17
@@ -62,7 +62,7 @@ pylint-celery==0.3        # via edx-lint
 pylint-django==0.7.2      # via edx-lint
 pylint-plugin-utils==0.5  # via pylint-celery, pylint-django
 pylint==1.7.6             # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
-pymongo==3.7.2            # via edx-opaque-keys
+pymongo==3.8.0            # via edx-opaque-keys
 pyparsing==2.4.0          # via packaging
 pytest-cov==2.6.1
 pytest-django==3.4.8

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -15,7 +15,6 @@ ddt==1.2.1
 django-model-utils==3.1.2
 django-waffle==0.16.0     # via edx-django-utils, edx-drf-extensions
 djangorestframework-jwt==1.11.0  # via edx-drf-extensions
-djangorestframework==3.6.4
 edx-django-utils==1.0.3   # via edx-drf-extensions
 edx-drf-extensions==2.2.0
 edx-opaque-keys[django]==0.4.4
@@ -41,7 +40,7 @@ py==1.8.0                 # via pytest
 pycryptodomex==3.8.1      # via pyjwkest
 pyjwkest==1.3.2           # via edx-drf-extensions
 pyjwt==1.7.1              # via djangorestframework-jwt
-pymongo==3.7.2            # via edx-opaque-keys
+pymongo==3.8.0            # via edx-opaque-keys
 pytest-cov==2.6.1
 pytest-django==3.4.8
 pytest==4.4.1             # via pytest-cov, pytest-django

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py27,py35}-django{18,111},py35-django20
+envlist = {py27,py36}-django{111}-drf{37,38,39,latest},py36-django20-drflatest
 
 [doc8]
 max-line-length = 120
@@ -26,6 +26,10 @@ deps =
     django18: Django>=1.8,<1.9
     django111: Django>=1.11,<2.0
     django20: Django>=2.0,<2.1
+    drf37: djangorestframework<3.8.0
+    drf38: djangorestframework<3.9.0
+    drf39: djangorestframework<4.0.0
+    drflatest: djangorestframework
     -r{toxinidir}/requirements/test.txt
 commands =
     pytest {posargs}