Skip to content

Commit

Permalink
chore: upgrade django-simple-history package version
Browse files Browse the repository at this point in the history
  • Loading branch information
UsamaSadiq committed Sep 27, 2023
1 parent 657550c commit 93f7369
Show file tree
Hide file tree
Showing 11 changed files with 121 additions and 129 deletions.
10 changes: 9 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,16 @@ migrate: ## apply database migrations
html_coverage: ## generate and view HTML coverage report
coverage html && open htmlcov/index.html

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: piptools ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
upgrade: piptools $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
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
# Make sure to compile files after any other files they include!
pip-compile --upgrade --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in
pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
Expand Down
22 changes: 10 additions & 12 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ attrs==23.1.0
# openedx-events
bleach==6.0.0
# via lti-consumer-xblock
boto3==1.28.52
boto3==1.28.55
# via fs-s3fs
botocore==1.31.52
botocore==1.31.55
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -52,7 +52,7 @@ defusedxml==0.7.1
# social-auth-core
django==3.2.21
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -c requirements/common_constraints.txt
# -r requirements/base.in
# django-appconf
# django-config-models
Expand Down Expand Up @@ -83,7 +83,7 @@ django==3.2.21
# social-auth-app-django
django-appconf==1.0.5
# via django-statici18n
django-config-models==2.5.0
django-config-models==2.5.1
# via lti-consumer-xblock
django-cors-headers==4.2.0
# via -r requirements/base.in
Expand All @@ -99,10 +99,8 @@ django-model-utils==4.3.1
# via -r requirements/base.in
django-rest-swagger==2.2.0
# via -r requirements/base.in
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-simple-history==3.4.0
# via -r requirements/base.in
django-statici18n==2.4.0
# via lti-consumer-xblock
django-waffle==4.0.0
Expand Down Expand Up @@ -210,7 +208,7 @@ markupsafe==2.1.3
# xblock
mysqlclient==2.2.0
# via -r requirements/base.in
newrelic==9.0.0
newrelic==9.1.0
# via edx-django-utils
oauthlib==3.2.2
# via
Expand Down Expand Up @@ -278,7 +276,7 @@ pyyaml==6.0.1
# drf-yasg
# edx-django-release-util
# xblock
redis==5.0.0
redis==5.0.1
# via walrus
requests==2.31.0
# via
Expand All @@ -291,7 +289,7 @@ requests==2.31.0
# social-auth-core
requests-oauthlib==1.3.1
# via social-auth-core
s3transfer==0.6.2
s3transfer==0.7.0
# via boto3
semantic-version==2.10.0
# via edx-drf-extensions
Expand Down Expand Up @@ -348,7 +346,7 @@ webencodings==0.5.1
# via bleach
webob==1.8.7
# via xblock
xblock[django]==1.7.0
xblock[django]==1.8.0
# via
# lti-consumer-xblock
# xblock-utils
Expand Down
2 changes: 1 addition & 1 deletion requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ tomli==2.0.1
# via tox
tox==3.28.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -c requirements/common_constraints.txt
# -r requirements/ci.in
virtualenv==20.24.5
# via tox
28 changes: 28 additions & 0 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@

# A central location for most common version constraints
# (across edx repos) for pip-installation.
#
# Similar to other constraint files this file doesn't install any packages.
# It specifies version constraints that will be applied if a package is needed.
# When pinning something here, please provide an explanation of why it is a good
# idea to pin this package across all edx repos, Ideally, link to other information
# that will help people in the future to remove the pin when possible.
# Writing an issue against the offending project and linking to it here is good.
#
# Note: Changes to this file will automatically be used by other repos, referencing
# this file from Github directly. It does not require packaging in edx-lint.


# using LTS django version
Django<4.0

# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
elasticsearch<7.14.0

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected


# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
tox<4.0.0
4 changes: 1 addition & 3 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@
# linking to it here is good.

# Common constraints for edx repos
-c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt


-c common_constraints.txt
32 changes: 11 additions & 21 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ asgiref==3.7.2
# via
# -r requirements/validation.txt
# django
astroid==2.15.6
astroid==2.15.8
# via
# -r requirements/validation.txt
# pylint
Expand All @@ -30,11 +30,11 @@ bleach==6.0.0
# via
# -r requirements/validation.txt
# lti-consumer-xblock
boto3==1.28.52
boto3==1.28.55
# via
# -r requirements/validation.txt
# fs-s3fs
botocore==1.31.52
botocore==1.31.55
# via
# -r requirements/validation.txt
# boto3
Expand Down Expand Up @@ -93,7 +93,6 @@ cryptography==41.0.4
# via
# -r requirements/validation.txt
# pyjwt
# secretstorage
# social-auth-core
ddt==1.6.0
# via -r requirements/validation.txt
Expand Down Expand Up @@ -148,7 +147,7 @@ django-appconf==1.0.5
# via
# -r requirements/validation.txt
# django-statici18n
django-config-models==2.5.0
django-config-models==2.5.1
# via
# -r requirements/validation.txt
# lti-consumer-xblock
Expand All @@ -173,7 +172,7 @@ django-model-utils==4.3.1
# via -r requirements/validation.txt
django-rest-swagger==2.2.0
# via -r requirements/validation.txt
django-simple-history==3.0.0
django-simple-history==3.4.0
# via -r requirements/validation.txt
django-statici18n==2.4.0
# via
Expand Down Expand Up @@ -321,11 +320,6 @@ jaraco-classes==3.3.0
# via
# -r requirements/validation.txt
# keyring
jeepney==0.8.0
# via
# -r requirements/validation.txt
# keyring
# secretstorage
jinja2==3.1.2
# via
# -r requirements/validation.txt
Expand Down Expand Up @@ -392,7 +386,7 @@ more-itertools==10.1.0
# jaraco-classes
mysqlclient==2.2.0
# via -r requirements/validation.txt
newrelic==9.0.0
newrelic==9.1.0
# via
# -r requirements/validation.txt
# edx-django-utils
Expand Down Expand Up @@ -497,7 +491,7 @@ pyjwt[crypto]==2.8.0
# edx-drf-extensions
# edx-rest-api-client
# social-auth-core
pylint==2.17.5
pylint==2.17.6
# via
# -r requirements/validation.txt
# edx-lint
Expand Down Expand Up @@ -573,7 +567,7 @@ readme-renderer==42.0
# via
# -r requirements/validation.txt
# twine
redis==5.0.0
redis==5.0.1
# via
# -r requirements/validation.txt
# walrus
Expand Down Expand Up @@ -608,14 +602,10 @@ rich==13.5.3
# via
# -r requirements/validation.txt
# twine
s3transfer==0.6.2
s3transfer==0.7.0
# via
# -r requirements/validation.txt
# boto3
secretstorage==3.3.3
# via
# -r requirements/validation.txt
# keyring
semantic-version==2.10.0
# via
# -r requirements/validation.txt
Expand Down Expand Up @@ -689,7 +679,7 @@ tox==3.28.0
# via -r requirements/validation.txt
twine==4.0.2
# via -r requirements/validation.txt
types-pyyaml==6.0.12.11
types-pyyaml==6.0.12.12
# via
# -r requirements/validation.txt
# responses
Expand Down Expand Up @@ -743,7 +733,7 @@ wrapt==1.15.0
# via
# -r requirements/validation.txt
# astroid
xblock[django]==1.7.0
xblock[django]==1.8.0
# via
# -r requirements/validation.txt
# lti-consumer-xblock
Expand Down
Loading

0 comments on commit 93f7369

Please sign in to comment.