fix: Install pip and pip-tools in upgrade script

Author: edx-requirements-bot

Makefile

@@ -18,11 +18,19 @@ test_proxy:
 	@echo "Running all tests with proxy process"
 	CODEJAIL_PROXY=1 pytest --junitxml=reports/pytest-proxy.xml --log-level=DEBUG
 
+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 -q -r requirements/pip_tools.txt
+	pip-compile --allow-unsafe --rebuild --annotation-style=line --upgrade -o requirements/pip.txt requirements/pip.in
 	pip-compile --annotation-style=line --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in
+	pip install -q -r requirements/pip.txt
+	pip install -q -r requirements/pip_tools.txt
 	pip-compile --annotation-style=line --upgrade -o requirements/tox.txt requirements/tox.in
 	pip-compile --annotation-style=line --upgrade -o requirements/testing.txt requirements/testing.in
 	pip-compile --annotation-style=line --upgrade -o requirements/sandbox.txt requirements/sandbox.in

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

requirements/constraints.txt

@@ -1,2 +1,3 @@
+-c common_constraints.txt
 # Django LTS version
 django>=3.2,<4.0

requirements/development.txt

@@ -4,23 +4,25 @@
 #
 #    make upgrade
 #
-astroid==2.9.0            # via -r requirements/testing.txt, pylint
-attrs==21.2.0             # via -r requirements/testing.txt, pytest
+astroid==2.11.6           # via -r requirements/testing.txt, pylint
+attrs==21.4.0             # via -r requirements/testing.txt, pytest
+dill==0.3.5.1             # via -r requirements/testing.txt, pylint
 iniconfig==1.1.1          # via -r requirements/testing.txt, pytest
 isort==5.10.1             # via -r requirements/testing.txt, pylint
-lazy-object-proxy==1.6.0  # via -r requirements/testing.txt, astroid
-mccabe==0.6.1             # via -r requirements/testing.txt, pylint
+lazy-object-proxy==1.7.1  # via -r requirements/testing.txt, astroid
+mccabe==0.7.0             # via -r requirements/testing.txt, pylint
 packaging==21.3           # via -r requirements/testing.txt, pytest
-platformdirs==2.4.0       # via -r requirements/testing.txt, pylint
+platformdirs==2.5.2       # via -r requirements/testing.txt, pylint
 pluggy==1.0.0             # via -r requirements/testing.txt, pytest
 py==1.11.0                # via -r requirements/testing.txt, pytest
 pycodestyle==2.8.0        # via -r requirements/testing.txt
-pylint==2.12.1            # via -r requirements/testing.txt
-pyparsing==3.0.6          # via -r requirements/testing.txt, packaging
-pytest==6.2.5             # via -r requirements/testing.txt
-toml==0.10.2              # via -r requirements/testing.txt, pylint, pytest
-typing-extensions==4.0.0  # via -r requirements/testing.txt, astroid, pylint
-wrapt==1.13.3             # via -r requirements/testing.txt, astroid
+pylint==2.14.3            # via -r requirements/testing.txt
+pyparsing==3.0.9          # via -r requirements/testing.txt, packaging
+pytest==7.1.2             # via -r requirements/testing.txt
+tomli==2.0.1              # via -r requirements/testing.txt, pylint, pytest
+tomlkit==0.11.0           # via -r requirements/testing.txt, pylint
+typing-extensions==4.2.0  # via -r requirements/testing.txt, astroid, pylint
+wrapt==1.14.1             # via -r requirements/testing.txt, astroid
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

requirements/pip.in

@@ -0,0 +1,7 @@
+-c constraints.txt
+# Core dependencies for installing other packages
+
+pip
+setuptools
+wheel
+

requirements/pip.txt

@@ -0,0 +1,11 @@
+#
+# This file is autogenerated by pip-compile with python 3.8
+# To update, run:
+#
+#    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==59.8.0        # via -c requirements/common_constraints.txt, -r requirements/pip.in

requirements/pip_tools.txt

@@ -4,11 +4,11 @@
 #
 #    make upgrade
 #
-click==8.0.3              # via pip-tools
+click==8.1.3              # via pip-tools
 pep517==0.12.0            # via pip-tools
-pip-tools==6.4.0          # via -r requirements/pip_tools.in
-tomli==1.2.2              # via pep517
-wheel==0.37.0             # via pip-tools
+pip-tools==6.6.2          # via -r requirements/pip_tools.in
+tomli==2.0.1              # via pep517
+wheel==0.37.1             # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

requirements/sandbox.txt

@@ -4,10 +4,10 @@
 #
 #    make upgrade
 #
-asgiref==3.4.1            # via django
-django==3.2.9             # via -c requirements/constraints.txt, -r requirements/sandbox.in
+asgiref==3.5.2            # via django
+django==3.2.13            # via -c requirements/common_constraints.txt, -c requirements/constraints.txt, -r requirements/sandbox.in
 future==0.18.2            # via -r requirements/sandbox.in
-numpy==1.21.4             # via -r requirements/sandbox.in
-pytz==2021.3              # via django
+numpy==1.22.4             # via -r requirements/sandbox.in
+pytz==2022.1              # via django
 six==1.16.0               # via -r requirements/sandbox.in
 sqlparse==0.4.2           # via django

requirements/testing.txt

@@ -4,23 +4,25 @@
 #
 #    make upgrade
 #
-astroid==2.9.0            # via pylint
-attrs==21.2.0             # via pytest
+astroid==2.11.6           # via pylint
+attrs==21.4.0             # via pytest
+dill==0.3.5.1             # via pylint
 iniconfig==1.1.1          # via pytest
 isort==5.10.1             # via -r requirements/testing.in, pylint
-lazy-object-proxy==1.6.0  # via astroid
-mccabe==0.6.1             # via pylint
+lazy-object-proxy==1.7.1  # via astroid
+mccabe==0.7.0             # via pylint
 packaging==21.3           # via pytest
-platformdirs==2.4.0       # via pylint
+platformdirs==2.5.2       # via pylint
 pluggy==1.0.0             # via pytest
 py==1.11.0                # via pytest
 pycodestyle==2.8.0        # via -r requirements/testing.in
-pylint==2.12.1            # via -r requirements/testing.in
-pyparsing==3.0.6          # via packaging
-pytest==6.2.5             # via -r requirements/testing.in
-toml==0.10.2              # via pylint, pytest
-typing-extensions==4.0.0  # via astroid, pylint
-wrapt==1.13.3             # via astroid
+pylint==2.14.3            # via -r requirements/testing.in
+pyparsing==3.0.9          # via packaging
+pytest==7.1.2             # via -r requirements/testing.in
+tomli==2.0.1              # via pylint, pytest
+tomlkit==0.11.0           # via pylint
+typing-extensions==4.2.0  # via astroid, pylint
+wrapt==1.14.1             # via astroid
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

requirements/tox.txt

@@ -4,15 +4,14 @@
 #
 #    make upgrade
 #
-backports.entry-points-selectable==1.1.1  # via virtualenv
-distlib==0.3.3            # via virtualenv
-filelock==3.4.0           # via tox, virtualenv
+distlib==0.3.4            # via virtualenv
+filelock==3.7.1           # via tox, virtualenv
 packaging==21.3           # via tox
-platformdirs==2.4.0       # via virtualenv
+platformdirs==2.5.2       # via virtualenv
 pluggy==1.0.0             # via tox
 py==1.11.0                # via tox
-pyparsing==3.0.6          # via packaging
+pyparsing==3.0.9          # via packaging
 six==1.16.0               # via tox, virtualenv
 toml==0.10.2              # via tox
-tox==3.24.4               # via -r requirements/tox.in
-virtualenv==20.10.0       # via tox
+tox==3.25.0               # via -r requirements/tox.in
+virtualenv==20.14.1       # via tox