Merge pull request #54 from open-craft/jenkins/upgrade-python-require…

…ments-071f42c

Python Requirements Update

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
       matrix:
         os: [ubuntu-20.04]
         python-version: [3.8]
-        toxenv: [django32-nutmeg, django32-latest, django41-latest, quality, pii_check]
+        toxenv: [django32-nutmeg, django32-latest, django42-latest, quality, pii_check]
 
     steps:
     - name: checkout repo

.gitignore

@@ -33,6 +33,7 @@ pip-log.txt
 coverage.xml
 htmlcov/
 diff-cover.html
+pii_report
 
 # Translations
 *.mo

requirements/base.in

@@ -2,5 +2,6 @@
 -c constraints.txt
 
 xblock-utils
+xblock[django]  # xblock-utils is not installing openedx-django-pyfs
 bleach[css]
 Django

requirements/base.txt

@@ -10,11 +10,29 @@ asgiref==3.7.2
     # via django
 bleach[css]==6.0.0
     # via -r requirements/base.in
+boto3==1.28.21
+    # via fs-s3fs
+botocore==1.31.21
+    # via
+    #   boto3
+    #   s3transfer
 django==3.2.20
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/base.in
+    #   openedx-django-pyfs
 fs==2.4.16
+    # via
+    #   fs-s3fs
+    #   openedx-django-pyfs
+    #   xblock
+fs-s3fs==1.1.1
+    # via openedx-django-pyfs
+jmespath==1.0.1
+    # via
+    #   boto3
+    #   botocore
+lazy==1.5
     # via xblock
 lxml==4.9.3
     # via xblock
@@ -24,28 +42,37 @@ markupsafe==2.1.3
     # via
     #   mako
     #   xblock
-python-dateutil==2.8.2
+openedx-django-pyfs==3.4.0
     # via xblock
+python-dateutil==2.8.2
+    # via
+    #   botocore
+    #   xblock
 pytz==2023.3
     # via
     #   django
     #   xblock
-pyyaml==6.0
+pyyaml==6.0.1
     # via xblock
+s3transfer==0.6.1
+    # via boto3
 simplejson==3.19.1
     # via xblock-utils
 six==1.16.0
     # via
     #   bleach
     #   fs
+    #   fs-s3fs
     #   python-dateutil
 sqlparse==0.4.4
     # via django
 tinycss2==1.1.1
     # via bleach
 typing-extensions==4.7.1
     # via asgiref
-web-fragments==2.0.0
+urllib3==1.26.16
+    # via botocore
+web-fragments==2.1.0
     # via
     #   xblock
     #   xblock-utils
@@ -55,9 +82,11 @@ webencodings==0.5.1
     #   tinycss2
 webob==1.8.7
     # via xblock
-xblock==1.6.2
-    # via xblock-utils
-xblock-utils==3.2.0
+xblock[django]==1.7.0
+    # via
+    #   -r requirements/base.in
+    #   xblock-utils
+xblock-utils==3.4.0
     # via -r requirements/base.in
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/ci.txt

@@ -4,15 +4,15 @@
 #
 #    make upgrade
 #
-distlib==0.3.6
+distlib==0.3.7
     # via virtualenv
 filelock==3.12.2
     # via
     #   tox
     #   virtualenv
 packaging==23.1
     # via tox
-platformdirs==3.9.1
+platformdirs==3.10.0
     # via virtualenv
 pluggy==1.2.0
     # via tox
@@ -29,5 +29,5 @@ tox==3.28.0
     #   tox-battery
 tox-battery==0.6.1
     # via -r requirements/ci.in
-virtualenv==20.24.0
+virtualenv==20.24.2
     # via tox

requirements/dev.txt

@@ -27,11 +27,11 @@ binaryornot==0.4.4
     #   cookiecutter
 bleach[css]==6.0.0
     # via -r requirements/quality.txt
-boto3==1.28.3
+boto3==1.28.21
     # via
     #   -r requirements/quality.txt
     #   fs-s3fs
-botocore==1.31.3
+botocore==1.31.21
     # via
     #   -r requirements/quality.txt
     #   boto3
@@ -40,19 +40,19 @@ build==0.10.0
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools
-certifi==2023.5.7
+certifi==2023.7.22
     # via
     #   -r requirements/quality.txt
     #   requests
-chardet==5.1.0
+chardet==5.2.0
     # via
     #   -r requirements/quality.txt
     #   binaryornot
 charset-normalizer==3.2.0
     # via
     #   -r requirements/quality.txt
     #   requests
-click==8.1.5
+click==8.1.6
     # via
     #   -r requirements/pip-tools.txt
     #   -r requirements/quality.txt
@@ -65,23 +65,23 @@ click-log==0.4.0
     # via
     #   -r requirements/quality.txt
     #   edx-lint
-code-annotations==1.3.0
+code-annotations==1.5.0
     # via
     #   -r requirements/quality.txt
     #   edx-lint
-cookiecutter==2.2.3
+cookiecutter==2.3.0
     # via
     #   -r requirements/quality.txt
     #   xblock-sdk
 coverage[toml]==7.2.7
     # via
     #   -r requirements/quality.txt
     #   pytest-cov
-dill==0.3.6
+dill==0.3.7
     # via
     #   -r requirements/quality.txt
     #   pylint
-distlib==0.3.6
+distlib==0.3.7
     # via
     #   -r requirements/ci.txt
     #   virtualenv
@@ -92,7 +92,7 @@ django==3.2.20
     #   edx-i18n-tools
     #   openedx-django-pyfs
     #   xblock-sdk
-edx-i18n-tools==1.0.0
+edx-i18n-tools==1.1.0
     # via -r requirements/quality.txt
 edx-lint==5.3.4
     # via -r requirements/quality.txt
@@ -155,6 +155,10 @@ mako==1.2.4
     # via
     #   -r requirements/quality.txt
     #   xblock-utils
+markdown-it-py==3.0.0
+    # via
+    #   -r requirements/quality.txt
+    #   rich
 markupsafe==2.1.3
     # via
     #   -r requirements/quality.txt
@@ -165,6 +169,10 @@ mccabe==0.7.0
     # via
     #   -r requirements/quality.txt
     #   pylint
+mdurl==0.1.2
+    # via
+    #   -r requirements/quality.txt
+    #   markdown-it-py
 mock==5.1.0
     # via -r requirements/quality.txt
 openedx-django-pyfs==3.4.0
@@ -187,9 +195,9 @@ pbr==5.11.1
     # via
     #   -r requirements/quality.txt
     #   stevedore
-pip-tools==7.0.0
+pip-tools==7.2.0
     # via -r requirements/pip-tools.txt
-platformdirs==3.9.1
+platformdirs==3.10.0
     # via
     #   -r requirements/ci.txt
     #   -r requirements/quality.txt
@@ -209,11 +217,15 @@ py==1.11.0
     # via
     #   -r requirements/ci.txt
     #   tox
-pycodestyle==2.10.0
+pycodestyle==2.11.0
     # via -r requirements/quality.txt
 pydocstyle==6.3.0
     # via -r requirements/quality.txt
-pylint==2.17.4
+pygments==2.16.1
+    # via
+    #   -r requirements/quality.txt
+    #   rich
+pylint==2.17.5
     # via
     #   -r requirements/quality.txt
     #   edx-lint
@@ -266,7 +278,7 @@ pytz==2023.3
     #   -r requirements/quality.txt
     #   django
     #   xblock
-pyyaml==6.0
+pyyaml==6.0.1
     # via
     #   -r requirements/quality.txt
     #   code-annotations
@@ -278,6 +290,10 @@ requests==2.31.0
     #   -r requirements/quality.txt
     #   cookiecutter
     #   xblock-sdk
+rich==13.5.2
+    # via
+    #   -r requirements/quality.txt
+    #   cookiecutter
 s3transfer==0.6.1
     # via
     #   -r requirements/quality.txt
@@ -329,7 +345,7 @@ tomli==2.0.1
     #   pyproject-hooks
     #   pytest
     #   tox
-tomlkit==0.11.8
+tomlkit==0.12.1
     # via
     #   -r requirements/quality.txt
     #   pylint
@@ -346,16 +362,17 @@ typing-extensions==4.7.1
     #   asgiref
     #   astroid
     #   pylint
+    #   rich
 urllib3==1.26.16
     # via
     #   -r requirements/quality.txt
     #   botocore
     #   requests
-virtualenv==20.24.0
+virtualenv==20.24.2
     # via
     #   -r requirements/ci.txt
     #   tox
-web-fragments==2.0.0
+web-fragments==2.1.0
     # via
     #   -r requirements/quality.txt
     #   xblock
@@ -371,22 +388,22 @@ webob==1.8.7
     #   -r requirements/quality.txt
     #   xblock
     #   xblock-sdk
-wheel==0.40.0
+wheel==0.41.1
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools
 wrapt==1.15.0
     # via
     #   -r requirements/quality.txt
     #   astroid
-xblock[django]==1.6.2
+xblock[django]==1.7.0
     # via
     #   -r requirements/quality.txt
     #   xblock-sdk
     #   xblock-utils
-xblock-sdk==0.6.0
+xblock-sdk==0.7.0
     # via -r requirements/quality.txt
-xblock-utils==3.2.0
+xblock-utils==3.4.0
     # via -r requirements/quality.txt
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/pip-tools.txt

@@ -6,11 +6,11 @@
 #
 build==0.10.0
     # via pip-tools
-click==8.1.5
+click==8.1.6
     # via pip-tools
 packaging==23.1
     # via build
-pip-tools==7.0.0
+pip-tools==7.2.0
     # via -r requirements/pip-tools.in
 pyproject-hooks==1.0.0
     # via build
@@ -19,7 +19,7 @@ tomli==2.0.1
     #   build
     #   pip-tools
     #   pyproject-hooks
-wheel==0.40.0
+wheel==0.41.1
     # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/pip.txt

@@ -4,11 +4,11 @@
 #
 #    make upgrade
 #
-wheel==0.40.0
+wheel==0.41.1
     # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==23.2
+pip==23.2.1
     # via -r requirements/pip.in
 setuptools==68.0.0
     # via -r requirements/pip.in