Skip to content

Commit

Permalink
Merge pull request #167 from openedx/alangsto/fix_requirements_upgrade
Browse files Browse the repository at this point in the history
fix: add ci requirements to ensure that dependency conflicts are avoided
  • Loading branch information
alangsto authored Nov 21, 2023
2 parents d398ed8 + d1d6b3f commit eb77d19
Show file tree
Hide file tree
Showing 8 changed files with 151 additions and 127 deletions.
4 changes: 2 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
certifi==2023.7.22
certifi==2023.11.17
# via requests
charset-normalizer==3.3.2
# via requests
Expand All @@ -14,7 +14,7 @@ lxml==4.9.3
# via -r requirements/base.in
requests==2.31.0
# via -r requirements/base.in
urllib3==2.0.7
urllib3==2.1.0
# via requests
youtube-dl==2021.12.17
# via -r requirements/base.in
1 change: 1 addition & 0 deletions requirements/ci.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Requirements for running tests in CI
-c constraints.txt
-r quality.txt # Core and quality check dependencies

coverage
tox
106 changes: 88 additions & 18 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,107 @@
#
# make upgrade
#
cachetools==5.3.2
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
coverage==7.3.2
# via -r requirements/ci.in
appdirs==1.4.4
# via virtualenv
black==23.11.0
# via -r requirements/quality.txt
certifi==2023.11.17
# via
# -r requirements/quality.txt
# requests
charset-normalizer==3.3.2
# via
# -r requirements/quality.txt
# requests
click==8.1.7
# via
# -r requirements/quality.txt
# black
coverage[toml]==7.3.2
# via
# -r requirements/ci.in
# -r requirements/quality.txt
# coverage
# pytest-cov
distlib==0.3.7
# via virtualenv
filelock==3.13.1
# via
# tox
# virtualenv
flake8==6.1.0
# via -r requirements/quality.txt
idna==3.4
# via
# -r requirements/quality.txt
# requests
iniconfig==2.0.0
# via
# -r requirements/quality.txt
# pytest
lxml==4.9.3
# via -r requirements/quality.txt
mccabe==0.7.0
# via
# -r requirements/quality.txt
# flake8
mypy-extensions==1.0.0
# via
# -r requirements/quality.txt
# black
packaging==23.2
# via
# pyproject-api
# -r requirements/quality.txt
# black
# pytest
# tox
platformdirs==3.11.0
pathspec==0.11.2
# via
# tox
# virtualenv
# -r requirements/quality.txt
# black
platformdirs==4.0.0
# via
# -r requirements/quality.txt
# black
pluggy==1.3.0
# via
# -r requirements/quality.txt
# pytest
# tox
py==1.11.0
# via tox
pyproject-api==1.6.1
# via tox
tomli==2.0.1
pycodestyle==2.11.1
# via
# -r requirements/quality.txt
# flake8
pyflakes==3.1.0
# via
# -r requirements/quality.txt
# flake8
pytest==7.4.3
# via
# -r requirements/quality.txt
# pytest-cov
# pytest-mock
pytest-cov==4.1.0
# via -r requirements/quality.txt
pytest-mock==3.12.0
# via -r requirements/quality.txt
requests==2.31.0
# via -r requirements/quality.txt
six==1.16.0
# via
# pyproject-api
# tox
tox==4.11.3
# virtualenv
tox==3.28.0
# via -r requirements/ci.in
virtualenv==20.24.6
urllib3==2.1.0
# via
# -r requirements/quality.txt
# requests
virtualenv==20.4.7
# via tox
xmlformatter==0.2.4
# via -r requirements/quality.txt
youtube-dl==2021.12.17
# via -r requirements/quality.txt
Loading

0 comments on commit eb77d19

Please sign in to comment.