Skip to content

Commit

Permalink
chore: Upgrading django-simple-history.
Browse files Browse the repository at this point in the history
  • Loading branch information
@awais786
awais786 committed Jul 28, 2023
1 parent 8118e2d commit c5fa785
Show file tree
Hide file tree
Showing 11 changed files with 43 additions and 134 deletions.
15 changes: 12 additions & 3 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,31 @@ docs: ## generate Sphinx HTML documentation, including API docs
tox -e docs
$(BROWSER)docs/_build/html/index.html


# Define PIP_COMPILE_OPTS=-v to get more information during make upgrade.
PIP_COMPILE = pip-compile --rebuild --upgrade $(PIP_COMPILE_OPTS)

COMMON_CONSTRAINTS_TXT=requirements/common_constraints.txt
.PHONY: $(COMMON_CONSTRAINTS_TXT)
$(COMMON_CONSTRAINTS_TXT):
wget -O "$(@)" https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt || touch "$(@)"
echo "$(COMMON_CONSTRAINTS_TEMP_COMMENT)" | cat - $(@) > temp && mv temp $(@)

upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
upgrade: $(COMMON_CONSTRAINTS_TXT)
sed 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
mv requirements/common_constraints.tmp requirements/common_constraints.txt
pip install -qr requirements/pip-tools.txt
# Make sure to compile files after any other files they include!
# need to do this to remove django-simple-history from common constraint.
$(PIP_COMPILE) -o requirements/pip-tools.txt requirements/pip-tools.in
$(PIP_COMPILE) -o requirements/base.txt requirements/base.in
$(PIP_COMPILE) -o requirements/test.txt requirements/test.in
$(PIP_COMPILE) -o requirements/doc.txt requirements/doc.in
$(PIP_COMPILE) -o requirements/quality.txt requirements/quality.in
$(PIP_COMPILE) -o requirements/ci.txt requirements/ci.in
$(PIP_COMPILE) -o requirements/dev.txt requirements/dev.in
$(PIP_COMPILE) -o requirements/celery44.txt requirements/celery44.in
$(PIP_COMPILE) -o requirements/celery50.txt requirements/celery50.in
$(PIP_COMPILE) -o requirements/celery53.txt requirements/celery53.in
# Let tox control the Django version for tests
sed '/^[dD]jango==/d' requirements/test.txt > requirements/test.tmp
mv requirements/test.tmp requirements/test.txt
Expand Down
7 changes: 4 additions & 3 deletions requirements/base.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ django==3.2.20
# django-config-models
# django-crum
# django-model-utils
# django-waffle
# djangorestframework
# drf-jwt
# drf-yasg
Expand All @@ -74,7 +75,7 @@ django-simple-history==3.0.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
django-waffle==3.0.0
django-waffle==4.0.0
# via
# edx-django-utils
# edx-drf-extensions
Expand All @@ -93,7 +94,7 @@ drf-yasg==1.21.7
# via edx-api-doc-tools
edx-api-doc-tools==1.7.0
# via -r requirements/base.in
edx-celeryutils==1.2.2
edx-celeryutils==1.2.3
# via -r requirements/base.in
edx-django-utils==5.6.0
# via
Expand All @@ -119,7 +120,7 @@ kombu==5.3.1
# via celery
markupsafe==2.1.3
# via jinja2
newrelic==8.8.1
newrelic==8.9.0
# via edx-django-utils
packaging==23.1
# via drf-yasg
Expand Down
1 change: 0 additions & 1 deletion requirements/celery44.in
View file

This file was deleted.

20 changes: 0 additions & 20 deletions requirements/celery44.txt
View file

This file was deleted.

49 changes: 0 additions & 49 deletions requirements/celery50.txt
View file

This file was deleted.

0 requirements/celery50.in → requirements/celery53.in
View file
File renamed without changes.
25 changes: 2 additions & 23 deletions requirements/dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ certifi==2023.7.22
# via
# -r requirements/quality.txt
# requests
cffi==1.15.1
# via
# -r requirements/quality.txt
# cryptography
chardet==5.1.0
# via diff-cover
charset-normalizer==3.2.0
Expand Down Expand Up @@ -60,10 +56,6 @@ commonmark==0.9.1
# via
# -r requirements/quality.txt
# rich
cryptography==41.0.2
# via
# -r requirements/quality.txt
# secretstorage
diff-cover==7.7.0
# via -r requirements/dev.in
dill==0.3.7
Expand Down Expand Up @@ -114,11 +106,6 @@ jaraco-classes==3.3.0
# via
# -r requirements/quality.txt
# keyring
jeepney==0.8.0
# via
# -r requirements/quality.txt
# keyring
# secretstorage
jinja2==3.1.2
# via
# -r requirements/quality.txt
Expand Down Expand Up @@ -181,10 +168,6 @@ py==1.11.0
# tox
pycodestyle==2.10.0
# via -r requirements/quality.txt
pycparser==2.21
# via
# -r requirements/quality.txt
# cffi
pydantic==1.10.12
# via
# -r requirements/quality.txt
Expand All @@ -197,7 +180,7 @@ pygments==2.15.1
# diff-cover
# readme-renderer
# rich
pylint==2.17.4
pylint==2.17.5
# via
# -r requirements/quality.txt
# edx-lint
Expand Down Expand Up @@ -262,10 +245,6 @@ rstcheck-core==1.0.3
# via
# -r requirements/quality.txt
# rstcheck
secretstorage==3.3.3
# via
# -r requirements/quality.txt
# keyring
shellingham==1.5.0.post1
# via
# -r requirements/quality.txt
Expand Down Expand Up @@ -303,7 +282,7 @@ tomli==2.0.1
# pylint
# pyproject-hooks
# tox
tomlkit==0.11.8
tomlkit==0.12.1
# via
# -r requirements/quality.txt
# pylint
Expand Down
7 changes: 4 additions & 3 deletions requirements/doc.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ django==3.2.20
# django-config-models
# django-crum
# django-model-utils
# django-waffle
# djangorestframework
# drf-jwt
# drf-yasg
Expand All @@ -80,7 +81,7 @@ django-simple-history==3.0.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
django-waffle==3.0.0
django-waffle==4.0.0
# via
# edx-django-utils
# edx-drf-extensions
Expand All @@ -107,7 +108,7 @@ drf-yasg==1.21.7
# via edx-api-doc-tools
edx-api-doc-tools==1.7.0
# via -r requirements/base.in
edx-celeryutils==1.2.2
edx-celeryutils==1.2.3
# via -r requirements/base.in
edx-django-utils==5.6.0
# via
Expand Down Expand Up @@ -141,7 +142,7 @@ kombu==5.3.1
# via celery
markupsafe==2.1.3
# via jinja2
newrelic==8.8.1
newrelic==8.9.0
# via edx-django-utils
packaging==23.1
# via
Expand Down
16 changes: 2 additions & 14 deletions requirements/quality.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ bleach==6.0.0
# via readme-renderer
certifi==2023.7.22
# via requests
cffi==1.15.1
# via cryptography
charset-normalizer==3.2.0
# via requests
click==8.1.6
Expand All @@ -32,8 +30,6 @@ colorama==0.4.6
# via typer
commonmark==0.9.1
# via rich
cryptography==41.0.2
# via secretstorage
dill==0.3.7
# via pylint
django==3.2.20
Expand All @@ -60,10 +56,6 @@ isort==5.12.0
# pylint
jaraco-classes==3.3.0
# via keyring
jeepney==0.8.0
# via
# keyring
# secretstorage
jinja2==3.1.2
# via code-annotations
keyring==24.2.0
Expand All @@ -84,8 +76,6 @@ platformdirs==3.9.1
# via pylint
pycodestyle==2.10.0
# via -r requirements/quality.in
pycparser==2.21
# via cffi
pydantic==1.10.12
# via rstcheck-core
pydocstyle==6.3.0
Expand All @@ -94,7 +84,7 @@ pygments==2.15.1
# via
# readme-renderer
# rich
pylint==2.17.4
pylint==2.17.5
# via
# edx-lint
# pylint-celery
Expand Down Expand Up @@ -132,8 +122,6 @@ rstcheck==6.1.2
# via -r requirements/quality.in
rstcheck-core==1.0.3
# via rstcheck
secretstorage==3.3.3
# via keyring
shellingham==1.5.0.post1
# via typer
six==1.16.0
Expand All @@ -150,7 +138,7 @@ text-unidecode==1.3
# via python-slugify
tomli==2.0.1
# via pylint
tomlkit==0.11.8
tomlkit==0.12.1
# via pylint
twine==4.0.2
# via -r requirements/quality.in
Expand Down
7 changes: 4 additions & 3 deletions requirements/test.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ ddt==1.6.0
# django-config-models
# django-crum
# django-model-utils
# django-waffle
# djangorestframework
# drf-jwt
# drf-yasg
Expand All @@ -100,7 +101,7 @@ django-simple-history==3.0.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.txt
django-waffle==3.0.0
django-waffle==4.0.0
# via
# -r requirements/base.txt
# edx-django-utils
Expand All @@ -124,7 +125,7 @@ drf-yasg==1.21.7
# edx-api-doc-tools
edx-api-doc-tools==1.7.0
# via -r requirements/base.txt
edx-celeryutils==1.2.2
edx-celeryutils==1.2.3
# via -r requirements/base.txt
edx-django-utils==5.6.0
# via
Expand Down Expand Up @@ -169,7 +170,7 @@ markupsafe==2.1.3
# jinja2
mock==5.1.0
# via -r requirements/test.in
newrelic==8.8.1
newrelic==8.9.0
# via
# -r requirements/base.txt
# edx-django-utils
Expand Down
Loading

0 comments on commit c5fa785

Please sign in to comment.