From debb83d4ba8a6d1601db5d532f2bc2e5fe5152bc Mon Sep 17 00:00:00 2001 From: Brittney Exline Date: Tue, 14 Jan 2020 14:03:10 -0500 Subject: [PATCH 1/2] Upgrading edx-enterprise --- requirements/edx/base.txt | 4 ++-- requirements/edx/coverage.txt | 2 +- requirements/edx/development.txt | 12 ++++++------ requirements/edx/testing.txt | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 379245a2c2..7647c84df0 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -101,11 +101,11 @@ edx-ccx-keys==1.0.0 edx-celeryutils==0.3.1 edx-completion==3.0.2 edx-django-oauth2-provider==1.3.5 -edx-django-release-util==0.3.2 +edx-django-release-util==0.3.3 edx-django-sites-extensions==2.4.2 edx-django-utils==2.0.2 edx-drf-extensions==2.4.5 -edx-enterprise==2.0.46 +edx-enterprise==2.0.48 edx-i18n-tools==0.5.0 edx-milestones==0.2.6 edx-oauth2-provider==1.3.1 diff --git a/requirements/edx/coverage.txt b/requirements/edx/coverage.txt index e9c23567e8..b87ed571ec 100644 --- a/requirements/edx/coverage.txt +++ b/requirements/edx/coverage.txt @@ -19,4 +19,4 @@ pygments==2.5.2 # via diff-cover python-dateutil==2.4.0 # via pandas pytz==2019.3 # via pandas six==1.13.0 # via diff-cover -zipp==0.6.0 # via importlib-metadata +zipp==1.0.0 # via importlib-metadata diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index f1075ce3db..d714f2e5f5 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -115,11 +115,11 @@ edx-ccx-keys==1.0.0 edx-celeryutils==0.3.1 edx-completion==3.0.2 edx-django-oauth2-provider==1.3.5 -edx-django-release-util==0.3.2 +edx-django-release-util==0.3.3 edx-django-sites-extensions==2.4.2 edx-django-utils==2.0.2 edx-drf-extensions==2.4.5 -edx-enterprise==2.0.46 +edx-enterprise==2.0.48 edx-i18n-tools==0.5.0 edx-lint==1.3.0 edx-milestones==0.2.6 @@ -144,11 +144,11 @@ enum34==1.1.6 event-tracking==0.3.0 execnet==1.7.1 factory_boy==2.8.1 -faker==3.0.0 +faker==4.0.0 filelock==3.0.12 flake8-polyfill==1.0.2 flake8==3.7.9 -freezegun==0.3.12 +freezegun==0.3.13 fs-s3fs==0.1.8 fs==2.0.18 future==0.18.2 @@ -249,7 +249,7 @@ pyrsistent==0.15.7 # via jsonschema pysrt==1.1.1 pytest-attrib==0.1.3 pytest-cov==2.8.1 -pytest-django==3.7.0 +pytest-django==3.8.0 pytest-forked==1.1.3 pytest-json-report==1.2.1 pytest-metadata==1.8.0 @@ -337,7 +337,7 @@ xblock==1.2.9 xmlsec==1.3.3 xmltodict==0.12.0 xss-utils==0.1.2 -zipp==0.6.0 +zipp==1.0.0 # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 02871343d2..06248a02d8 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -112,11 +112,11 @@ edx-ccx-keys==1.0.0 edx-celeryutils==0.3.1 edx-completion==3.0.2 edx-django-oauth2-provider==1.3.5 -edx-django-release-util==0.3.2 +edx-django-release-util==0.3.3 edx-django-sites-extensions==2.4.2 edx-django-utils==2.0.2 edx-drf-extensions==2.4.5 -edx-enterprise==2.0.46 +edx-enterprise==2.0.48 edx-i18n-tools==0.5.0 edx-lint==1.3.0 edx-milestones==0.2.6 @@ -140,11 +140,11 @@ enum34==1.1.6 event-tracking==0.3.0 execnet==1.7.1 # via pytest-xdist factory_boy==2.8.1 -faker==3.0.0 # via factory-boy +faker==4.0.0 # via factory-boy filelock==3.0.12 # via tox flake8-polyfill==1.0.2 # via radon flake8==3.7.9 # via flake8-polyfill -freezegun==0.3.12 +freezegun==0.3.13 fs-s3fs==0.1.8 fs==2.0.18 future==0.18.2 @@ -238,7 +238,7 @@ pyquery==1.4.1 pysrt==1.1.1 pytest-attrib==0.1.3 pytest-cov==2.8.1 -pytest-django==3.7.0 +pytest-django==3.8.0 pytest-forked==1.1.3 # via pytest-xdist pytest-json-report==1.2.1 pytest-metadata==1.8.0 # via pytest-json-report @@ -315,7 +315,7 @@ xblock==1.2.9 xmlsec==1.3.3 xmltodict==0.12.0 # via moto xss-utils==0.1.2 -zipp==0.6.0 +zipp==1.0.0 # The following packages are considered to be unsafe in a requirements file: # setuptools From 1209dc35b101737c367dcb984aa430028ee5525b Mon Sep 17 00:00:00 2001 From: Brittney Exline Date: Tue, 14 Jan 2020 17:09:17 -0500 Subject: [PATCH 2/2] pinning freezegun because of it breaking a test --- requirements/constraints.txt | 3 +++ requirements/edx/development.txt | 2 +- requirements/edx/testing.txt | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 42c506925b..2067594cea 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -70,3 +70,6 @@ python3-saml==1.5.0 # transifex-client 0.13.5 and 0.13.6 pin six and urllib3 to old versions needlessly # https://github.com/transifex/transifex-client/issues/252 transifex-client==0.13.4 + +# freezegun 0.3.13 is breaking a test: https://github.com/spulec/freezegun/issues/326 +freezegun==0.3.12 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index d714f2e5f5..783fa3b771 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -148,7 +148,7 @@ faker==4.0.0 filelock==3.0.12 flake8-polyfill==1.0.2 flake8==3.7.9 -freezegun==0.3.13 +freezegun==0.3.12 fs-s3fs==0.1.8 fs==2.0.18 future==0.18.2 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 06248a02d8..7ad142e5fd 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -144,7 +144,7 @@ faker==4.0.0 # via factory-boy filelock==3.0.12 # via tox flake8-polyfill==1.0.2 # via radon flake8==3.7.9 # via flake8-polyfill -freezegun==0.3.13 +freezegun==0.3.12 fs-s3fs==0.1.8 fs==2.0.18 future==0.18.2