Skip to content

Commit

Permalink
Merge pull request #107 from openedx/jenkins/zshkoor/update-pip-tools…
Browse files Browse the repository at this point in the history
…-to-613-ba64475

fix: update pip-tools to 6.13.0
  • Loading branch information
UsamaSadiq authored Apr 28, 2023
2 parents a3f69d5 + 456fc9e commit b35e869
Show file tree
Hide file tree
Showing 8 changed files with 155 additions and 143 deletions.
22 changes: 11 additions & 11 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
#
# 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
#
appdirs==1.4.4
# via fs
asgiref==3.5.2
asgiref==3.6.0
# via django
django==3.2.13
django==3.2.18
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
fs==2.4.16
# via xblock
lxml==4.9.0
lxml==4.9.2
# via xblock
mako==1.2.0
mako==1.2.4
# via xblock-utils
markupsafe==2.1.1
markupsafe==2.1.2
# via
# mako
# xblock
python-dateutil==2.8.2
# via xblock
pytz==2022.1
pytz==2023.3
# via
# django
# xblock
pyyaml==6.0
# via xblock
simplejson==3.17.6
simplejson==3.19.1
# via xblock-utils
six==1.16.0
# via
# -r requirements/base.in
# fs
# python-dateutil
sqlparse==0.4.2
sqlparse==0.4.4
# via django
web-fragments==2.0.0
# via
# xblock
# xblock-utils
webob==1.8.7
# via xblock
xblock==1.6.1
xblock==1.6.2
# via
# -r requirements/base.in
# xblock-utils
Expand Down
39 changes: 18 additions & 21 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
#
# 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
certifi==2022.12.7
# via requests
charset-normalizer==2.0.12
charset-normalizer==3.1.0
# via requests
coverage==6.4.1
coverage==6.5.0
# via coveralls
coveralls==3.3.1
# via -r requirements/ci.in
distlib==0.3.4
distlib==0.3.6
# via
# -r requirements/tox.txt
# virtualenv
docopt==0.6.2
# via coveralls
filelock==3.7.1
filelock==3.12.0
# via
# -r requirements/tox.txt
# tox
# virtualenv
idna==3.3
idna==3.4
# via requests
packaging==21.3
packaging==23.1
# via
# -r requirements/tox.txt
# tox
platformdirs==2.5.2
platformdirs==3.4.0
# via
# -r requirements/tox.txt
# virtualenv
Expand All @@ -41,26 +41,23 @@ py==1.11.0
# via
# -r requirements/tox.txt
# tox
pyparsing==3.0.9
# via
# -r requirements/tox.txt
# packaging
requests==2.28.0
requests==2.29.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
# tox
tox==3.25.0
# via -r requirements/tox.txt
urllib3==1.26.9
tox==3.28.0
# via
# -c requirements/common_constraints.txt
# -r requirements/tox.txt
urllib3==1.26.15
# via requests
virtualenv==20.14.1
virtualenv==20.22.0
# via
# -r requirements/tox.txt
# tox
11 changes: 9 additions & 2 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,14 @@ Django<4.0
# 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

# 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

# edx-sphinx-theme is not compatible with latest Sphinx==6.0.0 version
# Pinning Sphinx version unless the compatibility issue gets resolved
# For details, see issue https://github.com/openedx/edx-sphinx-theme/issues/197
sphinx<6.0.0
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.40.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==22.1.2
pip==23.1.2
# via -r requirements/pip.in
setuptools==67.7.2
# via -r requirements/pip.in
setuptools==59.8.0
# via
# -c requirements/common_constraints.txt
# -r requirements/pip.in
18 changes: 11 additions & 7 deletions requirements/pip_tools.txt
Original file line number Diff line number Diff line change
@@ -1,18 +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
#
click==8.1.3
build==0.10.0
# via pip-tools
pep517==0.12.0
click==8.1.3
# via pip-tools
pip-tools==6.6.2
packaging==23.1
# via build
pip-tools==6.13.0
# via -r requirements/pip_tools.in
pyproject-hooks==1.0.0
# via build
tomli==2.0.1
# via pep517
wheel==0.37.1
# via build
wheel==0.40.0
# via pip-tools

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

0 comments on commit b35e869

Please sign in to comment.