From 14c642dab60c31b3486c4e58e8123c03521bbc32 Mon Sep 17 00:00:00 2001 From: Feanil Patel Date: Fri, 7 Jun 2019 15:10:40 -0400 Subject: [PATCH] Add a script requirements file to upgrade automation. The xblock counting script had a requirements file that was not previously being tracked and had an out of date version of requests. Add it to the `upgrade` make target so that it stays up to date. --- Makefile | 3 ++- requirements/edx/base.txt | 3 +++ requirements/edx/development.txt | 3 +++ requirements/edx/paver.txt | 3 +++ requirements/edx/testing.txt | 3 +++ scripts/xblock/requirements.in | 1 + scripts/xblock/requirements.txt | 12 +++++++++++- 7 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 scripts/xblock/requirements.in diff --git a/Makefile b/Makefile index 82e31bf149..c9fb8b2987 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,8 @@ REQ_FILES = \ requirements/edx-sandbox/base \ requirements/edx/base \ requirements/edx/testing \ - requirements/edx/development + requirements/edx/development \ + scripts/xblock/requirements upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade upgrade: ## update the pip requirements files to use the latest releases satisfying our constraints diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index ce59f16b52..07d76d760c 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -246,3 +246,6 @@ xblock-utils==1.2.1 xblock==1.2.2 xmlsec==1.3.3 # via python3-saml zendesk==1.1.1 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools==41.0.1 # via fs, lazy, python-levenshtein diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index b24bbb4cdd..1600d2412a 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -335,3 +335,6 @@ xmlsec==1.3.3 xmltodict==0.12.0 zendesk==1.1.1 zipp==0.5.1 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools==41.0.1 # via caniusepython3, fs, lazy, pytest, python-levenshtein, sphinx, tox diff --git a/requirements/edx/paver.txt b/requirements/edx/paver.txt index 3bde400daa..8e4a1674bc 100644 --- a/requirements/edx/paver.txt +++ b/requirements/edx/paver.txt @@ -27,3 +27,6 @@ stevedore==1.30.1 urllib3==1.23 # via requests watchdog==0.9.0 wrapt==1.10.5 + +# The following packages are considered to be unsafe in a requirements file: +# setuptools==41.0.1 # via lazy diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 615ddc295e..2b0f422441 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -321,3 +321,6 @@ xmlsec==1.3.3 xmltodict==0.12.0 # via moto zendesk==1.1.1 zipp==0.5.1 # 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, tox diff --git a/scripts/xblock/requirements.in b/scripts/xblock/requirements.in new file mode 100644 index 0000000000..f2293605cf --- /dev/null +++ b/scripts/xblock/requirements.in @@ -0,0 +1 @@ +requests diff --git a/scripts/xblock/requirements.txt b/scripts/xblock/requirements.txt index 78cbc8441e..a983f56144 100644 --- a/scripts/xblock/requirements.txt +++ b/scripts/xblock/requirements.txt @@ -1 +1,11 @@ -requests==2.10.0 +# +# This file is autogenerated by pip-compile +# To update, run: +# +# make upgrade +# +certifi==2019.3.9 # via requests +chardet==3.0.4 # via requests +idna==2.8 # via requests +requests==2.22.0 +urllib3==1.25.3 # via requests