Skip to content

Commit

Permalink
feat: upgrade requirements to match with edx (#120)
Browse files Browse the repository at this point in the history
- edx-platform CI is failing:
https://github.com/openedx/edx-platform/actions/runs/11494462285/job/31992005953?pr=35671
- this PR will update forum dependencies, will also resolve the CI in edx-platform
- pinned pylint to a 3.2.7 version to avaoid further pylint failures

Co-authored-by: Muhammad Faraz  Maqsood <[email protected]>
  • Loading branch information
Faraz32123 and Muhammad Faraz Maqsood authored Oct 25, 2024
1 parent 46c0a6d commit 6f794b8
Show file tree
Hide file tree
Showing 9 changed files with 182 additions and 99 deletions.
3 changes: 2 additions & 1 deletion requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ openedx-atlas
requests
pymongo
elasticsearch
mysqlclient==2.2.4
mysqlclient
pylint==3.2.7
24 changes: 19 additions & 5 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,42 +1,56 @@
#
# This file is autogenerated by pip-compile with Python 3.12
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
asgiref==3.8.1
# via django
astroid==3.2.4
# via pylint
certifi==2024.8.30
# via
# elasticsearch
# requests
charset-normalizer==3.3.2
charset-normalizer==3.4.0
# via requests
dill==0.3.9
# via pylint
django==4.2.16
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
# djangorestframework
djangorestframework==3.15.2
# via -r requirements/base.in
dnspython==2.6.1
dnspython==2.7.0
# via pymongo
elasticsearch==7.13.4
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
idna==3.10
# via requests
mysqlclient==2.2.4
isort==5.13.2
# via pylint
mccabe==0.7.0
# via pylint
mysqlclient==2.2.5
# via -r requirements/base.in
openedx-atlas==0.6.2
# via -r requirements/base.in
pymongo==4.9.1
platformdirs==4.3.6
# via pylint
pylint==3.2.7
# via -r requirements/base.in
pymongo==4.10.1
# via -r requirements/base.in
requests==2.32.3
# via -r requirements/base.in
sqlparse==0.5.1
# via django
tomlkit==0.13.2
# via pylint
urllib3==1.26.20
# via
# elasticsearch
Expand Down
35 changes: 18 additions & 17 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.12
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
Expand All @@ -14,7 +14,7 @@ astroid==3.2.4
# -r requirements/quality.txt
# pylint
# pylint-celery
black==24.8.0
black==24.10.0
# via -r requirements/ci.in
cachetools==5.5.0
# via
Expand All @@ -29,7 +29,7 @@ chardet==5.2.0
# via
# -r requirements/quality.txt
# tox
charset-normalizer==3.3.2
charset-normalizer==3.4.0
# via
# -r requirements/quality.txt
# requests
Expand All @@ -52,15 +52,15 @@ colorama==0.4.6
# via
# -r requirements/quality.txt
# tox
coverage[toml]==7.6.1
coverage[toml]==7.6.4
# via
# -r requirements/quality.txt
# pytest-cov
dill==0.3.8
dill==0.3.9
# via
# -r requirements/quality.txt
# pylint
distlib==0.3.8
distlib==0.3.9
# via
# -r requirements/quality.txt
# virtualenv
Expand All @@ -71,19 +71,19 @@ django==4.2.16
# django-stubs
# django-stubs-ext
# djangorestframework
django-stubs==5.0.4
django-stubs==5.1.0
# via
# -r requirements/quality.txt
# djangorestframework-stubs
django-stubs-ext==5.0.4
django-stubs-ext==5.1.0
# via
# -r requirements/quality.txt
# django-stubs
djangorestframework==3.15.2
# via -r requirements/quality.txt
djangorestframework-stubs==3.15.1
# via -r requirements/quality.txt
dnspython==2.6.1
dnspython==2.7.0
# via
# -r requirements/quality.txt
# pymongo
Expand All @@ -93,7 +93,7 @@ elasticsearch==7.13.4
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/quality.txt
faker==28.4.1
faker==30.8.1
# via -r requirements/quality.txt
filelock==3.16.1
# via
Expand All @@ -116,7 +116,7 @@ jinja2==3.1.4
# via
# -r requirements/quality.txt
# code-annotations
markupsafe==2.1.5
markupsafe==3.0.2
# via
# -r requirements/quality.txt
# jinja2
Expand All @@ -126,14 +126,14 @@ mccabe==0.7.0
# pylint
mongomock==4.2.0.post1
# via -r requirements/quality.txt
mypy==1.11.2
mypy==1.13.0
# via -r requirements/quality.txt
mypy-extensions==1.0.0
# via
# -r requirements/quality.txt
# black
# mypy
mysqlclient==2.2.4
mysqlclient==2.2.5
# via -r requirements/quality.txt
openedx-atlas==0.6.2
# via -r requirements/quality.txt
Expand Down Expand Up @@ -178,7 +178,7 @@ pylint-celery==0.3
# via
# -r requirements/quality.txt
# edx-lint
pylint-django==2.5.5
pylint-django==2.6.1
# via
# -r requirements/quality.txt
# edx-lint
Expand All @@ -187,7 +187,7 @@ pylint-plugin-utils==0.8.2
# -r requirements/quality.txt
# pylint-celery
# pylint-django
pymongo==4.9.1
pymongo==4.10.1
# via -r requirements/quality.txt
pyproject-api==1.8.0
# via
Expand Down Expand Up @@ -251,7 +251,7 @@ tomlkit==0.13.2
# via
# -r requirements/quality.txt
# pylint
tox==4.20.0
tox==4.23.2
# via -r requirements/quality.txt
types-pyyaml==6.0.12.20240917
# via
Expand All @@ -272,13 +272,14 @@ typing-extensions==4.12.2
# django-stubs
# django-stubs-ext
# djangorestframework-stubs
# faker
# mypy
urllib3==1.26.20
# via
# -r requirements/quality.txt
# elasticsearch
# requests
virtualenv==20.26.5
virtualenv==20.27.0
# via
# -r requirements/quality.txt
# tox
41 changes: 21 additions & 20 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.12
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
Expand All @@ -16,9 +16,9 @@ astroid==3.2.4
# -r requirements/quality.txt
# pylint
# pylint-celery
black==24.8.0
black==24.10.0
# via -r requirements/ci.txt
build==1.2.2
build==1.2.2.post1
# via
# -r requirements/pip-tools.txt
# pip-tools
Expand All @@ -39,7 +39,7 @@ chardet==5.2.0
# -r requirements/quality.txt
# diff-cover
# tox
charset-normalizer==3.3.2
charset-normalizer==3.4.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
Expand Down Expand Up @@ -69,19 +69,19 @@ colorama==0.4.6
# -r requirements/ci.txt
# -r requirements/quality.txt
# tox
coverage[toml]==7.6.1
coverage[toml]==7.6.4
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# pytest-cov
diff-cover==9.2.0
# via -r requirements/dev.in
dill==0.3.8
dill==0.3.9
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# pylint
distlib==0.3.8
distlib==0.3.9
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
Expand All @@ -95,12 +95,12 @@ django==4.2.16
# django-stubs-ext
# djangorestframework
# edx-i18n-tools
django-stubs==5.0.4
django-stubs==5.1.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# djangorestframework-stubs
django-stubs-ext==5.0.4
django-stubs-ext==5.1.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
Expand All @@ -113,7 +113,7 @@ djangorestframework-stubs==3.15.1
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
dnspython==2.6.1
dnspython==2.7.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
Expand All @@ -129,7 +129,7 @@ elasticsearch==7.13.4
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/ci.txt
# -r requirements/quality.txt
faker==28.4.1
faker==30.8.1
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
Expand Down Expand Up @@ -164,9 +164,9 @@ lxml[html-clean,html_clean]==5.3.0
# via
# edx-i18n-tools
# lxml-html-clean
lxml-html-clean==0.2.2
lxml-html-clean==0.3.1
# via lxml
markupsafe==2.1.5
markupsafe==3.0.2
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
Expand All @@ -180,7 +180,7 @@ mongomock==4.2.0.post1
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
mypy==1.11.2
mypy==1.13.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
Expand All @@ -190,7 +190,7 @@ mypy-extensions==1.0.0
# -r requirements/quality.txt
# black
# mypy
mysqlclient==2.2.4
mysqlclient==2.2.5
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
Expand Down Expand Up @@ -262,7 +262,7 @@ pylint-celery==0.3
# -r requirements/ci.txt
# -r requirements/quality.txt
# edx-lint
pylint-django==2.5.5
pylint-django==2.6.1
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
Expand All @@ -273,7 +273,7 @@ pylint-plugin-utils==0.8.2
# -r requirements/quality.txt
# pylint-celery
# pylint-django
pymongo==4.9.1
pymongo==4.10.1
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
Expand All @@ -282,7 +282,7 @@ pyproject-api==1.8.0
# -r requirements/ci.txt
# -r requirements/quality.txt
# tox
pyproject-hooks==1.1.0
pyproject-hooks==1.2.0
# via
# -r requirements/pip-tools.txt
# build
Expand Down Expand Up @@ -363,7 +363,7 @@ tomlkit==0.13.2
# -r requirements/ci.txt
# -r requirements/quality.txt
# pylint
tox==4.20.0
tox==4.23.2
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
Expand All @@ -390,14 +390,15 @@ typing-extensions==4.12.2
# django-stubs
# django-stubs-ext
# djangorestframework-stubs
# faker
# mypy
urllib3==1.26.20
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# elasticsearch
# requests
virtualenv==20.26.5
virtualenv==20.27.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
Expand Down
Loading

0 comments on commit 6f794b8

Please sign in to comment.