Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feanil/fix make upgrade #349

Merged
merged 2 commits into from
Jun 26, 2024
Merged

feanil/fix make upgrade #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86d9095
build: Compile test deps before dev deps.
feanil Jun 25, 2024
721b14d
chore: Run `make upgrade`
feanil Jun 25, 2024
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ upgrade: piptools $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt fil
sed 's/Django<4.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
mv requirements/common_constraints.tmp requirements/common_constraints.txt
pip-compile --upgrade --allow-unsafe --verbose --rebuild -o requirements/base.txt requirements/base.in
pip-compile --upgrade --allow-unsafe --verbose --rebuild -o requirements/dev.txt requirements/dev.in
pip-compile --upgrade --allow-unsafe --verbose --rebuild -o requirements/test.txt requirements/test.in
pip-compile --upgrade --allow-unsafe --verbose --rebuild -o requirements/dev.txt requirements/dev.in
pip-compile --upgrade --allow-unsafe --verbose --rebuild -o requirements/pip-tools.txt requirements/pip-tools.in
pip-compile --upgrade --allow-unsafe --verbose --rebuild -o requirements/ci.txt requirements/ci.in
# Let tox control the Django and DRF versions for tests
Expand Down
6 changes: 3 additions & 3 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ edx-django-utils==5.14.2
# via -r requirements/base.in
idna==3.7
# via requests
newrelic==9.10.0
newrelic==9.11.0
# via edx-django-utils
pbr==6.0.0
# via stevedore
psutil==5.9.8
psutil==6.0.0
# via edx-django-utils
pycparser==2.22
# via cffi
Expand All @@ -56,5 +56,5 @@ stevedore==5.2.0
# via edx-django-utils
typing-extensions==4.12.2
# via asgiref
urllib3==2.2.1
urllib3==2.2.2
# via requests
4 changes: 2 additions & 2 deletions requirements/ci.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ colorama==0.4.6
# via tox
distlib==0.3.8
# via virtualenv
filelock==3.14.0
filelock==3.15.4
# via
# tox
# virtualenv
Expand All @@ -35,5 +35,5 @@ tomli==2.0.1
# tox
tox==4.15.1
# via -r requirements/ci.in
virtualenv==20.26.2
virtualenv==20.26.3
# via tox
84 changes: 47 additions & 37 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,15 @@ asgiref==3.8.1
# via
# -r requirements/test.txt
# django
astroid==3.1.0
astroid==3.2.2
# via
# -r requirements/test.txt
# pylint
# pylint-celery
backports-tarfile==1.2.0
# via
# -r requirements/test.txt
# jaraco-context
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
Expand All @@ -26,7 +30,7 @@ cachetools==5.3.3
# via
# -r requirements/ci.txt
# tox
certifi==2024.2.2
certifi==2024.6.2
# via
# -r requirements/test.txt
# requests
Expand Down Expand Up @@ -56,20 +60,22 @@ click-log==0.4.0
# via
# -r requirements/test.txt
# edx-lint
code-annotations==1.7.0
code-annotations==1.8.0
# via
# -r requirements/test.txt
# edx-lint
colorama==0.4.6
# via
# -r requirements/ci.txt
# tox
coverage[toml]==7.4.4
coverage[toml]==7.5.4
# via
# -r requirements/test.txt
# pytest-cov
cryptography==42.0.8
# via secretstorage
# via
# -r requirements/test.txt
# secretstorage
ddt==1.7.2
# via -r requirements/test.txt
dill==0.3.8
Expand All @@ -83,6 +89,7 @@ distlib==0.3.8
django==4.2.13
# via
# -c requirements/common_constraints.txt
# -r requirements/test.txt
# django-crum
# django-waffle
# edx-django-utils
Expand All @@ -98,26 +105,26 @@ docutils==0.20.1
# via
# -r requirements/test.txt
# readme-renderer
edx-django-utils==5.12.0
edx-django-utils==5.14.2
# via -r requirements/test.txt
edx-lint==5.3.6
# via -r requirements/test.txt
exceptiongroup==1.2.0
exceptiongroup==1.2.1
# via
# -r requirements/test.txt
# pytest
filelock==3.13.3
filelock==3.14.0
# via
# -r requirements/ci.txt
# tox
# virtualenv
freezegun==1.4.0
freezegun==1.5.1
# via -r requirements/test.txt
idna==3.6
idna==3.7
# via
# -r requirements/test.txt
# requests
importlib-metadata==7.1.0
importlib-metadata==7.2.1
# via
# -r requirements/pip-tools.txt
# -r requirements/test.txt
Expand All @@ -140,23 +147,24 @@ jaraco-classes==3.4.0
# via
# -r requirements/test.txt
# keyring
jaraco-context==4.3.0
jaraco-context==5.3.0
# via
# -r requirements/test.txt
# keyring
jaraco-functools==4.0.0
jaraco-functools==4.0.1
# via
# -r requirements/test.txt
# keyring
jeepney==0.8.0
# via
# -r requirements/test.txt
# keyring
# secretstorage
jinja2==3.1.3
jinja2==3.1.4
# via
# -r requirements/test.txt
# code-annotations
keyring==25.1.0
keyring==25.2.1
# via
# -r requirements/test.txt
# twine
Expand All @@ -176,12 +184,12 @@ mdurl==0.1.2
# via
# -r requirements/test.txt
# markdown-it-py
more-itertools==10.2.0
more-itertools==10.3.0
# via
# -r requirements/test.txt
# jaraco-classes
# jaraco-functools
newrelic==9.8.0
newrelic==9.11.0
# via
# -r requirements/test.txt
# edx-django-utils
Expand All @@ -205,41 +213,41 @@ pbr==6.0.0
# stevedore
pip-tools==7.4.1
# via -r requirements/pip-tools.txt
pkginfo==1.10.0
pkginfo==1.11.1
# via
# -r requirements/test.txt
# twine
platformdirs==4.2.0
platformdirs==4.2.2
# via
# -r requirements/ci.txt
# -r requirements/test.txt
# pylint
# tox
# virtualenv
pluggy==1.4.0
pluggy==1.5.0
# via
# -r requirements/ci.txt
# -r requirements/test.txt
# pytest
# tox
psutil==5.9.8
psutil==6.0.0
# via
# -r requirements/test.txt
# edx-django-utils
pycodestyle==2.11.1
pycodestyle==2.12.0
# via -r requirements/test.txt
pycparser==2.22
# via
# -r requirements/test.txt
# cffi
pygments==2.17.2
pygments==2.18.0
# via
# -r requirements/test.txt
# readme-renderer
# rich
pyjwt==2.8.0
# via -r requirements/test.txt
pylint==3.1.0
pylint==3.2.3
# via
# -r requirements/test.txt
# edx-lint
Expand Down Expand Up @@ -272,7 +280,7 @@ pyproject-hooks==1.1.0
# -r requirements/pip-tools.txt
# build
# pip-tools
pytest==8.1.1
pytest==8.2.2
# via
# -r requirements/test.txt
# pytest-cov
Expand All @@ -298,7 +306,7 @@ readme-renderer==43.0
# via
# -r requirements/test.txt
# twine
requests==2.31.0
requests==2.32.3
# via
# -r requirements/test.txt
# requests-toolbelt
Expand All @@ -309,7 +317,7 @@ requests-toolbelt==1.0.0
# via
# -r requirements/test.txt
# twine
responses==0.25.0
responses==0.25.3
# via -r requirements/test.txt
rfc3986==2.0.0
# via
Expand All @@ -320,15 +328,17 @@ rich==13.7.1
# -r requirements/test.txt
# twine
secretstorage==3.3.3
# via keyring
# via
# -r requirements/test.txt
# keyring
six==1.16.0
# via
# -r requirements/test.txt
# edx-lint
# python-dateutil
slumber==0.7.1
# via -r requirements/test.txt
sqlparse==0.4.4
sqlparse==0.5.0
# via
# -r requirements/test.txt
# django
Expand All @@ -353,28 +363,28 @@ tomli==2.0.1
# pyproject-api
# pytest
# tox
tomlkit==0.12.4
tomlkit==0.12.5
# via
# -r requirements/test.txt
# pylint
tox==4.14.2
tox==4.15.1
# via -r requirements/ci.txt
twine==5.0.0
twine==5.1.0
# via -r requirements/test.txt
typing-extensions==4.10.0
typing-extensions==4.12.2
# via
# -r requirements/test.txt
# asgiref
# astroid
# pylint
# rich
urllib3==2.2.1
urllib3==2.2.2
# via
# -r requirements/test.txt
# requests
# responses
# twine
virtualenv==20.25.1
virtualenv==20.26.2
# via
# -r requirements/ci.txt
# tox
Expand All @@ -391,11 +401,11 @@ zipp==3.17.0
# importlib-resources

# The following packages are considered to be unsafe in a requirements file:
pip==24.0
pip==24.1
# via
# -r requirements/pip-tools.txt
# pip-tools
setuptools==70.0.0
setuptools==70.1.1
# via
# -r requirements/pip-tools.txt
# pip-tools
6 changes: 3 additions & 3 deletions requirements/pip-tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ build==1.2.1
# via pip-tools
click==8.1.7
# via pip-tools
importlib-metadata==7.1.0
importlib-metadata==7.2.1
# via build
packaging==23.2
# via
Expand All @@ -32,7 +32,7 @@ zipp==3.17.0
# importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
pip==24.0
pip==24.1
# via pip-tools
setuptools==70.0.0
setuptools==70.1.1
# via pip-tools
4 changes: 2 additions & 2 deletions requirements/pip.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ wheel==0.43.0
# via -r requirements/pip.in

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