-
Notifications
You must be signed in to change notification settings - Fork 33
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
chore: Post Django 3.2 cleanup #151
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
"""A simple event tracking library""" | ||
|
||
__version__ = '2.0.0' | ||
__version__ = '2.1.0' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
celery>=4.4,<4.5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,20 @@ | ||
amqp==5.0.9 | ||
# | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This file was supposed to have celery44 dependencies in it but in the last Upgrade Job these were updated mistakenly as they were not constrained. I have done a workaround to keep these requirements constrained and also made necessary changes for celery50 requirements. |
||
# This file is autogenerated by pip-compile with python 3.8 | ||
# To update, run: | ||
# | ||
# make upgrade | ||
# | ||
amqp==2.6.1 | ||
# via kombu | ||
billiard==3.6.4.0 | ||
celery==5.2.3 | ||
click==8.0.4 | ||
click-didyoumean==0.3.0 | ||
click-repl==0.2.0 | ||
kombu==5.2.3 | ||
prompt-toolkit==3.0.28 | ||
vine==5.0.0 | ||
# via celery | ||
celery==4.4.7 | ||
# via -r requirements/celery44.in | ||
kombu==4.6.11 | ||
# via celery | ||
pytz==2021.3 | ||
# via celery | ||
vine==1.3.0 | ||
# via | ||
# amqp | ||
# celery |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,20 @@ | ||
[tox] | ||
envlist = py38-celery{44,52}-django{32} | ||
envlist = py38-celery{44,52}-django{32,40} | ||
|
||
[testenv] | ||
setenv = | ||
DJANGO_SETTINGS_MODULE = eventtracking.django.tests.settings | ||
PYTHONPATH = {toxinidir} | ||
deps = | ||
celery44: -r{toxinidir}/requirements/celery44.txt | ||
celery52: -r{toxinidir}/requirements/celery52.txt | ||
-r{toxinidir}/requirements/test.txt | ||
commands = | ||
django32: pip install 'Django>=3.2,<3.3' | ||
pytest --cov-report=html --cov-report term-missing --cov-branch -k 'not integration and not performance' --cov-fail-under=95 --cov=eventtracking | ||
pytest --verbose -s -k 'integration' | ||
pycodestyle --config=setup.cfg eventtracking setup.py | ||
pylint --rcfile=pylintrc eventtracking setup.py | ||
setenv = | ||
DJANGO_SETTINGS_MODULE = eventtracking.django.tests.settings | ||
PYTHONPATH = {toxinidir} | ||
deps = | ||
celery44: -r{toxinidir}/requirements/celery44.txt | ||
celery52: -r{toxinidir}/requirements/celery52.txt | ||
django32: Django>=3.2,<4.0 | ||
django40: Django>=4.0,<4.1 | ||
-r{toxinidir}/requirements/test.txt | ||
commands = | ||
|
||
pytest --cov-report=html --cov-report term-missing --cov-branch -k 'not integration and not performance' --cov-fail-under=95 --cov=eventtracking | ||
pytest --verbose -s -k 'integration' | ||
pycodestyle --config=setup.cfg eventtracking setup.py | ||
pylint --rcfile=pylintrc eventtracking setup.py | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
so, we don't want to maintain a
celery44
dependencies list?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe we should've added a file for
celery50
instead of replacingcelery44
withcelery50
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Latest requirements will only contain packages according to
celery52
so adding the suggested step will only create duplicatecelery44.txt
andcelery52.txt
files.In the make upgrade step, we can only fetch the requirements for the latest supported version so the requirements for
celery44.txt
are being generated withcelery44.in
now.