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.

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

Fix # 502 -- Update Python and Django versions #503

Merged
merged 1 commit into from
Nov 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 6 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
with:
Expand All @@ -26,7 +26,7 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
with:
Expand All @@ -44,13 +44,14 @@ jobs:
strategy:
matrix:
python-version:
- 3.8
- 3.9
- '3.8'
- '3.9'
- '3.10'
- '3.11'
- '3.12'
name: Python ${{ matrix.python-version }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
with:
Expand Down
1 change: 1 addition & 0 deletions docs/authors.rst
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ Authors
* Nishit Shah
* Olivier Sels
* Olle Vidner
* Paolo Melchiorre
* Paul Cunnane
* Paul Donohue
* Paulo Poiati
Expand Down
3 changes: 3 additions & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ Modifications to existing flavors:
Other changes:

- Dropped support for Python 3.6 and 3.7.
- Dropped support for Django 4.0.
- Added support for Python 3.12.
- Added support for Django 5.0.


4.0 (2023-04-22)
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@ def find_package_data(where='.', package='',
'Environment :: Web Environment',
'Framework :: Django',
'Framework :: Django :: 3.2',
'Framework :: Django :: 4.0',
'Framework :: Django :: 4.1',
'Framework :: Django :: 4.2',
'Framework :: Django :: 5.0',
'Intended Audience :: Developers',
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
Expand All @@ -139,6 +139,7 @@ def find_package_data(where='.', package='',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Topic :: Internet :: WWW/HTTP',
],
zip_safe=False,
Expand Down
2 changes: 1 addition & 1 deletion tests/test_by/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def test_form_fields(self):
def test_BYRegions_select(self):
"""Test that BYRegionField has valid choices"""
choices = self.form.fields.get('region').choices
self.assertEqual(tuple(choices[1:]), forms.BY_REGIONS_CHOICES)
self.assertEqual(tuple(choices)[1:], forms.BY_REGIONS_CHOICES)

def test_BYRegionSelect(self):
self.maxDiff = None
Expand Down
7 changes: 4 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,18 @@ args_are_paths = false
envlist =
docs,prospector
{py38,py39,py310,pypy39}-django-3.2
{py38,py39,py310,pypy39}-django-4.0
{py38,py39,py310,py311,pypy39}-django-4.1
{py38,py39,py310,py311,pypy39}-django-4.2
{py310,py311}-django-main
{py310,py311,py312}-django-5.0
{py310,py311,py312}-django-main

[testenv]
basepython =
py38: python3.8
py39: python3.9
py310: python3.10
py311: python3.11
py312: python3.12
pypy39: pypy3.9
usedevelop = true
pip_pre = true
Expand All @@ -23,9 +24,9 @@ commands =
invoke test {posargs}
deps =
django-3.2: Django>=3.2,<3.3
django-4.0: Django>=4.0,<4.1
django-4.1: Django>=4.1,<4.2
django-4.2: Django>=4.2,<4.3
django-5.0: Django>=5.0rc1,<5.1
django-main: https://github.com/django/django/archive/main.tar.gz
-r{toxinidir}/tests/requirements.txt

Expand Down