Skip to content

Fix make upgrade failure #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 9 additions & 15 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,19 @@
#
# make upgrade
#
click==7.1.2
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
jinja2==2.11.3
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
markupsafe==1.1.1
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# jinja2
pbr==5.6.0
click==8.0.3
# via -r requirements/base.in
jinja2==3.0.3
# via -r requirements/base.in
markupsafe==2.0.1
# via jinja2
pbr==5.8.0
# via stevedore
python-slugify==5.0.2
# via -r requirements/base.in
pyyaml==5.4.1
pyyaml==6.0
# via -r requirements/base.in
stevedore==3.3.0
stevedore==3.5.0
# via -r requirements/base.in
text-unidecode==1.3
# via python-slugify
40 changes: 19 additions & 21 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,52 +1,50 @@
#
# This file is autogenerated by pip-compile with python 3.8
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --output-file=requirements/ci.txt requirements/ci.in
# make upgrade
#
backports.entry-points-selectable==1.1.0
# via virtualenv
certifi==2021.5.30
certifi==2021.10.8
# via requests
charset-normalizer==2.0.4
charset-normalizer==2.0.10
# via requests
codecov==2.1.12
# via -r requirements/ci.in
coverage==5.5
coverage==6.2
# via codecov
distlib==0.3.2
distlib==0.3.4
# via virtualenv
filelock==3.0.12
filelock==3.4.2
# via
# tox
# virtualenv
idna==3.2
idna==3.3
# via requests
packaging==21.0
packaging==21.3
# via tox
platformdirs==2.2.0
platformdirs==2.4.1
# via virtualenv
pluggy==0.13.1
pluggy==1.0.0
# via tox
py==1.10.0
py==1.11.0
# via tox
pyparsing==2.4.7
pyparsing==3.0.7
# via packaging
requests==2.26.0
requests==2.27.1
# via codecov
six==1.16.0
# via
# tox
# virtualenv
toml==0.10.2
# via tox
tox==3.24.1
tox-battery==0.6.1
# via -r requirements/ci.in
tox==3.24.5
# via
# -r requirements/ci.in
# tox-battery
tox-battery==0.6.1
# via -r requirements/ci.in
urllib3==1.26.6
urllib3==1.26.8
# via requests
virtualenv==20.7.2
virtualenv==20.13.0
# via tox
2 changes: 1 addition & 1 deletion requirements/dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

-r pip-tools.txt # pip-tools and its dependencies, for managing requirements files
-r quality.txt # Core and quality check dependencies
-r travis.txt # tox and related dependencies
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line was causing the make upgrade to fail as this file had been renamed to ci.txt

-r ci.txt # tox and related dependencies

diff-cover # Changeset diff test coverage
Loading