fix: tox env & make upgrade

open-craft · Sep 19, 2023 · f65b35d · f65b35d
1 parent 707ac90
commit f65b35d
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 41 deletions.
diff --git a/requirements/base.in b/requirements/base.in
@@ -2,7 +2,7 @@
 -c constraints.txt
 
 markdown
--e git+https://github.com/openedx/xblock-utils.git@2.2.0#egg=xblock-utils
+-e git+https://github.com/openedx/xblock-utils.git@v3.4.1#egg=xblock-utils
 ddt
 mock
 bleach[css]
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -4,18 +4,41 @@
 #
 #    make upgrade
 #
--e git+https://github.com/openedx/xblock-utils.git@2.2.0#egg=xblock-utils
+-e git+https://github.com/openedx/xblock-utils.git@v3.4.1#egg=xblock-utils
     # via -r requirements/base.in
 appdirs==1.4.4
     # via fs
+asgiref==3.7.2
+    # via django
 bleach[css]==6.0.0
     # via -r requirements/base.in
+boto3==1.28.50
+    # via fs-s3fs
+botocore==1.31.50
+    # via
+    #   boto3
+    #   s3transfer
 ddt==1.6.0
     # via -r requirements/base.in
+django==3.2.21
+    # via
+    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+    #   openedx-django-pyfs
 fs==2.4.16
-    # via xblock
+    # via
+    #   fs-s3fs
+    #   openedx-django-pyfs
+    #   xblock
+fs-s3fs==1.1.1
+    # via openedx-django-pyfs
 importlib-metadata==6.8.0
     # via markdown
+jmespath==1.0.1
+    # via
+    #   boto3
+    #   botocore
+lazy==1.6
+    # via xblock
 lxml==4.9.3
     # via xblock
 mako==1.2.4
@@ -28,21 +51,36 @@ markupsafe==2.1.3
     #   xblock
 mock==5.1.0
     # via -r requirements/base.in
-python-dateutil==2.8.2
+openedx-django-pyfs==3.4.0
     # via xblock
+python-dateutil==2.8.2
+    # via
+    #   botocore
+    #   xblock
 pytz==2023.3.post1
-    # via xblock
+    # via
+    #   django
+    #   xblock
 pyyaml==6.0.1
     # via xblock
+s3transfer==0.6.2
+    # 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.8.0
+    # via asgiref
+urllib3==1.26.16
+    # via botocore
 web-fragments==2.1.0
     # via
     #   xblock
@@ -53,9 +91,9 @@ webencodings==0.5.1
     #   tinycss2
 webob==1.8.7
     # via xblock
-xblock==1.7.0
+xblock[django]==1.7.0
     # via xblock-utils
-zipp==3.16.2
+zipp==3.17.0
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

diff --git a/requirements/ci.in b/requirements/ci.in
@@ -4,5 +4,5 @@
 
 tox                       # Virtualenv management for tests
 tox-battery               # Makes tox aware of requirements file changes
-pycodestyle==2.4.0
+pycodestyle==2.11.0
 pylint
diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -30,7 +30,7 @@ pluggy==1.3.0
     # via tox
 py==1.11.0
     # via tox
-pycodestyle==2.4.0
+pycodestyle==2.11.0
     # via -r requirements/ci.in
 pylint==2.17.5
     # via -r requirements/ci.in
@@ -49,7 +49,7 @@ tox==3.28.0
     #   tox-battery
 tox-battery==0.6.2
     # via -r requirements/ci.in
-typing-extensions==4.7.1
+typing-extensions==4.8.0
     # via
     #   astroid
     #   pylint

diff --git a/requirements/dev.in b/requirements/dev.in
@@ -2,12 +2,12 @@
 -r ci.txt # dependencies for setting up testing in CI
 
 # Internationalization and Localization requirements
--e 'git+https://github.com/openedx/xblock-sdk.git@v0.5.1#egg=xblock-sdk==v0.5.1'
+-e 'git+https://github.com/openedx/xblock-sdk.git@v0.7.0#egg=xblock-sdk==v0.7.0'
 
-Django>=2.2, <3.3
+Django>=3.2, <4.0
 
-django-appconf==1.0.4
+django-appconf==1.0.5
 
-django-statici18n==1.8.2
-transifex-client==0.12.1
-edx-i18n-tools==0.9.2
+django-statici18n==2.4.0
+transifex-client==0.14.4
+edx-i18n-tools==1.2.0
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
--e git+https://github.com/openedx/xblock-sdk.git@v0.5.1#egg=xblock-sdk==v0.5.1
+-e git+https://github.com/openedx/xblock-sdk.git@v0.7.0#egg=xblock-sdk==v0.7.0
     # via -r requirements/dev.in
 appdirs==1.4.4
     # via fs
@@ -18,11 +18,9 @@ astroid==2.15.6
     #   pylint
 binaryornot==0.4.4
     # via cookiecutter
-boto==2.49.0
-    # via xblock-sdk
-boto3==1.28.49
+boto3==1.28.50
     # via fs-s3fs
-botocore==1.31.49
+botocore==1.31.50
     # via
     #   boto3
     #   s3transfer
@@ -49,19 +47,16 @@ django==3.2.21
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/dev.in
     #   django-appconf
-    #   django-pyfs
     #   django-statici18n
     #   edx-i18n-tools
     #   xblock-sdk
-django-appconf==1.0.4
+django-appconf==1.0.5
     # via
     #   -r requirements/dev.in
     #   django-statici18n
-django-pyfs==3.2.0
-    # via xblock-sdk
-django-statici18n==1.8.2
+django-statici18n==2.4.0
     # via -r requirements/dev.in
-edx-i18n-tools==0.9.2
+edx-i18n-tools==1.2.0
     # via -r requirements/dev.in
 filelock==3.12.4
     # via
@@ -70,13 +65,14 @@ filelock==3.12.4
     #   virtualenv
 fs==2.4.16
     # via
-    #   django-pyfs
     #   fs-s3fs
     #   xblock
 fs-s3fs==1.1.1
-    # via
-    #   django-pyfs
-    #   xblock-sdk
+    # via xblock-sdk
+gitdb==4.0.10
+    # via gitpython
+gitpython==3.1.36
+    # via transifex-client
 idna==3.4
     # via requests
 isort==5.12.0
@@ -89,8 +85,6 @@ jmespath==1.0.1
     # via
     #   boto3
     #   botocore
-lazy==1.6
-    # via xblock-sdk
 lazy-object-proxy==1.9.0
     # via
     #   -r requirements/ci.txt
@@ -132,7 +126,7 @@ py==1.11.0
     # via
     #   -r requirements/ci.txt
     #   tox
-pycodestyle==2.4.0
+pycodestyle==2.11.0
     # via -r requirements/ci.txt
 pygments==2.16.1
     # via rich
@@ -145,8 +139,10 @@ python-dateutil==2.8.2
     #   arrow
     #   botocore
     #   xblock
-python-slugify==8.0.1
-    # via cookiecutter
+python-slugify==4.0.1
+    # via
+    #   cookiecutter
+    #   transifex-client
 pytz==2023.3.post1
     # via
     #   django
@@ -159,6 +155,7 @@ pyyaml==6.0.1
 requests==2.31.0
     # via
     #   cookiecutter
+    #   transifex-client
     #   xblock-sdk
 rich==13.5.3
     # via cookiecutter
@@ -169,11 +166,13 @@ simplejson==3.19.1
 six==1.16.0
     # via
     #   -r requirements/ci.txt
-    #   django-statici18n
     #   fs
     #   fs-s3fs
     #   python-dateutil
     #   tox
+    #   transifex-client
+smmap==5.0.1
+    # via gitdb
 sqlparse==0.4.4
     # via django
 text-unidecode==1.3
@@ -194,9 +193,9 @@ tox==3.28.0
     #   tox-battery
 tox-battery==0.6.2
     # via -r requirements/ci.txt
-transifex-client==0.12.1
+transifex-client==0.14.4
     # via -r requirements/dev.in
-typing-extensions==4.7.1
+typing-extensions==4.8.0
     # via
     #   -r requirements/ci.txt
     #   asgiref

diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
@@ -23,7 +23,7 @@ tomli==2.0.1
     #   pyproject-hooks
 wheel==0.41.2
     # via pip-tools
-zipp==3.16.2
+zipp==3.17.0
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

diff --git a/tox.ini b/tox.ini
@@ -7,13 +7,20 @@ exclude = .git,.tox
 [testenv]
 deps =
     django32: Django>=3.2,<4.0
-    django42: Django>=4.2,<5.0
 commands =
     make requirements
     make linux_dev_test
 passenv =
     DISPLAY
 
+[testenv:py38-django42]
+commands =
+    make requirements
+    pip install Django==4.2.5
+    make linux_dev_test
+passenv =
+    DISPLAY
+
 [testenv:quality]
 commands =
     make python_requirements