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

Django upgrade 4.2 #318

Merged
merged 6 commits into from
Jul 20, 2023
Merged

Django upgrade 4.2 #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f9bd4d9
fix: django 4.2 upgrade
Jun 23, 2023
2b23736
Merge remote-tracking branch 'origin/master' into salman/django-4.2-u…
Jun 23, 2023
9f0eee5
fix: django upgrade 4.2
Jun 23, 2023
00b8351
fix: django upgrade 4.2, fix test case
Jun 23, 2023
b577940
fix: django upgrade 4.2, fix test case
Jun 23, 2023
1a9ff55
fix: django upgrade 4.2
Jun 23, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
matrix:
os: [ubuntu-20.04]
python-version: ['3.8']
toxenv: [django32, django40, quality]
toxenv: [django32, django40, django42, quality]

steps:
- uses: actions/checkout@v2
Expand All @@ -36,7 +36,7 @@ jobs:
run: tox

- name: Run Coverage
if: matrix.python-version == '3.8' && matrix.toxenv=='django32'
if: matrix.python-version == '3.8' && matrix.toxenv=='django42'
uses: codecov/codecov-action@v1
with:
flags: unittests
Expand Down
2 changes: 1 addition & 1 deletion organizations/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""
edx-organizations app initialization module
"""
__version__ = '6.11.1' # pragma: no cover
__version__ = '6.12.0' # pragma: no cover
9 changes: 6 additions & 3 deletions organizations/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ def get_actions(self, request):

return actions

@admin.action(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please link the release notes for this change.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/adamchainz/django-upgrade

description=_('Activate selected entries')
)
def activate_selected(self, request, queryset):
""" Activate the selected entries. """
count = queryset.count()
Expand All @@ -41,6 +44,9 @@ def activate_selected(self, request, queryset):
self.message_user(request, message)
self.message_user(request, self.HISTORY_DISCLAIMER, level=messages.WARNING)

@admin.action(
description=_('Deactivate selected entries')
)
def deactivate_selected(self, request, queryset):
""" Deactivate the selected entries. """
count = queryset.count()
Expand All @@ -55,9 +61,6 @@ def deactivate_selected(self, request, queryset):
self.message_user(request, message)
self.message_user(request, self.HISTORY_DISCLAIMER, level=messages.WARNING)

deactivate_selected.short_description = _('Deactivate selected entries')
activate_selected.short_description = _('Activate selected entries')


@admin.register(Organization)
class OrganizationAdmin(ActivateDeactivateAdminMixin, admin.ModelAdmin):
Expand Down
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ def get_version(*file_paths):
'Framework :: Django',
'Framework :: Django :: 3.2',
'Framework :: Django :: 4.0',
'Framework :: Django :: 4.2',
'Intended Audience :: Developers',
'License :: OSI Approved :: GNU Affero General Public License v3',
'Operating System :: OS Independent',
Expand Down
5 changes: 3 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py38-django{32,40}, quality
envlist = py38-django{32,40,42}, quality

[testenv]
setenv =
Expand All @@ -8,13 +8,14 @@ setenv =
deps =
django32: Django>=3.2,<4.0
django40: Django>=4.0,<4.1
django42: Django>=4.2,<4.3
-rtest-requirements.txt
commands =
python -Wd -m pytest {posargs}
coverage report

[testenv:quality]
setenv =
setenv =
PYTHONPATH = {toxinidir}
deps =
Django>=3.2,<4.0
Expand Down