Merge pull request #54 from edx/feanil/fix_for_python3

Feanil/fix for python3
openedx · May 3, 2019 · 4db63b5 · 4db63b5
2 parents 469f782 + 67c3d4a
commit 4db63b5
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 8 deletions.
diff --git a/requirements/base.in b/requirements/base.in
@@ -1,3 +1,5 @@
+-c constraints.txt
+
 django
 django-model-utils>=1.4.0
 djangorestframework>=3.2.0

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -11,15 +11,15 @@ 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-oauth==1.1.0
-djangorestframework==3.9.2
+djangorestframework==3.9.3
 edx-django-oauth2-provider==1.3.5
 edx-django-utils==1.0.3   # via edx-drf-extensions
 edx-drf-extensions==2.2.0
 edx-opaque-keys==0.4.4
 future==0.17.1            # via pyjwkest
 idna==2.8                 # via requests
 newrelic==4.18.0.118      # via edx-django-utils
-pbr==5.1.3                # via stevedore
+pbr==5.2.0                # via stevedore
 pillow==6.0.0
 psutil==1.2.1             # via edx-django-utils, edx-drf-extensions
 pycryptodomex==3.8.1      # via pyjwkest
@@ -34,4 +34,4 @@ semantic-version==2.6.0   # via edx-drf-extensions
 shortuuid==0.5.0          # via edx-django-oauth2-provider
 six==1.12.0               # via edx-drf-extensions, edx-opaque-keys, pyjwkest, python-dateutil, stevedore
 stevedore==1.30.1         # via edx-opaque-keys
-urllib3==1.24.2           # via requests
+urllib3==1.24.3           # via requests
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -0,0 +1,12 @@
+# Version constraints for pip installation.
+#
+# This file doesn't install any packages. It specifies version constraints
+# that will be applied if a package is needed.
+#
+# When pinning something here, please provide an explanation of why.  Ideally,
+# link to other information that will help people in the future to remove the
+# pin when possible.  Writing an issue against the offending project and
+# linking to it here is good.
+
+# This package is a backport from python 3 that can only be installed in python 2.7
+futures ; python_version == "2.7"
diff --git a/requirements/test.in b/requirements/test.in
@@ -1,3 +1,5 @@
+-c constraints.txt
+
 -r base.txt
 
 ddt>=0.8.0,<1.1.1

diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@ def is_requirement(line):
     Return True if the requirement line is a package requirement;
     that is, it is not blank, a comment, a URL, or an included file.
     """
-    return line and not line.startswith(('-r', '#', '-e', 'git+'))
+    return line and not line.startswith(('-r', '#', '-e', 'git+', '-c'))
 
 
 setup(

diff --git a/test-requirements.txt b/test-requirements.txt
@@ -27,12 +27,12 @@ filelock==3.0.10          # via tox
 future==0.17.1
 httpretty==0.9.6
 idna==2.8
-isort==4.3.17             # via pylint
+isort==4.3.18             # via pylint
 lazy-object-proxy==1.3.1  # via astroid
 mccabe==0.6.1             # via pylint
 newrelic==4.18.0.118
 nose==1.3.7
-pbr==5.1.3
+pbr==5.2.0
 pep8==1.7.1
 pillow==6.0.0
 pluggy==0.9.0             # via tox
@@ -57,6 +57,6 @@ stevedore==1.30.1
 text-unidecode==1.2       # via faker
 toml==0.10.0              # via tox
 tox==3.9.0
-urllib3==1.24.2
-virtualenv==16.4.3        # via tox
+urllib3==1.24.3
+virtualenv==16.5.0        # via tox
 wrapt==1.11.1             # via astroid