Skip to content

Commit

Permalink
Merge pull request #95 from openedx/jenkins/upgrade-python-requiremen…
Browse files Browse the repository at this point in the history
…ts-c81a52e

Python Requirements Update
  • Loading branch information
Feanil Patel authored Mar 20, 2024
2 parents 74df58e + 5a6acb1 commit 3eba2eb
Show file tree
Hide file tree
Showing 10 changed files with 157 additions and 136 deletions.
8 changes: 4 additions & 4 deletions pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
# SERIOUSLY.
#
# ------------------------------
# Generated by edx-lint version: 5.2.5
# Generated by edx-lint version: 5.3.6
# ------------------------------
[MASTER]
ignore = migrations
Expand Down Expand Up @@ -259,6 +259,7 @@ enable =
useless-suppression,
disable =
bad-indentation,
broad-exception-raised,
consider-using-f-string,
duplicate-code,
file-ignored,
Expand Down Expand Up @@ -286,7 +287,6 @@ disable =
illegal-waffle-usage,

logging-fstring-interpolation,
no-self-use,
django-not-available,

[REPORTS]
Expand Down Expand Up @@ -382,6 +382,6 @@ ext-import-graph =
int-import-graph =

[EXCEPTIONS]
overgeneral-exceptions = Exception
overgeneral-exceptions = builtins.Exception

# 0fc0d3e6714dbf532960c58d542877f3741cfdc8
# f90fb567b1f44429c280e9de9c5d874fb1d81d25
1 change: 0 additions & 1 deletion pylintrc_tweaks
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ load-plugins = edx_lint.pylint,pylint_django,pylint_celery

[MESSAGES CONTROL]
disable+ =
no-self-use,
django-not-available,
18 changes: 9 additions & 9 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
lxml==4.9.1
lxml==5.1.0
# via -r requirements/base.in
markupsafe==2.1.1
markupsafe==2.1.5
# via -r requirements/base.in
mpmath==1.2.1
mpmath==1.3.0
# via sympy
numpy==1.23.1
numpy==1.24.4
# via
# -r requirements/base.in
# scipy
pyparsing==3.0.9
pyparsing==3.1.2
# via -r requirements/base.in
scipy==1.8.1
scipy==1.10.1
# via -r requirements/base.in
sympy==1.10.1
sympy==1.12
# via -r requirements/base.in
58 changes: 32 additions & 26 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,66 +1,72 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
certifi==2022.6.15
cachetools==5.3.3
# via
# -r requirements/tox.txt
# tox
certifi==2024.2.2
# via requests
charset-normalizer==2.1.0
chardet==5.2.0
# via
# -r requirements/tox.txt
# tox
charset-normalizer==3.3.2
# via requests
coverage==6.4.2
colorama==0.4.6
# via
# -r requirements/tox.txt
# tox
coverage==6.5.0
# via coveralls
coveralls==3.3.1
# via -r requirements/ci.in
distlib==0.3.5
distlib==0.3.8
# via
# -r requirements/tox.txt
# virtualenv
docopt==0.6.2
# via coveralls
filelock==3.7.1
filelock==3.13.1
# via
# -r requirements/tox.txt
# tox
# virtualenv
idna==3.3
idna==3.6
# via requests
packaging==21.3
packaging==24.0
# via
# -r requirements/tox.txt
# pyproject-api
# tox
platformdirs==2.5.2
platformdirs==4.2.0
# via
# -r requirements/tox.txt
# tox
# virtualenv
pluggy==1.0.0
pluggy==1.4.0
# via
# -r requirements/tox.txt
# tox
py==1.11.0
pyproject-api==1.6.1
# via
# -r requirements/tox.txt
# tox
pyparsing==3.0.9
# via
# -r requirements/tox.txt
# packaging
requests==2.28.1
requests==2.31.0
# via coveralls
six==1.16.0
# via
# -r requirements/tox.txt
# tox
# virtualenv
toml==0.10.2
tomli==2.0.1
# via
# -r requirements/tox.txt
# pyproject-api
# tox
tox==3.25.1
tox==4.14.1
# via -r requirements/tox.txt
urllib3==1.26.10
urllib3==2.2.1
# via requests
virtualenv==20.15.1
virtualenv==20.25.1
# via
# -r requirements/tox.txt
# tox
13 changes: 10 additions & 3 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +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

setuptools<60

# 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
14 changes: 6 additions & 8 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
wheel==0.37.1
wheel==0.43.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==22.2
pip==24.0
# via -r requirements/pip.in
setuptools==69.2.0
# via -r requirements/pip.in
setuptools==59.8.0
# via
# -c requirements/common_constraints.txt
# -r requirements/pip.in
31 changes: 19 additions & 12 deletions requirements/pip_tools.txt
Original file line number Diff line number Diff line change
@@ -1,27 +1,34 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
build==0.8.0
build==1.1.1
# via pip-tools
click==8.1.3
click==8.1.7
# via pip-tools
packaging==21.3
# via build
pep517==0.12.0
importlib-metadata==6.11.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# build
packaging==24.0
# via build
pip-tools==6.8.0
pip-tools==7.4.1
# via -r requirements/pip_tools.in
pyparsing==3.0.9
# via packaging
pyproject-hooks==1.0.0
# via
# build
# pip-tools
tomli==2.0.1
# via
# build
# pep517
wheel==0.37.1
# pip-tools
# pyproject-hooks
wheel==0.43.0
# via pip-tools
zipp==3.18.1
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
Loading

0 comments on commit 3eba2eb

Please sign in to comment.