Merge branch 'master' into aali/upgrade_devstack_redis

Author: thomty

Makefile

@@ -135,7 +135,10 @@ requirements: ## install development environment requirements
 upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
 upgrade: ## Upgrade requirements with pip-tools.
 	pip install -qr requirements/pip-tools.txt
+	pip-compile --allow-unsafe --rebuild --upgrade -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/doc.txt requirements/doc.in
 	pip-compile --upgrade -o requirements/test.txt requirements/test.in

docker-compose-host.yml

@@ -56,6 +56,7 @@ services:
   analyticsapi:
     volumes:
       - ${DEVSTACK_WORKSPACE}/edx-analytics-data-api:/edx/app/analytics_api/analytics_api
+      - ${DEVSTACK_WORKSPACE}/src:/edx/src
 
   # Note that frontends mount `src` to /edx/app/src instead of /edx/src.
   # See ADR #5 for rationale.

requirements/base.txt

@@ -8,16 +8,16 @@ attrs==21.4.0
     # via jsonschema
 bcrypt==3.2.2
     # via paramiko
-certifi==2022.5.18.1
+certifi==2022.6.15
     # via requests
-cffi==1.15.0
+cffi==1.15.1
     # via
     #   bcrypt
     #   cryptography
     #   pynacl
-charset-normalizer==2.0.12
+charset-normalizer==2.1.0
     # via requests
-cryptography==37.0.2
+cryptography==37.0.4
     # via paramiko
 distro==1.7.0
     # via docker-compose
@@ -47,7 +47,7 @@ pyyaml==5.4.1
     # via
     #   -r requirements/base.in
     #   docker-compose
-requests==2.27.1
+requests==2.28.1
     # via
     #   docker
     #   docker-compose
@@ -59,7 +59,7 @@ six==1.16.0
     #   websocket-client
 texttable==1.6.4
     # via docker-compose
-urllib3==1.26.9
+urllib3==1.26.10
     # via requests
 websocket-client==0.59.0
     # via

requirements/dev.txt

@@ -15,19 +15,23 @@ bcrypt==3.2.2
     #   -r requirements/base.txt
     #   -r requirements/test.txt
     #   paramiko
-certifi==2022.5.18.1
+build==0.8.0
+    # via
+    #   -r requirements/pip-tools.txt
+    #   pip-tools
+certifi==2022.6.15
     # via
     #   -r requirements/base.txt
     #   -r requirements/test.txt
     #   requests
-cffi==1.15.0
+cffi==1.15.1
     # via
     #   -r requirements/base.txt
     #   -r requirements/test.txt
     #   bcrypt
     #   cryptography
     #   pynacl
-charset-normalizer==2.0.12
+charset-normalizer==2.1.0
     # via
     #   -r requirements/base.txt
     #   -r requirements/test.txt
@@ -36,7 +40,7 @@ click==8.1.3
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools
-cryptography==37.0.2
+cryptography==37.0.4
     # via
     #   -r requirements/base.txt
     #   -r requirements/test.txt
@@ -87,7 +91,9 @@ jsonschema==3.2.0
     #   docker-compose
 packaging==21.3
     # via
+    #   -r requirements/pip-tools.txt
     #   -r requirements/test.txt
+    #   build
     #   pytest
     #   tox
 paramiko==2.11.0
@@ -98,10 +104,10 @@ paramiko==2.11.0
 pep517==0.12.0
     # via
     #   -r requirements/pip-tools.txt
-    #   pip-tools
+    #   build
 pexpect==4.8.0
     # via -r requirements/test.txt
-pip-tools==6.6.2
+pip-tools==6.8.0
     # via -r requirements/pip-tools.txt
 platformdirs==2.5.2
     # via virtualenv
@@ -131,6 +137,7 @@ pynacl==1.5.0
     #   paramiko
 pyparsing==3.0.9
     # via
+    #   -r requirements/pip-tools.txt
     #   -r requirements/test.txt
     #   packaging
 pyrsistent==0.18.1
@@ -150,7 +157,7 @@ pyyaml==5.4.1
     #   -r requirements/base.txt
     #   -r requirements/test.txt
     #   docker-compose
-requests==2.27.1
+requests==2.28.1
     # via
     #   -r requirements/base.txt
     #   -r requirements/test.txt
@@ -177,20 +184,21 @@ tomli==2.0.1
     # via
     #   -r requirements/pip-tools.txt
     #   -r requirements/test.txt
+    #   build
     #   pep517
     #   pytest
-tox==3.25.0
+tox==3.25.1
     # via
     #   -r requirements/dev.in
     #   tox-battery
 tox-battery==0.6.1
     # via -r requirements/dev.in
-urllib3==1.26.9
+urllib3==1.26.10
     # via
     #   -r requirements/base.txt
     #   -r requirements/test.txt
     #   requests
-virtualenv==20.14.1
+virtualenv==20.15.1
     # via tox
 websocket-client==0.59.0
     # via

requirements/doc.txt

@@ -10,29 +10,29 @@ attrs==21.4.0
     # via
     #   -r requirements/base.txt
     #   jsonschema
-babel==2.10.1
+babel==2.10.3
     # via sphinx
 bcrypt==3.2.2
     # via
     #   -r requirements/base.txt
     #   paramiko
-bleach==5.0.0
+bleach==5.0.1
     # via readme-renderer
-certifi==2022.5.18.1
+certifi==2022.6.15
     # via
     #   -r requirements/base.txt
     #   requests
-cffi==1.15.0
+cffi==1.15.1
     # via
     #   -r requirements/base.txt
     #   bcrypt
     #   cryptography
     #   pynacl
-charset-normalizer==2.0.12
+charset-normalizer==2.1.0
     # via
     #   -r requirements/base.txt
     #   requests
-cryptography==37.0.2
+cryptography==37.0.4
     # via
     #   -r requirements/base.txt
     #   paramiko
@@ -68,9 +68,9 @@ idna==3.3
     # via
     #   -r requirements/base.txt
     #   requests
-imagesize==1.3.0
+imagesize==1.4.1
     # via sphinx
-importlib-metadata==4.11.4
+importlib-metadata==4.12.0
     # via sphinx
 jinja2==3.1.2
     # via sphinx
@@ -119,7 +119,7 @@ pyyaml==5.4.1
     #   docker-compose
 readme-renderer==35.0
     # via -r requirements/doc.in
-requests==2.27.1
+requests==2.28.1
     # via
     #   -r requirements/base.txt
     #   docker
@@ -138,7 +138,7 @@ six==1.16.0
     #   websocket-client
 snowballstemmer==2.2.0
     # via sphinx
-sphinx==5.0.0
+sphinx==5.0.2
     # via
     #   -r requirements/doc.in
     #   edx-sphinx-theme
@@ -154,13 +154,13 @@ sphinxcontrib-qthelp==1.0.3
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
-stevedore==3.5.0
+stevedore==4.0.0
     # via doc8
 texttable==1.6.4
     # via
     #   -r requirements/base.txt
     #   docker-compose
-urllib3==1.26.9
+urllib3==1.26.10
     # via
     #   -r requirements/base.txt
     #   requests
@@ -171,7 +171,7 @@ websocket-client==0.59.0
     #   -r requirements/base.txt
     #   docker
     #   docker-compose
-zipp==3.8.0
+zipp==3.8.1
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/pip-tools.txt

@@ -4,14 +4,22 @@
 #
 #    make upgrade
 #
+build==0.8.0
+    # via pip-tools
 click==8.1.3
     # via pip-tools
+packaging==21.3
+    # via build
 pep517==0.12.0
-    # via pip-tools
-pip-tools==6.6.2
+    # via build
+pip-tools==6.8.0
     # via -r requirements/pip-tools.in
+pyparsing==3.0.9
+    # via packaging
 tomli==2.0.1
-    # via pep517
+    # via
+    #   build
+    #   pep517
 wheel==0.37.1
     # via pip-tools
 

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,16 @@
+#
+# 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 https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+    #   -r requirements/pip.in

requirements/test.txt

@@ -13,21 +13,21 @@ bcrypt==3.2.2
     # via
     #   -r requirements/base.txt
     #   paramiko
-certifi==2022.5.18.1
+certifi==2022.6.15
     # via
     #   -r requirements/base.txt
     #   requests
-cffi==1.15.0
+cffi==1.15.1
     # via
     #   -r requirements/base.txt
     #   bcrypt
     #   cryptography
     #   pynacl
-charset-normalizer==2.0.12
+charset-normalizer==2.1.0
     # via
     #   -r requirements/base.txt
     #   requests
-cryptography==37.0.2
+cryptography==37.0.4
     # via
     #   -r requirements/base.txt
     #   paramiko
@@ -97,7 +97,7 @@ pyyaml==5.4.1
     # via
     #   -r requirements/base.txt
     #   docker-compose
-requests==2.27.1
+requests==2.28.1
     # via
     #   -r requirements/base.txt
     #   docker
@@ -115,7 +115,7 @@ texttable==1.6.4
     #   docker-compose
 tomli==2.0.1
     # via pytest
-urllib3==1.26.9
+urllib3==1.26.10
     # via
     #   -r requirements/base.txt
     #   requests