fix: Installed pip and pip-tools in upgrade script

Makefile

@@ -20,8 +20,10 @@ upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
 upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
  pip install -r requirements/pip.txt
  pip install -q -r requirements/pip_tools.txt
- pip-compile --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in
+ pip-compile --upgrade --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in
  pip-compile --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in
+ pip install -qr requirements/pip.txt
+ pip install -qr requirements/pip_tools.txt
  pip-compile --upgrade -o requirements/base.txt requirements/base.in
  pip-compile --upgrade -o requirements/ci.txt requirements/ci.in
  pip-compile --upgrade -o requirements/test.txt requirements/test.in

requirements/base.txt

@@ -6,32 +6,30 @@
 #
 appdirs==1.4.4
  # via fs
-fs==2.4.14
+fs==2.4.16
  # via xblock
-lxml==4.6.5
+lxml==4.9.0
  # via xblock
-markupsafe==2.0.1
+markupsafe==2.1.1
  # via xblock
 python-dateutil==2.8.2
  # via xblock
-pytz==2021.3
- # via
- # fs
- # xblock
+pytz==2022.1
+ # via xblock
 pyyaml==6.0
  # via xblock
 six==1.16.0
  # via
  # -r requirements/base.in
  # fs
  # python-dateutil
-web-fragments==1.1.0
+web-fragments==2.0.0
  # via
  # -r requirements/base.in
  # xblock
 webob==1.8.7
  # via xblock
-xblock==1.5.1
+xblock==1.6.1
  # via -r requirements/base.in
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/common_constraints.txt

@@ -13,8 +13,13 @@
 
 
 # using LTS django version
-Django<3.3
+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/pip.in

@@ -1,3 +1,4 @@
+-c constraints.txt
 # Core dependencies for installing other packages
 
 pip

requirements/pip.txt

@@ -4,11 +4,13 @@
 #
 # make upgrade
 #
-wheel==0.36.2
+wheel==0.37.1
  # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==21.1.2
- # via -r requirements/pip.in
-setuptools==57.0.0
+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,15 +4,15 @@
 #
 # make upgrade
 #
-click==8.0.3
+click==8.1.3
  # via pip-tools
 pep517==0.12.0
  # via pip-tools
-pip-tools==6.4.0
+pip-tools==6.6.2
  # via -r requirements/pip_tools.in
-tomli==1.2.2
+tomli==2.0.1
  # via pep517
-wheel==0.37.0
+wheel==0.37.1
  # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/test.txt

@@ -4,9 +4,9 @@
 #
 # make upgrade
 #
-attrs==21.2.0
+attrs==21.4.0
  # via pytest
-coverage[toml]==6.2
+coverage[toml]==6.4.1
  # via pytest-cov
 iniconfig==1.1.1
  # via pytest
@@ -16,13 +16,13 @@ pluggy==1.0.0
  # via pytest
 py==1.11.0
  # via pytest
-pyparsing==3.0.6
+pyparsing==3.0.9
  # via packaging
-pytest==6.2.5
+pytest==7.1.2
  # via pytest-cov
 pytest-cov==3.0.0
  # via -r requirements/test.in
-toml==0.10.2
- # via pytest
-tomli==1.2.2
- # via coverage
+tomli==2.0.1
+ # via
+ # coverage
+ #  pytest