From a379dddc1ea40dc9e770220e4c848053f5b825f6 Mon Sep 17 00:00:00 2001 From: Alex Dusenbery <adusenbery@edx.org> Date: Mon, 23 Sep 2019 10:53:11 -0400 Subject: [PATCH] Remove faker==2.0.1 constraint; upgrade edx-bulk-grades to 0.6.2 --- requirements/constraints.txt | 5 ----- requirements/edx/base.txt | 12 ++++++------ requirements/edx/development.txt | 14 +++++++------- requirements/edx/testing.txt | 14 +++++++------- 4 files changed, 20 insertions(+), 25 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index ec59b54dd2d..71b3d85ab89 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -76,8 +76,3 @@ numpy<1.17.0 # jsondiff==1.1.1 (from moto==1.2.0->-r requirements/edx/testing.in (line 33)) # jsondiff==1.2.0 (from -r requirements/edx/base.txt (line 146)) jsondiff==1.1.1 - -# faker 2.0.2 pinned text-unidecode==1.3 because 1.2 had a license that was incompatible. -# but python-slugify pinned text-unidecode==1.2. So pin faker to an earlier versions so -# we can agree on text-unidecode. -faker==2.0.1 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 9556517cb7d..e0df8b36d13 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -44,7 +44,7 @@ chardet==3.0.4 git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2eb18#egg=chem==1.0.0 click==7.0 # via code-annotations, user-util code-annotations==0.3.2 # via edx-enterprise -contextlib2==0.5.5 +contextlib2==0.6.0 coreapi==2.3.3 # via drf-yasg coreschema==0.0.4 # via coreapi, drf-yasg git+https://github.com/edx/crowdsourcehinter.git@a7ffc85b134b7d8909bf1fefd23dbdb8eb28e467#egg=crowdsourcehinter-xblock==0.2 @@ -97,7 +97,7 @@ docutils==0.15.2 # via botocore drf-yasg==1.16 edx-ace==0.1.10 edx-analytics-data-api-client==0.15.3 -edx-bulk-grades==0.6.1 +edx-bulk-grades==0.6.2 edx-ccx-keys==1.0.0 edx-celeryutils==0.3.0 edx-completion==2.0.0 @@ -113,7 +113,7 @@ edx-oauth2-provider==1.3.1 edx-opaque-keys[django]==2.0.0 edx-organizations==2.1.0 edx-proctoring-proctortrack==1.0.5 -edx-proctoring==2.0.8 +edx-proctoring==2.0.9 edx-rbac==1.0.3 # via edx-enterprise edx-rest-api-client==1.9.2 edx-search==1.2.2 @@ -200,7 +200,7 @@ 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-slugify==3.0.3 # via code-annotations +python-slugify==3.0.4 # via code-annotations python-swiftclient==3.8.1 python3-saml==1.5.0 pytz==2019.2 @@ -235,10 +235,10 @@ soupsieve==1.9.3 # via beautifulsoup4 sqlparse==0.3.0 staff-graded-xblock==0.5 stevedore==1.31.0 -super-csv==0.9.2 +super-csv==0.9.3 sympy==1.4 testfixtures==6.10.0 # via edx-enterprise -text-unidecode==1.2 # via python-slugify +text-unidecode==1.3 # via python-slugify tincan==0.0.5 # via edx-enterprise unicodecsv==0.14.1 uritemplate==3.0.0 # via coreapi, drf-yasg diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index dfac5d88e26..fbc5de20c2c 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -60,7 +60,7 @@ code-annotations==0.3.2 colorama==0.4.1 commonmark==0.9.0 # via recommonmark configparser==4.0.2 -contextlib2==0.5.5 +contextlib2==0.6.0 cookies==2.2.1 coreapi==2.3.3 coreschema==0.0.4 @@ -121,7 +121,7 @@ docutils==0.15.2 drf-yasg==1.16 edx-ace==0.1.10 edx-analytics-data-api-client==0.15.3 -edx-bulk-grades==0.6.1 +edx-bulk-grades==0.6.2 edx-ccx-keys==1.0.0 edx-celeryutils==0.3.0 edx-completion==2.0.0 @@ -138,7 +138,7 @@ edx-oauth2-provider==1.3.1 edx-opaque-keys[django]==2.0.0 edx-organizations==2.1.0 edx-proctoring-proctortrack==1.0.5 -edx-proctoring==2.0.8 +edx-proctoring==2.0.9 edx-rbac==1.0.3 edx-rest-api-client==1.9.2 edx-search==1.2.2 @@ -154,7 +154,7 @@ enum34==1.1.6 event-tracking==0.2.9 execnet==1.7.1 factory_boy==2.8.1 -faker==2.0.1 +faker==2.0.2 faulthandler==3.1 ; python_version == "2.7" feedparser==5.1.3 filelock==3.0.12 @@ -273,7 +273,7 @@ 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==3.0.3 +python-slugify==3.0.4 python-swiftclient==3.8.1 python3-saml==1.5.0 pytz==2019.2 @@ -315,10 +315,10 @@ sphinxcontrib-websupport==1.1.2 # via sphinx sqlparse==0.3.0 staff-graded-xblock==0.5 stevedore==1.31.0 -super-csv==0.9.2 +super-csv==0.9.3 sympy==1.4 testfixtures==6.10.0 -text-unidecode==1.2 +text-unidecode==1.3 tincan==0.0.5 toml==0.10.0 tox-battery==0.5.1 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index e02d55c9ab1..9b30ec6d724 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -58,7 +58,7 @@ click==7.0 code-annotations==0.3.2 colorama==0.4.1 # via radon configparser==4.0.2 # via entrypoints, flake8, importlib-metadata, pylint -contextlib2==0.5.5 +contextlib2==0.6.0 cookies==2.2.1 # via moto coreapi==2.3.3 coreschema==0.0.4 @@ -117,7 +117,7 @@ docutils==0.15.2 drf-yasg==1.16 edx-ace==0.1.10 edx-analytics-data-api-client==0.15.3 -edx-bulk-grades==0.6.1 +edx-bulk-grades==0.6.2 edx-ccx-keys==1.0.0 edx-celeryutils==0.3.0 edx-completion==2.0.0 @@ -134,7 +134,7 @@ edx-oauth2-provider==1.3.1 edx-opaque-keys[django]==2.0.0 edx-organizations==2.1.0 edx-proctoring-proctortrack==1.0.5 -edx-proctoring==2.0.8 +edx-proctoring==2.0.9 edx-rbac==1.0.3 edx-rest-api-client==1.9.2 edx-search==1.2.2 @@ -149,7 +149,7 @@ enum34==1.1.6 event-tracking==0.2.9 execnet==1.7.1 # via pytest-xdist factory_boy==2.8.1 -faker==2.0.1 # via factory-boy +faker==2.0.2 # via factory-boy faulthandler==3.1 ; python_version == "2.7" # via pytest-faulthandler feedparser==5.1.3 filelock==3.0.12 # via tox @@ -264,7 +264,7 @@ 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==3.0.3 +python-slugify==3.0.4 python-swiftclient==3.8.1 python3-saml==1.5.0 pytz==2019.2 @@ -302,10 +302,10 @@ soupsieve==1.9.3 sqlparse==0.3.0 staff-graded-xblock==0.5 stevedore==1.31.0 -super-csv==0.9.2 +super-csv==0.9.3 sympy==1.4 testfixtures==6.10.0 -text-unidecode==1.2 +text-unidecode==1.3 tincan==0.0.5 toml==0.10.0 # via tox tox-battery==0.5.1 -- GitLab