Skip to content

Commit

Permalink
Python Requirements Update (#457)
Browse files Browse the repository at this point in the history
* chore: Updating Python Requirements
* fix: greenlet requirement conflict
* refactor: replace ruamel.yaml.main with ruamel.yaml.YAML().load
---------

Co-authored-by: UsamaSadiq <[email protected]>
  • Loading branch information
edx-requirements-bot and UsamaSadiq authored Nov 16, 2023
1 parent a07cca1 commit fbe6630
Show file tree
Hide file tree
Showing 12 changed files with 123 additions and 95 deletions.
2 changes: 1 addition & 1 deletion edx_repo_tools/audit_gh_users/extra.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fastcore==1.5.29
# via ghapi
ghapi==1.0.4
# via -r edx_repo_tools/audit_gh_users/extra.in
packaging==23.1
packaging==23.2
# via
# fastcore
# ghapi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from pathlib import Path

import click
from ruamel.yaml.main import round_trip_load as yaml_load
from ruamel.yaml import YAML

from edx_repo_tools.utils import YamlLoader

Expand All @@ -26,7 +26,8 @@ def _does_nvmrc_exists(self):

def _add_setup_nodejs_env_step(self, step_elements, step_index):
if self._does_nvmrc_exists():
fetch_node_version_step = yaml_load(FETCH_NODE_VERSION_STEP)
yaml = YAML()
fetch_node_version_step = yaml.load(FETCH_NODE_VERSION_STEP)
step_elements.insert(
step_index, fetch_node_version_step)
return step_elements
Expand Down
22 changes: 12 additions & 10 deletions edx_repo_tools/conventional_commits/extra.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,31 @@
#
# make upgrade
#
alembic==1.12.0
alembic==1.12.1
# via dataset
banal==1.0.6
# via dataset
contourpy==1.1.1
# via matplotlib
cycler==0.11.0
cycler==0.12.1
# via matplotlib
dataset==1.6.2
# via -r edx_repo_tools/conventional_commits/extra.in
fonttools==4.42.1
fonttools==4.44.3
# via matplotlib
greenlet==2.0.2
# via sqlalchemy
greenlet==3.0.1
# via
# -c edx_repo_tools/conventional_commits/../../requirements/constraints.txt
# sqlalchemy
importlib-metadata==6.8.0
# via alembic
importlib-resources==6.1.0
importlib-resources==6.1.1
# via
# alembic
# matplotlib
kiwisolver==1.4.5
# via matplotlib
mako==1.2.4
mako==1.3.0
# via alembic
markupsafe==2.1.3
# via mako
Expand All @@ -37,11 +39,11 @@ numpy==1.24.4
# contourpy
# matplotlib
# pandas
packaging==23.1
packaging==23.2
# via matplotlib
pandas==2.0.3
# via -r edx_repo_tools/conventional_commits/extra.in
pillow==10.0.1
pillow==10.1.0
# via matplotlib
pyparsing==3.1.1
# via matplotlib
Expand All @@ -53,7 +55,7 @@ pytz==2023.3.post1
# via pandas
six==1.16.0
# via python-dateutil
sqlalchemy==1.4.49
sqlalchemy==1.4.50
# via
# alembic
# dataset
Expand Down
6 changes: 3 additions & 3 deletions edx_repo_tools/find_dependencies/extra.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
certifi==2023.7.22
# via requests
charset-normalizer==3.2.0
charset-normalizer==3.3.2
# via requests
idna==3.4
# via requests
Expand All @@ -18,9 +18,9 @@ pygments==2.16.1
# via rich
requests==2.31.0
# via -r edx_repo_tools/find_dependencies/extra.in
rich==13.5.3
rich==13.7.0
# via -r edx_repo_tools/find_dependencies/extra.in
typing-extensions==4.8.0
# via rich
urllib3==2.0.5
urllib3==2.1.0
# via requests
12 changes: 8 additions & 4 deletions edx_repo_tools/repo_access_scraper/extra.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,17 @@
#
# make upgrade
#
greenlet==2.0.2
# via playwright
playwright==1.38.0
greenlet==3.0.1
# via
# -c edx_repo_tools/repo_access_scraper/../../requirements/constraints.txt
# playwright
playwright==1.18.1
# via -r edx_repo_tools/repo_access_scraper/extra.in
pyee==9.0.4
pyee==11.0.1
# via playwright
typing-extensions==4.8.0
# via
# playwright
# pyee
websockets==12.0
# via playwright
6 changes: 3 additions & 3 deletions edx_repo_tools/repo_checks/extra.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cache-to-disk==2.0.0
# via -r edx_repo_tools/repo_checks/extra.in
certifi==2023.7.22
# via requests
charset-normalizer==3.2.0
charset-normalizer==3.3.2
# via requests
click==8.1.7
# via -r edx_repo_tools/repo_checks/extra.in
Expand All @@ -18,15 +18,15 @@ ghapi==1.0.4
# via -r edx_repo_tools/repo_checks/extra.in
idna==3.4
# via requests
packaging==23.1
packaging==23.2
# via
# fastcore
# ghapi
pyyaml==6.0.1
# via -r edx_repo_tools/repo_checks/extra.in
requests==2.31.0
# via -r edx_repo_tools/repo_checks/extra.in
urllib3==2.0.5
urllib3==2.1.0
# via requests

# The following packages are considered to be unsafe in a requirements file:
Expand Down
61 changes: 35 additions & 26 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,24 @@ bowler==0.9.0
# via -r requirements/base.in
cachecontrol==0.13.1
# via -r requirements/base.in
cachetools==5.3.2
# via tox
certifi==2023.7.22
# via requests
cffi==1.15.1
cffi==1.16.0
# via cryptography
charset-normalizer==3.2.0
chardet==5.2.0
# via tox
charset-normalizer==3.3.2
# via requests
click==8.1.7
# via
# -r requirements/base.in
# bowler
# moreorless
cryptography==41.0.4
colorama==0.4.6
# via tox
cryptography==41.0.5
# via pyjwt
distlib==0.3.7
# via virtualenv
Expand All @@ -37,17 +43,17 @@ exceptiongroup==1.1.3
# via pytest
execnet==2.0.2
# via pytest-xdist
filelock==3.12.4
filelock==3.13.1
# via
# tox
# virtualenv
fissix==21.11.13
# via bowler
gitdb==4.0.10
gitdb==4.0.11
# via gitpython
github3-py==4.0.1
# via -r requirements/base.in
gitpython==3.1.37
gitpython==3.1.40
# via -r requirements/base.in
idna==3.4
# via requests
Expand All @@ -61,36 +67,42 @@ more-itertools==10.1.0
# via -r requirements/base.in
moreorless==0.4.0
# via bowler
msgpack==1.0.6
msgpack==1.0.7
# via cachecontrol
packaging==23.1
packaging==23.2
# via
# pyproject-api
# pytest
# tox
path==16.7.1
# via path-py
path-py==12.5.0
# via -r requirements/base.in
platformdirs==3.10.0
# via virtualenv
platformdirs==3.11.0
# via
# -c requirements/common_constraints.txt
# tox
# virtualenv
pluggy==1.3.0
# via
# pytest
# tox
py==1.11.0
# via tox
pycparser==2.21
# via cffi
pyjwt[crypto]==2.8.0
# via github3-py
pytest==7.4.2
# via
# github3-py
# pyjwt
pyproject-api==1.6.1
# via tox
pytest==7.4.3
# via
# -r requirements/base.in
# pytest-logging
# pytest-xdist
pytest-logging==2015.11.4
# via -r requirements/base.in
pytest-xdist==3.3.1
pytest-xdist==3.4.0
# via -r requirements/base.in
python-dateutil==2.8.2
# via
Expand All @@ -105,37 +117,34 @@ requests==2.31.0
# -r requirements/base.in
# cachecontrol
# github3-py
ruamel-yaml==0.17.32
ruamel-yaml==0.18.5
# via -r requirements/base.in
ruamel-yaml-clib==0.2.7
ruamel-yaml-clib==0.2.8
# via ruamel-yaml
six==1.16.0
# via
# python-dateutil
# tox
# via python-dateutil
smmap==5.0.1
# via gitdb
statistics==1.0.3.5
# via -r requirements/base.in
tomli==2.0.1
# via
# pyproject-api
# pytest
# tox
tox==3.28.0
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
tox==4.11.3
# via -r requirements/base.in
tqdm==4.66.1
# via -r requirements/base.in
uritemplate==4.1.1
# via
# -r requirements/base.in
# github3-py
urllib3==2.0.5
urllib3==2.1.0
# via requests
urlobject==2.4.3
# via -r requirements/base.in
virtualenv==20.24.5
virtualenv==20.24.6
# via tox
volatile==2.1.0
# via bowler
7 changes: 4 additions & 3 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ elasticsearch<7.14.0
# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
django-simple-history==3.0.0

# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
tox<4.0.0
# virtualenv latest version requires platformdirs<4.0 which conflicts with tox>4.0 version
# This constraint can be removed once the issue
# https://github.com/pypa/virtualenv/issues/2666 gets resolved
platformdirs<4.0
3 changes: 3 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
-c common_constraints.txt

# playwright and sqlalchemy requirements conflict for greenlet<=3.0.0
greenlet>3.0.0
Loading

0 comments on commit fbe6630

Please sign in to comment.