Skip to content

Commit

Permalink
Merge pull request #189 from openedx/jenkins/upgrade-python-requireme…
Browse files Browse the repository at this point in the history
…nts-3238746

Python Requirements Update
  • Loading branch information
awais786 authored Apr 9, 2024
2 parents 3238746 + 2d39da7 commit 1f90be8
Show file tree
Hide file tree
Showing 8 changed files with 80 additions and 63 deletions.
2 changes: 1 addition & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ charset-normalizer==3.3.2
# via requests
idna==3.6
# via requests
lxml==5.1.0
lxml==5.2.1
# via -r requirements/base.in
requests==2.31.0
# via -r requirements/base.in
Expand Down
24 changes: 12 additions & 12 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#
# make upgrade
#
black==24.2.0
black==24.3.0
# via -r requirements/quality.txt
cachetools==5.3.2
cachetools==5.3.3
# via tox
certifi==2024.2.2
# via
Expand All @@ -24,7 +24,7 @@ click==8.1.7
# black
colorama==0.4.6
# via tox
coverage[toml]==7.4.1
coverage[toml]==7.4.4
# via
# -r requirements/ci.in
# -r requirements/quality.txt
Expand All @@ -35,7 +35,7 @@ exceptiongroup==1.2.0
# via
# -r requirements/quality.txt
# pytest
filelock==3.13.1
filelock==3.13.3
# via
# tox
# virtualenv
Expand All @@ -49,7 +49,7 @@ iniconfig==2.0.0
# via
# -r requirements/quality.txt
# pytest
lxml==5.1.0
lxml==5.2.1
# via -r requirements/quality.txt
mccabe==0.7.0
# via
Expand All @@ -59,7 +59,7 @@ mypy-extensions==1.0.0
# via
# -r requirements/quality.txt
# black
packaging==23.2
packaging==24.0
# via
# -r requirements/quality.txt
# black
Expand Down Expand Up @@ -91,14 +91,14 @@ pyflakes==3.2.0
# flake8
pyproject-api==1.6.1
# via tox
pytest==8.0.1
pytest==8.1.1
# via
# -r requirements/quality.txt
# pytest-cov
# pytest-mock
pytest-cov==4.1.0
pytest-cov==5.0.0
# via -r requirements/quality.txt
pytest-mock==3.12.0
pytest-mock==3.14.0
# via -r requirements/quality.txt
requests==2.31.0
# via -r requirements/quality.txt
Expand All @@ -110,17 +110,17 @@ tomli==2.0.1
# pyproject-api
# pytest
# tox
tox==4.13.0
tox==4.14.2
# via -r requirements/ci.in
typing-extensions==4.9.0
typing-extensions==4.11.0
# via
# -r requirements/quality.txt
# black
urllib3==2.2.1
# via
# -r requirements/quality.txt
# requests
virtualenv==20.25.0
virtualenv==20.25.1
# via tox
xmlformatter==0.2.6
# via -r requirements/quality.txt
Expand Down
11 changes: 10 additions & 1 deletion requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,20 @@


# using LTS django version
Django<4.0
Django<5.0

# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
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

# opentelemetry requires version 6.x at the moment:
# https://github.com/open-telemetry/opentelemetry-python/issues/3570
# Normally this could be added as a constraint in edx-django-utils, where we're
# adding the opentelemetry dependency. However, when we compile pip-tools.txt,
# that uses version 7.x, and then there's no undoing that when compiling base.txt.
# So we need to pin it globally, for now.
# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
importlib-metadata<7
62 changes: 35 additions & 27 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,19 @@
#
# make upgrade
#
black==24.2.0
backports-tarfile==1.0.0
# via jaraco-context
black==24.3.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
build==1.0.3
build==1.2.1
# via
# -r requirements/pip-tools.txt
# pip-tools
bump2version==1.0.1
# via -r requirements/dev.in
cachetools==5.3.2
cachetools==5.3.3
# via
# -r requirements/ci.txt
# tox
Expand Down Expand Up @@ -45,12 +47,12 @@ colorama==0.4.6
# via
# -r requirements/ci.txt
# tox
coverage[toml]==7.4.1
coverage[toml]==7.4.4
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# pytest-cov
cryptography==42.0.3
cryptography==42.0.5
# via secretstorage
distlib==0.3.8
# via
Expand All @@ -63,7 +65,7 @@ exceptiongroup==1.2.0
# -r requirements/ci.txt
# -r requirements/quality.txt
# pytest
filelock==3.13.1
filelock==3.13.3
# via
# -r requirements/ci.txt
# tox
Expand All @@ -77,28 +79,32 @@ idna==3.6
# -r requirements/ci.txt
# -r requirements/quality.txt
# requests
importlib-metadata==7.0.1
importlib-metadata==7.1.0
# via
# -r requirements/pip-tools.txt
# build
# keyring
# twine
importlib-resources==6.1.1
importlib-resources==6.4.0
# via keyring
iniconfig==2.0.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# pytest
jaraco-classes==3.3.1
jaraco-classes==3.4.0
# via keyring
jaraco-context==5.3.0
# via keyring
jaraco-functools==4.0.0
# via keyring
jeepney==0.8.0
# via
# keyring
# secretstorage
keyring==24.3.0
keyring==25.1.0
# via twine
lxml==5.1.0
lxml==5.2.1
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
Expand All @@ -112,15 +118,17 @@ mccabe==0.7.0
mdurl==0.1.2
# via markdown-it-py
more-itertools==10.2.0
# via jaraco-classes
# via
# jaraco-classes
# jaraco-functools
mypy-extensions==1.0.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# black
nh3==0.2.15
nh3==0.2.17
# via readme-renderer
packaging==23.2
packaging==24.0
# via
# -r requirements/ci.txt
# -r requirements/pip-tools.txt
Expand All @@ -135,9 +143,9 @@ pathspec==0.12.1
# -r requirements/ci.txt
# -r requirements/quality.txt
# black
pip-tools==7.4.0
pip-tools==7.4.1
# via -r requirements/pip-tools.txt
pkginfo==1.9.6
pkginfo==1.10.0
# via twine
platformdirs==4.2.0
# via
Expand All @@ -157,7 +165,7 @@ pycodestyle==2.11.1
# -r requirements/ci.txt
# -r requirements/quality.txt
# flake8
pycparser==2.21
pycparser==2.22
# via cffi
pyflakes==3.2.0
# via
Expand All @@ -177,21 +185,21 @@ pyproject-hooks==1.0.0
# -r requirements/pip-tools.txt
# build
# pip-tools
pytest==8.0.1
pytest==8.1.1
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# pytest-cov
# pytest-mock
pytest-cov==4.1.0
pytest-cov==5.0.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
pytest-mock==3.12.0
pytest-mock==3.14.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
readme-renderer==42.0
readme-renderer==43.0
# via twine
requests==2.31.0
# via
Expand All @@ -203,7 +211,7 @@ requests-toolbelt==1.0.0
# via twine
rfc3986==2.0.0
# via twine
rich==13.7.0
rich==13.7.1
# via twine
secretstorage==3.3.3
# via keyring
Expand All @@ -220,11 +228,11 @@ tomli==2.0.1
# pyproject-hooks
# pytest
# tox
tox==4.13.0
tox==4.14.2
# via -r requirements/ci.txt
twine==5.0.0
# via -r requirements/dev.in
typing-extensions==4.9.0
typing-extensions==4.11.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
Expand All @@ -236,11 +244,11 @@ urllib3==2.2.1
# -r requirements/quality.txt
# requests
# twine
virtualenv==20.25.0
virtualenv==20.25.1
# via
# -r requirements/ci.txt
# tox
wheel==0.42.0
wheel==0.43.0
# via
# -r requirements/dev.in
# -r requirements/pip-tools.txt
Expand All @@ -253,7 +261,7 @@ youtube-dl==2021.12.17
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
zipp==3.17.0
zipp==3.18.1
# via
# -r requirements/pip-tools.txt
# importlib-metadata
Expand Down
12 changes: 6 additions & 6 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
#
# make upgrade
#
build==1.0.3
build==1.2.1
# via pip-tools
click==8.1.7
# via pip-tools
importlib-metadata==7.0.1
importlib-metadata==7.1.0
# via build
packaging==23.2
packaging==24.0
# via build
pip-tools==7.4.0
pip-tools==7.4.1
# via -r requirements/pip-tools.in
pyproject-hooks==1.0.0
# via
Expand All @@ -23,9 +23,9 @@ tomli==2.0.1
# build
# pip-tools
# pyproject-hooks
wheel==0.42.0
wheel==0.43.0
# via pip-tools
zipp==3.17.0
zipp==3.18.1
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
#
# make upgrade
#
wheel==0.42.0
wheel==0.43.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==24.0
# via -r requirements/pip.in
setuptools==69.1.0
setuptools==69.2.0
# via -r requirements/pip.in
Loading

0 comments on commit 1f90be8

Please sign in to comment.