Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
fix: include setuptools in requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
UsamaSadiq committed Mar 4, 2024
1 parent 56d8b6c commit abcc7df
Show file tree
Hide file tree
Showing 10 changed files with 50 additions and 15 deletions.
22 changes: 11 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,19 @@ upgrade: piptools $(COMMON_CONSTRAINTS_TXT) ## re-compile requirements .txt fi
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 --allow-unsafe --rebuild --upgrade -o requirements/pip.txt requirements/pip.in
pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
pip-compile --allow-unsafe --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
pip install -qr requirements/pip.txt
pip install -qr requirements/pip-tools.txt
pip-compile --upgrade -o requirements/github.txt requirements/github.in
pip-compile --upgrade -o requirements/optional.txt requirements/optional.in
pip-compile --upgrade -o requirements/base.txt requirements/base.in
pip-compile --upgrade -o requirements/docs.txt requirements/docs.in
pip-compile --upgrade -o requirements/test.txt requirements/test.in
pip-compile --upgrade -o requirements/local.txt requirements/local.in
pip-compile --upgrade -o requirements/nonlocal.txt requirements/nonlocal.in
pip-compile --upgrade -o requirements/production.txt requirements/production.in
pip-compile --upgrade -o requirements/devstack.txt requirements/devstack.in
pip-compile --upgrade -o requirements/monitoring/requirements.txt requirements/monitoring/requirements.in
pip-compile --allow-unsafe --upgrade -o requirements/github.txt requirements/github.in
pip-compile --allow-unsafe --upgrade -o requirements/optional.txt requirements/optional.in
pip-compile --allow-unsafe --upgrade -o requirements/base.txt requirements/base.in
pip-compile --allow-unsafe --upgrade -o requirements/docs.txt requirements/docs.in
pip-compile --allow-unsafe --upgrade -o requirements/test.txt requirements/test.in
pip-compile --allow-unsafe --upgrade -o requirements/local.txt requirements/local.in
pip-compile --allow-unsafe --upgrade -o requirements/nonlocal.txt requirements/nonlocal.in
pip-compile --allow-unsafe --upgrade -o requirements/production.txt requirements/production.in
pip-compile --allow-unsafe --upgrade -o requirements/devstack.txt requirements/devstack.in
pip-compile --allow-unsafe --upgrade -o requirements/monitoring/requirements.txt requirements/monitoring/requirements.in

# Let tox control the Django version for tests
grep -e "^django==" requirements/production.txt > requirements/django.txt
Expand Down
1 change: 1 addition & 0 deletions requirements/base.in
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ pytz
redis
social-auth-app-django
backports.zoneinfo; python_version<'3.9'
setuptools
4 changes: 4 additions & 0 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -256,3 +256,7 @@ vine==5.1.0
# kombu
wcwidth==0.2.13
# via prompt-toolkit

# The following packages are considered to be unsafe in a requirements file:
setuptools==69.1.1
# via -r requirements/base.in
5 changes: 5 additions & 0 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@
# See BOM-2721 for more details.
# Below is the copied and edited version of common_constraints

# This is a temporary solution to override the real common_constraints.txt
# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
# See BOM-2721 for more details.
# Below is the copied and edited version of common_constraints

# A central location for most common version constraints
# (across edx repos) for pip-installation.
#
Expand Down
4 changes: 4 additions & 0 deletions requirements/devstack.txt
Original file line number Diff line number Diff line change
Expand Up @@ -697,3 +697,7 @@ zipp==3.17.0
# via
# -r requirements/local.txt
# importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
setuptools==69.1.1
# via -r requirements/local.txt
4 changes: 4 additions & 0 deletions requirements/local.txt
Original file line number Diff line number Diff line change
Expand Up @@ -684,3 +684,7 @@ zipp==3.17.0
# via
# -r requirements/docs.txt
# importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
setuptools==69.1.1
# via -r requirements/test.txt
9 changes: 8 additions & 1 deletion requirements/monitoring/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1094,4 +1094,11 @@ zope-interface==6.2
# gevent

# The following packages are considered to be unsafe in a requirements file:
# setuptools
setuptools==69.1.1
# via
# -r requirements/monitoring/../devstack.txt
# -r requirements/monitoring/../local.txt
# -r requirements/monitoring/../production.txt
# -r requirements/monitoring/../test.txt
# zope-event
# zope-interface
6 changes: 4 additions & 2 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,7 @@ zipp==3.17.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
# setuptools
pip==24.0
# via pip-tools
setuptools==69.1.1
# via pip-tools
6 changes: 5 additions & 1 deletion requirements/production.txt
Original file line number Diff line number Diff line change
Expand Up @@ -376,4 +376,8 @@ zope-interface==6.2
# via gevent

# The following packages are considered to be unsafe in a requirements file:
# setuptools
setuptools==69.1.1
# via
# -r requirements/base.txt
# zope-event
# zope-interface
4 changes: 4 additions & 0 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -501,3 +501,7 @@ xmltodict==0.13.0
# via moto
yamllint==1.35.1
# via -r requirements/test.in

# The following packages are considered to be unsafe in a requirements file:
setuptools==69.1.1
# via -r requirements/base.txt

0 comments on commit abcc7df

Please sign in to comment.