From 247cffa84619fe67895dc356a3510587c139e47d Mon Sep 17 00:00:00 2001 From: Chris Pappas <christopappas@users.noreply.github.com> Date: Mon, 3 Feb 2020 12:39:21 -0500 Subject: [PATCH] Bumping edx-enterprise version (#23003) * Bumping edx-enterprise version * Running make upgrade to bump edx-enterprise * contraining a package * fix * adding yet another constraint --- requirements/constraints.txt | 6 ++++++ requirements/edx/base.txt | 12 ++++++------ requirements/edx/development.txt | 16 ++++++++-------- requirements/edx/django.txt | 2 +- requirements/edx/paver.txt | 2 +- requirements/edx/pip-tools.txt | 2 +- requirements/edx/testing.txt | 10 +++++----- 7 files changed, 28 insertions(+), 22 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 60a1be9a196..198656189d5 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -73,3 +73,9 @@ zipp==1.0.0 # jsonfield2 3.1.0 requires Django 2.2 jsonfield2==3.0.3 + +# django-storages==1.9 breaks contentstore imports +django-storages==1.8 + +# edx-when==0.7.0 has a breaking change +edx-when==0.6.0 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index e898f022e43..f659d6d2183 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -86,7 +86,7 @@ django-storages==1.8 django-user-tasks==0.3.0 django-waffle==0.18.0 django-webpack-loader==0.6.0 -django==1.11.27 +django==1.11.28 djangorestframework-jwt==1.11.0 git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1 djangorestframework-xml==1.4.0 # via edx-enterprise @@ -104,9 +104,9 @@ edx-completion==3.0.2 edx-django-oauth2-provider==1.3.5 edx-django-release-util==0.3.6 edx-django-sites-extensions==2.4.3 -edx-django-utils==2.0.3 +edx-django-utils==2.0.4 edx-drf-extensions==2.4.5 -edx-enterprise==2.3.0 +edx-enterprise==2.3.3 edx-i18n-tools==0.5.0 edx-milestones==0.2.6 edx-oauth2-provider==1.3.1 @@ -189,8 +189,8 @@ py2neo==3.1.2 pycontracts==1.8.12 pycountry==19.8.18 pycparser==2.19 -pycryptodome==3.9.4 # via pdfminer.six -pycryptodomex==3.9.4 +pycryptodome==3.9.6 # via pdfminer.six +pycryptodomex==3.9.6 pygments==2.5.2 pyjwkest==1.3.2 pyjwt==1.5.2 @@ -243,7 +243,7 @@ uritemplate==3.0.1 # via coreapi, drf-yasg urllib3==1.25.8 user-util==0.1.5 voluptuous==0.11.7 -watchdog==0.10.0 +watchdog==0.10.1 web-fragments==0.3.1 webencodings==0.5.1 # via bleach, html5lib webob==1.8.6 # via xblock diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 193e8956f0b..1745575451e 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -97,7 +97,7 @@ django-storages==1.8 django-user-tasks==0.3.0 django-waffle==0.18.0 django-webpack-loader==0.6.0 -django==1.11.27 +django==1.11.28 djangorestframework-jwt==1.11.0 git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4bc70c03de308a277197c#egg=djangorestframework-oauth==1.1.1 djangorestframework-xml==1.4.0 @@ -115,9 +115,9 @@ edx-completion==3.0.2 edx-django-oauth2-provider==1.3.5 edx-django-release-util==0.3.6 edx-django-sites-extensions==2.4.3 -edx-django-utils==2.0.3 +edx-django-utils==2.0.4 edx-drf-extensions==2.4.5 -edx-enterprise==2.3.0 +edx-enterprise==2.3.3 edx-i18n-tools==0.5.0 edx-lint==1.3.0 edx-milestones==0.2.6 @@ -216,7 +216,7 @@ pbr==5.4.4 pdfminer.six==20200124 piexif==1.1.3 pillow==7.0.0 -pip-tools==4.4.0 +pip-tools==4.4.1 pkgconfig==1.5.1 pluggy==0.13.1 polib==1.1.0 @@ -227,8 +227,8 @@ pycodestyle==2.5.0 pycontracts==1.8.12 pycountry==19.8.18 pycparser==2.19 -pycryptodome==3.9.4 -pycryptodomex==3.9.4 +pycryptodome==3.9.6 +pycryptodomex==3.9.6 pyflakes==2.1.1 pygments==2.5.2 pyinotify==0.9.6 @@ -317,8 +317,8 @@ urllib3==1.25.8 user-util==0.1.5 virtualenv==16.7.9 voluptuous==0.11.7 -vulture==1.2 -watchdog==0.10.0 +vulture==1.3 +watchdog==0.10.1 wcwidth==0.1.8 web-fragments==0.3.1 webencodings==0.5.1 diff --git a/requirements/edx/django.txt b/requirements/edx/django.txt index a574d8c0929..aa60c9bf4d4 100644 --- a/requirements/edx/django.txt +++ b/requirements/edx/django.txt @@ -1,2 +1,2 @@ django-oauth-toolkit==1.1.3 -django==1.11.27 +django==1.11.28 diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index 7278fcca6ac..3ab72ff1542 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -24,6 +24,6 @@ requests==2.22.0 six==1.14.0 # via edx-opaque-keys, libsass, mock, paver, python-memcached, stevedore stevedore==1.31.0 urllib3==1.25.8 # via requests -watchdog==0.10.0 +watchdog==0.10.1 wrapt==1.11.2 zipp==1.0.0 # via importlib-metadata diff --git a/requirements/edx/pip-tools.txt b/requirements/edx/pip-tools.txt index a7902815056..7f4416af58c 100644 --- a/requirements/edx/pip-tools.txt +++ b/requirements/edx/pip-tools.txt @@ -5,5 +5,5 @@ # make upgrade # click==7.0 # via pip-tools -pip-tools==4.4.0 +pip-tools==4.4.1 six==1.14.0 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 2c53f7bf944..1501b23d59b 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -111,9 +111,9 @@ edx-completion==3.0.2 edx-django-oauth2-provider==1.3.5 edx-django-release-util==0.3.6 edx-django-sites-extensions==2.4.3 -edx-django-utils==2.0.3 +edx-django-utils==2.0.4 edx-drf-extensions==2.4.5 -edx-enterprise==2.3.0 +edx-enterprise==2.3.3 edx-i18n-tools==0.5.0 edx-lint==1.3.0 edx-milestones==0.2.6 @@ -217,8 +217,8 @@ pycodestyle==2.5.0 pycontracts==1.8.12 pycountry==19.8.18 pycparser==2.19 -pycryptodome==3.9.4 -pycryptodomex==3.9.4 +pycryptodome==3.9.6 +pycryptodomex==3.9.6 pyflakes==2.1.1 # via flake8 pygments==2.5.2 pyjwkest==1.3.2 @@ -295,7 +295,7 @@ urllib3==1.25.8 user-util==0.1.5 virtualenv==16.7.9 # via tox voluptuous==0.11.7 -watchdog==0.10.0 +watchdog==0.10.1 wcwidth==0.1.8 # via pytest web-fragments==0.3.1 webencodings==0.5.1 -- GitLab