From 1b86c9205455305544c26dfab9adbce82bc15408 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Tue, 31 May 2022 09:11:31 -0400 Subject: [PATCH 1/3] fix: Install pip and pip-tools in upgrade script --- requirements/pip.in | 7 +++++++ requirements/pip.txt | 14 ++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 requirements/pip.in create mode 100644 requirements/pip.txt diff --git a/requirements/pip.in b/requirements/pip.in new file mode 100644 index 00000000..715478cd --- /dev/null +++ b/requirements/pip.in @@ -0,0 +1,7 @@ +-c constraints.txt +# Core dependencies for installing other packages + +pip +setuptools +wheel + diff --git a/requirements/pip.txt b/requirements/pip.txt new file mode 100644 index 00000000..e4b31332 --- /dev/null +++ b/requirements/pip.txt @@ -0,0 +1,14 @@ +# +# This file is autogenerated by pip-compile with python 3.8 +# To update, run: +# +# pip-compile --allow-unsafe --output-file=requirements/pip.txt requirements/pip.in +# +wheel==0.37.1 + # via -r requirements/pip.in + +# The following packages are considered to be unsafe in a requirements file: +pip==22.1.2 + # via -r requirements/pip.in +setuptools==62.3.2 + # via -r requirements/pip.in From b908ee7d2d2f3ab5e68a0de2047cfb290d859357 Mon Sep 17 00:00:00 2001 From: Jawayria Date: Mon, 20 Jun 2022 14:13:26 +0500 Subject: [PATCH 2/3] fix: upgrade --- Makefile | 11 ++++++++++- requirements/base.txt | 6 +++--- requirements/ci.txt | 10 +++++----- requirements/common_constraints.txt | 25 ++++++++++++++++++++++++ requirements/dev.txt | 30 ++++++++++++++--------------- requirements/pip-tools.txt | 4 ++-- requirements/pip.txt | 8 +++----- requirements/quality.txt | 14 +++++++------- requirements/test.txt | 12 ++++++------ 9 files changed, 76 insertions(+), 44 deletions(-) create mode 100644 requirements/common_constraints.txt diff --git a/Makefile b/Makefile index e43a772b..0ab9ede1 100644 --- a/Makefile +++ b/Makefile @@ -86,11 +86,20 @@ install: clean ## install the package to the active Python's site-packages # Define PIP_COMPILE_OPTS=-v to get more information during make upgrade. PIP_COMPILE = pip-compile --rebuild --upgrade $(PIP_COMPILE_OPTS) +COMMON_CONSTRAINTS_TXT=requirements/common_constraints.txt +.PHONY: $(COMMON_CONSTRAINTS_TXT) +$(COMMON_CONSTRAINTS_TXT): + wget -O "$(@)" https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt || touch "$(@)" + upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade -upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in +upgrade: $(COMMON_CONSTRAINTS_TXT) + ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in pip install -qr requirements/pip-tools.txt # Make sure to compile files after any other files they include! + $(PIP_COMPILE) -o requirements/pip.txt requirements/pip.in $(PIP_COMPILE) -o requirements/pip-tools.txt requirements/pip-tools.in + pip install -qr requirements/pip.txt + pip install -qr requirements/pip-tools.txt $(PIP_COMPILE) -o requirements/base.txt requirements/base.in $(PIP_COMPILE) -o requirements/test.txt requirements/test.in $(PIP_COMPILE) -o requirements/quality.txt requirements/quality.in diff --git a/requirements/base.txt b/requirements/base.txt index fedc2fac..19cc9a06 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,15 +4,15 @@ # # make upgrade # -certifi==2021.10.8 +certifi==2022.6.15 # via requests charset-normalizer==2.0.12 # via requests idna==3.3 # via requests -lxml==4.8.0 +lxml==4.9.0 # via -r requirements/base.in -requests==2.27.1 +requests==2.28.0 # via -r requirements/base.in urllib3==1.26.9 # via requests diff --git a/requirements/ci.txt b/requirements/ci.txt index 3a451c23..8c4b8866 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -4,19 +4,19 @@ # # make upgrade # -certifi==2021.10.8 +certifi==2022.6.15 # via requests charset-normalizer==2.0.12 # via requests codecov==2.1.12 # via -r requirements/ci.in -coverage==6.3.2 +coverage==6.4.1 # via # -r requirements/ci.in # codecov distlib==0.3.4 # via virtualenv -filelock==3.6.0 +filelock==3.7.1 # via # tox # virtualenv @@ -30,9 +30,9 @@ pluggy==1.0.0 # via tox py==1.11.0 # via tox -pyparsing==3.0.8 +pyparsing==3.0.9 # via packaging -requests==2.27.1 +requests==2.28.0 # via codecov six==1.16.0 # via diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt new file mode 100644 index 00000000..cca3ccd3 --- /dev/null +++ b/requirements/common_constraints.txt @@ -0,0 +1,25 @@ +# A central location for most common version constraints +# (across edx repos) for pip-installation. +# +# Similar to other constraint files this file doesn't install any packages. +# It specifies version constraints that will be applied if a package is needed. +# When pinning something here, please provide an explanation of why it is a good +# idea to pin this package across all edx repos, Ideally, link to other information +# that will help people in the future to remove the pin when possible. +# Writing an issue against the offending project and linking to it here is good. +# +# Note: Changes to this file will automatically be used by other repos, referencing +# this file from Github directly. It does not require packaging in edx-lint. + + +# using LTS django version +Django<4.0 + +# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process. +# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html +elasticsearch<7.14.0 + +setuptools<60 + +# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected +django-simple-history==3.0.0 diff --git a/requirements/dev.txt b/requirements/dev.txt index 5d965114..27a27f25 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -14,7 +14,7 @@ bleach==5.0.0 # via readme-renderer bump2version==1.0.1 # via -r requirements/dev.in -certifi==2021.10.8 +certifi==2022.6.15 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -24,7 +24,7 @@ charset-normalizer==2.0.12 # -r requirements/ci.txt # -r requirements/quality.txt # requests -click==8.1.2 +click==8.1.3 # via # -r requirements/pip-tools.txt # -r requirements/quality.txt @@ -34,7 +34,7 @@ codecov==2.1.12 # via -r requirements/ci.txt commonmark==0.9.1 # via rich -coverage[toml]==6.3.2 +coverage[toml]==6.4.1 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -46,7 +46,7 @@ distlib==0.3.4 # virtualenv docutils==0.18.1 # via readme-renderer -filelock==3.6.0 +filelock==3.7.1 # via # -r requirements/ci.txt # tox @@ -58,7 +58,7 @@ idna==3.3 # -r requirements/ci.txt # -r requirements/quality.txt # requests -importlib-metadata==4.11.3 +importlib-metadata==4.11.4 # via # keyring # twine @@ -66,9 +66,9 @@ iniconfig==1.1.1 # via # -r requirements/quality.txt # pytest -keyring==23.5.0 +keyring==23.6.0 # via twine -lxml==4.8.0 +lxml==4.9.0 # via -r requirements/quality.txt mccabe==0.6.1 # via @@ -92,9 +92,9 @@ pep517==0.12.0 # via # -r requirements/pip-tools.txt # pip-tools -pip-tools==6.6.0 +pip-tools==6.6.2 # via -r requirements/pip-tools.txt -pkginfo==1.8.2 +pkginfo==1.8.3 # via twine platformdirs==2.5.2 # via @@ -122,16 +122,16 @@ pyflakes==2.4.0 # via # -r requirements/quality.txt # flake8 -pygments==2.11.2 +pygments==2.12.0 # via # readme-renderer # rich -pyparsing==3.0.8 +pyparsing==3.0.9 # via # -r requirements/ci.txt # -r requirements/quality.txt # packaging -pytest==7.1.1 +pytest==7.1.2 # via # -r requirements/quality.txt # pytest-cov @@ -142,7 +142,7 @@ pytest-mock==3.7.0 # via -r requirements/quality.txt readme-renderer==35.0 # via twine -requests==2.27.1 +requests==2.28.0 # via # -r requirements/ci.txt # -r requirements/quality.txt @@ -153,7 +153,7 @@ requests-toolbelt==0.9.1 # via twine rfc3986==2.0.0 # via twine -rich==12.2.0 +rich==12.4.4 # via twine six==1.16.0 # via @@ -175,7 +175,7 @@ tomli==2.0.1 # pytest tox==3.25.0 # via -r requirements/ci.txt -twine==4.0.0 +twine==4.0.1 # via -r requirements/dev.in typing-extensions==4.2.0 # via diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index a31aa926..ce56f4c7 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -4,11 +4,11 @@ # # make upgrade # -click==8.1.2 +click==8.1.3 # via pip-tools pep517==0.12.0 # via pip-tools -pip-tools==6.6.0 +pip-tools==6.6.2 # via -r requirements/pip-tools.in tomli==2.0.1 # via pep517 diff --git a/requirements/pip.txt b/requirements/pip.txt index e4b31332..a8d94624 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -2,13 +2,11 @@ # This file is autogenerated by pip-compile with python 3.8 # To update, run: # -# pip-compile --allow-unsafe --output-file=requirements/pip.txt requirements/pip.in +# make upgrade # wheel==0.37.1 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==22.1.2 - # via -r requirements/pip.in -setuptools==62.3.2 - # via -r requirements/pip.in +# pip +# setuptools diff --git a/requirements/quality.txt b/requirements/quality.txt index 142afa03..a8790e9a 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -10,7 +10,7 @@ attrs==21.4.0 # pytest black==22.3.0 # via -r requirements/quality.in -certifi==2021.10.8 +certifi==2022.6.15 # via # -r requirements/test.txt # requests @@ -18,9 +18,9 @@ charset-normalizer==2.0.12 # via # -r requirements/test.txt # requests -click==8.1.2 +click==8.1.3 # via black -coverage[toml]==6.3.2 +coverage[toml]==6.4.1 # via # -r requirements/test.txt # pytest-cov @@ -34,7 +34,7 @@ iniconfig==1.1.1 # via # -r requirements/test.txt # pytest -lxml==4.8.0 +lxml==4.9.0 # via -r requirements/test.txt mccabe==0.6.1 # via flake8 @@ -60,11 +60,11 @@ pycodestyle==2.8.0 # via flake8 pyflakes==2.4.0 # via flake8 -pyparsing==3.0.8 +pyparsing==3.0.9 # via # -r requirements/test.txt # packaging -pytest==7.1.1 +pytest==7.1.2 # via # -r requirements/test.txt # pytest-cov @@ -73,7 +73,7 @@ pytest-cov==3.0.0 # via -r requirements/test.txt pytest-mock==3.7.0 # via -r requirements/test.txt -requests==2.27.1 +requests==2.28.0 # via -r requirements/test.txt tomli==2.0.1 # via diff --git a/requirements/test.txt b/requirements/test.txt index 9f841480..dfcd8ef8 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -6,7 +6,7 @@ # attrs==21.4.0 # via pytest -certifi==2021.10.8 +certifi==2022.6.15 # via # -r requirements/base.txt # requests @@ -14,7 +14,7 @@ charset-normalizer==2.0.12 # via # -r requirements/base.txt # requests -coverage[toml]==6.3.2 +coverage[toml]==6.4.1 # via # -r requirements/test.in # pytest-cov @@ -24,7 +24,7 @@ idna==3.3 # requests iniconfig==1.1.1 # via pytest -lxml==4.8.0 +lxml==4.9.0 # via -r requirements/base.txt packaging==21.3 # via pytest @@ -32,9 +32,9 @@ pluggy==1.0.0 # via pytest py==1.11.0 # via pytest -pyparsing==3.0.8 +pyparsing==3.0.9 # via packaging -pytest==7.1.1 +pytest==7.1.2 # via # -r requirements/test.in # pytest-cov @@ -43,7 +43,7 @@ pytest-cov==3.0.0 # via -r requirements/test.in pytest-mock==3.7.0 # via -r requirements/test.in -requests==2.27.1 +requests==2.28.0 # via -r requirements/base.txt tomli==2.0.1 # via From 441103ba8d420f718b9f0462a3138770f2c538cb Mon Sep 17 00:00:00 2001 From: Jawayria <39649635+Jawayria@users.noreply.github.com> Date: Sat, 23 Jul 2022 20:05:09 +0500 Subject: [PATCH 3/3] fix: update makefile Co-authored-by: Usama Sadiq --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0ab9ede1..f0d12186 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,7 @@ upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in pip install -qr requirements/pip-tools.txt # Make sure to compile files after any other files they include! - $(PIP_COMPILE) -o requirements/pip.txt requirements/pip.in + $(PIP_COMPILE) --allow-unsafe -o requirements/pip.txt requirements/pip.in $(PIP_COMPILE) -o requirements/pip-tools.txt requirements/pip-tools.in pip install -qr requirements/pip.txt pip install -qr requirements/pip-tools.txt