Merge pull request #21132 from edx/bexline/fix_dependencies

Fixing dependency issues so that make upgrade can run

requirements/constraints.txt

@@ -52,3 +52,11 @@ pytest<4.6.0
 
 # Pinning to older version of edx-rbac until ENT-2002 is resolved.
 edx-rbac==0.2.1
+
+# transifex-client 0.13.6 requires python-slugify 1.2.6, but the latest version is 3.0.2
+python-slugify==1.2.6
+
+# 1.2.3 breaks unittest in
+# lms.djangoapps.course_api.tests.test_views.CourseListSearchViewTest.test_list_all_with_search_term
+# acceptance.tests.lms.test_lms_course_discovery.CourseDiscoveryTest.test_search
+edx-search==1.2.2

requirements/edx-sandbox/base.txt

@@ -14,13 +14,13 @@ git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2
 cryptography==2.7
 cycler==0.10.0            # via matplotlib
 enum34==1.1.6
-futures==3.2.0 ; python_version == "2.7"  # via tornado
+futures==3.3.0 ; python_version == "2.7"  # via tornado
 ipaddress==1.0.22
 lxml==3.8.0
 markupsafe==1.1.1
 matplotlib==1.5.3
 networkx==1.7
-nltk==3.4.3
+nltk==3.4.4
 numpy==1.6.2
 pycparser==2.19
 pyparsing==2.2.0

requirements/edx-sandbox/shared.txt

@@ -11,7 +11,7 @@ enum34==1.1.6             # via cryptography
 ipaddress==1.0.22         # via cryptography
 lxml==3.8.0
 networkx==1.7
-nltk==3.4.3
+nltk==3.4.4
 pycparser==2.19           # via cffi
 singledispatch==3.4.0.3   # via nltk
 six==1.11.0               # via cryptography, nltk, singledispatch

requirements/edx/base.in

@@ -156,4 +156,4 @@ xblock-utils                        # Provides utilities used by the Discussion
 xss-utils                           # https://github.com/edx/edx-platform/pull/20633 Fix XSS via Translations
 zendesk                             # Python API for the Zendesk customer support system
 geoip2==2.9.0                       # Python API for the GeoIP web services and databases
-edx-bulk-grades                     # LMS REST API for managing bulk grading operations
\ No newline at end of file
+edx-bulk-grades                     # LMS REST API for managing bulk grading operations

requirements/edx/base.txt

@@ -20,10 +20,10 @@
 -e openedx/core/lib/xblock_builtin/xblock_discussion
 -e git+https://github.com/edx-solutions/xblock-google-drive.git@138e6fa0bf3a2013e904a085b9fed77dab7f3f21#egg=xblock-google-drive
 -e common/lib/xmodule
-amqp==1.4.9               # via kombu
+amqp==1.4.9               # via edx-enterprise, kombu
 analytics-python==1.2.9
-aniso8601==7.0.0          # via tincan
-anyjson==0.3.3            # via kombu
+aniso8601==7.0.0          # via edx-enterprise, tincan
+anyjson==0.3.3            # via edx-enterprise, kombu
 appdirs==1.4.3            # via fs
 argh==0.26.2
 asn1crypto==0.24.0
@@ -31,7 +31,7 @@ attrs==17.4.0
 babel==1.3
 backports.functools-lru-cache==1.5  # via soupsieve
 beautifulsoup4==4.7.1     # via pynliner
-billiard==3.3.0.23        # via celery
+billiard==3.3.0.23        # via celery, edx-enterprise
 bleach==2.1.4
 boto3==1.4.8
 boto==2.39.0
@@ -42,7 +42,8 @@ certifi==2019.6.16
 cffi==1.12.3
 chardet==3.0.4
 git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0
-click==7.0                # via user-util
+click==7.0                # via code-annotations, edx-enterprise, user-util
+code-annotations==0.3.1   # via edx-enterprise
 coreapi==2.3.3            # via drf-yasg
 coreschema==0.0.4         # via coreapi, drf-yasg
 git+https://github.com/edx/crowdsourcehinter.git@518605f0a95190949fe77bd39158450639e2e1dc#egg=crowdsourcehinter-xblock==0.1
@@ -98,14 +99,14 @@ edx-ace==0.1.10
 edx-analytics-data-api-client==0.15.3
 edx-bulk-grades==0.1.5
 edx-ccx-keys==0.2.2
-edx-celeryutils==0.2.7
+edx-celeryutils==0.3.0
 edx-completion==2.0.0
 edx-django-oauth2-provider==1.3.5
 edx-django-release-util==0.3.1
 edx-django-sites-extensions==2.3.1
-edx-django-utils==1.0.5
+edx-django-utils==2.0.0
 edx-drf-extensions==2.3.1
-edx-enterprise==1.6.22
+edx-enterprise==1.7.0
 edx-i18n-tools==0.4.8
 edx-milestones==0.2.3
 edx-oauth2-provider==1.2.2
@@ -128,8 +129,8 @@ feedparser==5.1.3
 firebase-token-generator==1.3.2
 fs-s3fs==0.1.8
 fs==2.0.18
-future==0.17.1            # via pyjwkest
-futures==3.2.0 ; python_version == "2.7"  # via django-pipeline, python-swiftclient, s3transfer, xblock-utils
+future==0.17.1            # via edx-celeryutils, edx-enterprise, pyjwkest
+futures==3.3.0 ; python_version == "2.7"  # via django-pipeline, python-swiftclient, s3transfer, xblock-utils
 geoip2==2.9.0
 glob2==0.7
 gunicorn==19.9.0
@@ -141,11 +142,11 @@ inflection==0.3.1         # via drf-yasg
 ipaddress==1.0.22
 isodate==0.6.0            # via python3-saml
 itypes==1.1.0             # via coreapi
-jinja2==2.10.1            # via coreschema
+jinja2==2.10.1            # via code-annotations, coreschema, edx-enterprise
 jmespath==0.9.4           # via boto3, botocore
 jsondiff==1.1.1           # via edx-enterprise
 jsonfield==2.0.2
-kombu==3.0.37             # via celery
+kombu==3.0.37             # via celery, edx-enterprise
 lazy==1.1
 lepl==5.1.3               # via rfc6266-parser
 libsass==0.10.0
@@ -165,7 +166,7 @@ mpmath==1.1.0             # via sympy
 mysqlclient==1.4.2.post1
 networkx==1.7
 newrelic==4.20.1.121
-nltk==3.4.3
+nltk==3.4.4
 nodeenv==1.1.1
 numpy==1.16.4
 oauth2==1.9.0.post1
@@ -174,7 +175,7 @@ git+https://github.com/edx/edx-ora2.git@2.2.3#egg=ora2==2.2.3
 path.py==8.2.1
 pathtools==0.1.2
 paver==1.3.4
-pbr==5.3.1
+pbr==5.4.0
 pdfminer.six==20181108
 piexif==1.0.2
 pillow==6.1.0
@@ -183,7 +184,7 @@ polib==1.1.0              # via edx-i18n-tools
 psutil==1.2.1
 py2neo==3.1.2
 pycontracts==1.7.1
-pycountry==18.12.8
+pycountry==19.7.15
 pycparser==2.19
 pycryptodome==3.8.2       # via pdfminer.six
 pycryptodomex==3.4.7
@@ -199,7 +200,8 @@ python-dateutil==2.4.0
 python-levenshtein==0.12.0
 python-memcached==1.59
 python-openid==2.2.5 ; python_version == "2.7"  # via social-auth-core
-python-swiftclient==3.7.0
+python-slugify==1.2.6     # via code-annotations, edx-enterprise
+python-swiftclient==3.8.0
 python3-saml==1.5.0
 pytz==2019.1
 pyuca==1.1
@@ -212,18 +214,18 @@ requests==2.22.0
 rest-condition==1.0.3
 rfc6266-parser==0.0.5.post2
 ruamel.ordereddict==0.4.13  # via ruamel.yaml
-ruamel.yaml==0.15.97      # via drf-yasg
+ruamel.yaml==0.15.99      # via drf-yasg
 rules==2.0.1
 s3transfer==0.1.13        # via boto3
 sailthru-client==2.2.3
 scipy==1.2.1
-semantic-version==2.6.0   # via edx-drf-extensions
+semantic-version==2.6.0   # via edx-drf-extensions, edx-enterprise
 shapely==1.6.4.post2
-shortuuid==0.5.0          # via edx-django-oauth2-provider
+shortuuid==0.5.0          # via edx-django-oauth2-provider, edx-enterprise
 simplejson==3.16.0        # via mailsnake, sailthru-client, zendesk
 singledispatch==3.4.0.3
 six==1.11.0
-slumber==0.7.1            # via edx-rest-api-client
+slumber==0.7.1            # via edx-enterprise, edx-rest-api-client
 social-auth-app-django==2.1.0
 social-auth-core==1.7.0
 sorl-thumbnail==12.3
@@ -232,17 +234,19 @@ soupsieve==1.9.2          # via beautifulsoup4
 sqlparse==0.3.0
 staff-graded-xblock==0.3
 stevedore==1.30.1
-super-csv==0.5.1
+super-csv==0.6
 sympy==1.4
+testfixtures==6.10.0      # via edx-enterprise
 tincan==0.0.5             # via edx-enterprise
 unicodecsv==0.14.1
+unidecode==1.1.1          # via edx-enterprise
 uritemplate==3.0.0        # via coreapi, drf-yasg
 urllib3==1.23
 user-util==0.1.5
 voluptuous==0.11.5
 watchdog==0.9.0
 web-fragments==0.3.0
-webencodings==0.5.1       # via html5lib
+webencodings==0.5.1       # via edx-enterprise, html5lib
 webob==1.8.5              # via xblock
 wrapt==1.10.5
 git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.1#egg=xblock-drag-and-drop-v2==2.2.1

requirements/edx/development.txt

@@ -53,7 +53,7 @@ chardet==3.0.4
 git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0
 click-log==0.3.2
 click==7.0
-code-annotations==0.3.2
+code-annotations==0.3.1
 colorama==0.4.1
 configparser==3.7.4
 contextlib2==0.5.5
@@ -118,14 +118,14 @@ edx-ace==0.1.10
 edx-analytics-data-api-client==0.15.3
 edx-bulk-grades==0.1.5
 edx-ccx-keys==0.2.2
-edx-celeryutils==0.2.7
+edx-celeryutils==0.3.0
 edx-completion==2.0.0
 edx-django-oauth2-provider==1.3.5
 edx-django-release-util==0.3.1
 edx-django-sites-extensions==2.3.1
-edx-django-utils==1.0.5
+edx-django-utils==2.0.0
 edx-drf-extensions==2.3.1
-edx-enterprise==1.6.22
+edx-enterprise==1.7.0
 edx-i18n-tools==0.4.8
 edx-lint==1.3.0
 edx-milestones==0.2.3
@@ -149,20 +149,20 @@ enum34==1.1.6
 event-tracking==0.2.9
 execnet==1.6.0
 factory_boy==2.8.1
-faker==1.0.7
+faker==2.0.0
 feedparser==5.1.3
 filelock==3.0.12
 firebase-token-generator==1.3.2
 flake8-polyfill==1.0.2
-flake8==3.7.7
-flask==1.0.3
+flake8==3.7.8
+flask==1.1.1
 freezegun==0.3.12
 fs-s3fs==0.1.8
 fs==2.0.18
 funcsigs==1.0.2
 functools32==3.2.3.post2 ; python_version == "2.7"
 future==0.17.1
-futures==3.2.0 ; python_version == "2.7"
+futures==3.3.0 ; python_version == "2.7"
 geoip2==2.9.0
 glob2==0.7
 gunicorn==19.9.0
@@ -211,7 +211,7 @@ mpmath==1.1.0
 mysqlclient==1.4.2.post1
 networkx==1.7
 newrelic==4.20.1.121
-nltk==3.4.3
+nltk==3.4.4
 nodeenv==1.1.1
 numpy==1.16.4
 oauth2==1.9.0.post1
@@ -222,7 +222,7 @@ path.py==8.2.1
 pathlib2==2.3.4
 pathtools==0.1.2
 paver==1.3.4
-pbr==5.3.1
+pbr==5.4.0
 pdfminer.six==20181108
 piexif==1.0.2
 pillow==6.1.0
@@ -235,7 +235,7 @@ py2neo==3.1.2
 py==1.8.0
 pycodestyle==2.5.0
 pycontracts==1.7.1
-pycountry==18.12.8
+pycountry==19.7.15
 pycparser==2.19
 pycryptodome==3.8.2
 pycryptodomex==3.4.7
@@ -267,7 +267,7 @@ python-levenshtein==0.12.0
 python-memcached==1.59
 python-openid==2.2.5 ; python_version == "2.7"
 python-slugify==1.2.6
-python-swiftclient==3.7.0
+python-swiftclient==3.8.0
 python3-saml==1.5.0
 pytz==2019.1
 pyuca==1.1
@@ -281,7 +281,7 @@ requests==2.22.0
 rest-condition==1.0.3
 rfc6266-parser==0.0.5.post2
 ruamel.ordereddict==0.4.13
-ruamel.yaml==0.15.97
+ruamel.yaml==0.15.99
 rules==2.0.1
 s3transfer==0.1.13
 sailthru-client==2.2.3
@@ -307,7 +307,7 @@ sphinxcontrib-websupport==1.1.2  # via sphinx
 sqlparse==0.3.0
 staff-graded-xblock==0.3
 stevedore==1.30.1
-super-csv==0.5.1
+super-csv==0.6
 sympy==1.4
 testfixtures==6.10.0
 text-unidecode==1.2
@@ -322,7 +322,7 @@ unidecode==1.1.1
 uritemplate==3.0.0
 urllib3==1.23
 user-util==0.1.5
-virtualenv==16.6.1
+virtualenv==16.6.2
 voluptuous==0.11.5
 vulture==1.0
 watchdog==0.9.0
@@ -340,7 +340,7 @@ xmlsec==1.3.3
 xmltodict==0.12.0
 xss-utils==0.1.1
 zendesk==1.1.1
-zipp==0.5.1
+zipp==0.5.2
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools==41.0.1        # via caniusepython3, fs, lazy, pytest, python-levenshtein, sphinx

requirements/edx/paver.txt

@@ -16,7 +16,7 @@ mock==1.0.1
 path.py==8.2.1
 pathtools==0.1.2          # via watchdog
 paver==1.3.4
-pbr==5.3.1                # via stevedore
+pbr==5.4.0                # via stevedore
 psutil==1.2.1
 pymongo==2.9.1
 python-memcached==1.59

requirements/edx/testing.txt

@@ -51,7 +51,7 @@ chardet==3.0.4
 git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0
 click-log==0.3.2          # via edx-lint
 click==7.0
-code-annotations==0.3.2
+code-annotations==0.3.1
 colorama==0.4.1           # via radon
 configparser==3.7.4       # via entrypoints, flake8, importlib-metadata, pylint
 contextlib2==0.5.5        # via importlib-metadata
@@ -114,14 +114,14 @@ edx-ace==0.1.10
 edx-analytics-data-api-client==0.15.3
 edx-bulk-grades==0.1.5
 edx-ccx-keys==0.2.2
-edx-celeryutils==0.2.7
+edx-celeryutils==0.3.0
 edx-completion==2.0.0
 edx-django-oauth2-provider==1.3.5
 edx-django-release-util==0.3.1
 edx-django-sites-extensions==2.3.1
-edx-django-utils==1.0.5
+edx-django-utils==2.0.0
 edx-drf-extensions==2.3.1
-edx-enterprise==1.6.22
+edx-enterprise==1.7.0
 edx-i18n-tools==0.4.8
 edx-lint==1.3.0
 edx-milestones==0.2.3
@@ -144,20 +144,20 @@ enum34==1.1.6
 event-tracking==0.2.9
 execnet==1.6.0            # via pytest-xdist
 factory_boy==2.8.1
-faker==1.0.7              # via factory-boy
+faker==2.0.0              # via factory-boy
 feedparser==5.1.3
 filelock==3.0.12          # via tox
 firebase-token-generator==1.3.2
 flake8-polyfill==1.0.2    # via radon
-flake8==3.7.7             # via flake8-polyfill
-flask==1.0.3              # via moto
+flake8==3.7.8             # via flake8-polyfill
+flask==1.1.1              # via moto
 freezegun==0.3.12
 fs-s3fs==0.1.8
 fs==2.0.18
 funcsigs==1.0.2           # via pytest
 functools32==3.2.3.post2 ; python_version == "2.7"  # via flake8
 future==0.17.1
-futures==3.2.0 ; python_version == "2.7"
+futures==3.3.0 ; python_version == "2.7"
 geoip2==2.9.0
 glob2==0.7
 gunicorn==19.9.0
@@ -204,7 +204,7 @@ mpmath==1.1.0
 mysqlclient==1.4.2.post1
 networkx==1.7
 newrelic==4.20.1.121
-nltk==3.4.3
+nltk==3.4.4
 nodeenv==1.1.1
 numpy==1.16.4
 oauth2==1.9.0.post1
@@ -215,7 +215,7 @@ path.py==8.2.1
 pathlib2==2.3.4           # via importlib-metadata, pytest, pytest-django
 pathtools==0.1.2
 paver==1.3.4
-pbr==5.3.1
+pbr==5.4.0
 pdfminer.six==20181108
 piexif==1.0.2
 pillow==6.1.0
@@ -227,7 +227,7 @@ py2neo==3.1.2
 py==1.8.0                 # via pytest, tox
 pycodestyle==2.5.0
 pycontracts==1.7.1
-pycountry==18.12.8
+pycountry==19.7.15
 pycparser==2.19
 pycryptodome==3.8.2
 pycryptodomex==3.4.7
@@ -257,8 +257,8 @@ python-dateutil==2.4.0
 python-levenshtein==0.12.0
 python-memcached==1.59
 python-openid==2.2.5 ; python_version == "2.7"
-python-slugify==1.2.6     # via code-annotations, transifex-client
-python-swiftclient==3.7.0
+python-slugify==1.2.6
+python-swiftclient==3.8.0
 python3-saml==1.5.0
 pytz==2019.1
 pyuca==1.1
@@ -272,7 +272,7 @@ requests==2.22.0
 rest-condition==1.0.3
 rfc6266-parser==0.0.5.post2
 ruamel.ordereddict==0.4.13
-ruamel.yaml==0.15.97
+ruamel.yaml==0.15.99
 rules==2.0.1
 s3transfer==0.1.13
 sailthru-client==2.2.3
@@ -294,7 +294,7 @@ soupsieve==1.9.2
 sqlparse==0.3.0
 staff-graded-xblock==0.3
 stevedore==1.30.1
-super-csv==0.5.1
+super-csv==0.6
 sympy==1.4
 testfixtures==6.10.0
 text-unidecode==1.2       # via faker
@@ -305,11 +305,11 @@ tox==3.13.2
 transifex-client==0.13.6
 typing==3.7.4             # via flake8
 unicodecsv==0.14.1
-unidecode==1.1.1          # via python-slugify
+unidecode==1.1.1
 uritemplate==3.0.0
 urllib3==1.23
 user-util==0.1.5
-virtualenv==16.6.1        # via tox
+virtualenv==16.6.2        # via tox
 voluptuous==0.11.5
 watchdog==0.9.0
 wcwidth==0.1.7            # via pytest
@@ -326,7 +326,7 @@ xmlsec==1.3.3
 xmltodict==0.12.0         # via moto
 xss-utils==0.1.1
 zendesk==1.1.1
-zipp==0.5.1               # via importlib-metadata
+zipp==0.5.2               # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools==41.0.1        # via caniusepython3, fs, lazy, pytest, python-levenshtein