Merge branch 'master' into zshkoor/memcached-cache-moderniser

openedx · Jul 11, 2023 · 8543a5c · 8543a5c
2 parents f8ba8cd + 2ac12e7
commit 8543a5c
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 26 deletions.
diff --git a/edx_repo_tools/__init__.py b/edx_repo_tools/__init__.py
@@ -1,2 +1,2 @@
 
-__version__ = '0.8.1'
+__version__ = '0.8.2'
diff --git a/edx_repo_tools/codemods/django42/github_actions_modernizer_django42.py b/edx_repo_tools/codemods/django42/github_actions_modernizer_django42.py
@@ -5,7 +5,7 @@
 import click
 from edx_repo_tools.utils import YamlLoader
 
-ALLOWED_DJANGO_VERSIONS = ['django32', 'django40', 'django41', 'django42']
+ALLOWED_DJANGO_VERSIONS = ['django32', 'django42']
 
 
 class GithubCIModernizer(YamlLoader):

diff --git a/edx_repo_tools/codemods/django42/tox_moderniser_django42.py b/edx_repo_tools/codemods/django42/tox_moderniser_django42.py
@@ -9,12 +9,10 @@
 TEST_ENV_SECTION = "testenv"
 TEST_ENV_DEPS = "deps"
 PYTHON_SUBSTITUTE = "py38"
-DJANGO_SUBSTITUTE = "django{32,40, 41,42}"
+DJANGO_SUBSTITUTE = "django{32, 42}"
 
-DJANGO_40_DEPENDENCY = "django40: Django>=4.0,<4.1\n"
-DJANGO_41_DEPENDENCY = "django41: Django>=4.1,<4.2\n"
 DJANGO_42_DEPENDENCY = "django42: Django>=4.2,<4.3\n"
-NEW_DJANGO_DEPENDENCIES = DJANGO_40_DEPENDENCY + DJANGO_42_DEPENDENCY
+NEW_DJANGO_DEPENDENCIES = DJANGO_42_DEPENDENCY
 
 SECTIONS = [TOX_SECTION, TEST_ENV_SECTION]
 
@@ -79,10 +77,6 @@ def _replace_matches(pattern, substitute, target, matches):
         # checking if there is any dependency for django32 dont override it
         if matches[0].startswith('django32:'):
             substitute = matches[0]
-            if 'django40:' not in target:
-                substitute += DJANGO_40_DEPENDENCY
-            if 'django41:' not in target:
-                substitute += DJANGO_41_DEPENDENCY
             if 'django42:' not in target:
                 substitute += DJANGO_42_DEPENDENCY
         target = re.sub(pattern, substitute, target)

diff --git a/edx_repo_tools/conventional_commits/extra.txt b/edx_repo_tools/conventional_commits/extra.txt
@@ -32,7 +32,7 @@ mako==1.2.4
     # via alembic
 markupsafe==2.1.3
     # via mako
-matplotlib==3.7.1
+matplotlib==3.7.2
     # via -r edx_repo_tools/conventional_commits/extra.in
 numpy==1.24.4
     # via
@@ -43,9 +43,9 @@ packaging==23.1
     # via matplotlib
 pandas==2.0.3
     # via -r edx_repo_tools/conventional_commits/extra.in
-pillow==9.5.0
+pillow==10.0.0
     # via matplotlib
-pyparsing==3.1.0
+pyparsing==3.0.9
     # via matplotlib
 python-dateutil==2.8.2
     # via
@@ -55,11 +55,11 @@ pytz==2023.3
     # via pandas
 six==1.16.0
     # via python-dateutil
-sqlalchemy==1.4.48
+sqlalchemy==1.4.49
     # via
     #   alembic
     #   dataset
-typing-extensions==4.7.0
+typing-extensions==4.7.1
     # via alembic
 tzdata==2023.3
     # via pandas

diff --git a/edx_repo_tools/find_dependencies/extra.txt b/edx_repo_tools/find_dependencies/extra.txt
@@ -20,7 +20,7 @@ requests==2.31.0
     # via -r edx_repo_tools/find_dependencies/extra.in
 rich==13.4.2
     # via -r edx_repo_tools/find_dependencies/extra.in
-typing-extensions==4.7.0
+typing-extensions==4.7.1
     # via rich
 urllib3==2.0.3
     # via requests
diff --git a/edx_repo_tools/repo_access_scraper/extra.txt b/edx_repo_tools/repo_access_scraper/extra.txt
@@ -10,5 +10,5 @@ playwright==1.35.0
     # via -r edx_repo_tools/repo_access_scraper/extra.in
 pyee==9.0.4
     # via playwright
-typing-extensions==4.7.0
+typing-extensions==4.7.1
     # via playwright
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -49,7 +49,7 @@ distlib==0.3.6
     # via virtualenv
 docutils==0.20.1
     # via statistics
-exceptiongroup==1.1.1
+exceptiongroup==1.1.2
     # via pytest
 execnet==1.9.0
     # via pytest-xdist
@@ -93,7 +93,7 @@ lazy==1.5
     # via -r requirements/base.in
 lockfile==0.12.2
     # via -r requirements/base.in
-lxml==4.9.2
+lxml==4.9.3
     # via
     #   parsel
     #   scrapy
@@ -216,7 +216,7 @@ tqdm==4.65.0
     # via -r requirements/base.in
 twisted==22.10.0
     # via scrapy
-typing-extensions==4.7.0
+typing-extensions==4.7.1
     # via twisted
 uritemplate==4.1.1
     # via

diff --git a/requirements/development.txt b/requirements/development.txt
@@ -84,7 +84,7 @@ docutils==0.20.1
     #   statistics
 edx-lint==5.3.4
     # via -r requirements/development.in
-exceptiongroup==1.1.1
+exceptiongroup==1.1.2
     # via
     #   -r requirements/base.txt
     #   pytest
@@ -154,7 +154,7 @@ lazy-object-proxy==1.9.0
     # via astroid
 lockfile==0.12.2
     # via -r requirements/base.txt
-lxml==4.9.2
+lxml==4.9.3
     # via
     #   -r requirements/base.txt
     #   parsel
@@ -202,7 +202,7 @@ pbr==5.11.1
     # via stevedore
 pep8==1.7.1
     # via -r requirements/development.in
-pip-tools==6.13.0
+pip-tools==6.14.0
     # via -r requirements/development.in
 platformdirs==3.8.0
     # via
@@ -362,6 +362,7 @@ tomli==2.0.1
     # via
     #   -r requirements/base.txt
     #   build
+    #   pip-tools
     #   pylint
     #   pyproject-hooks
     #   pytest
@@ -380,7 +381,7 @@ twisted==22.10.0
     #   scrapy
 types-pyyaml==6.0.12.10
     # via responses
-typing-extensions==4.7.0
+typing-extensions==4.7.1
     # via
     #   -r requirements/base.txt
     #   astroid

diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
@@ -10,12 +10,14 @@ click==8.1.3
     # via pip-tools
 packaging==23.1
     # via build
-pip-tools==6.13.0
+pip-tools==6.14.0
     # via -r requirements/pip-tools.in
 pyproject-hooks==1.0.0
     # via build
 tomli==2.0.1
-    # via build
+    # via
+    #   build
+    #   pip-tools
 wheel==0.40.0
     # via pip-tools