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

Add Python 3.12 support #284

Merged
merged 1 commit into from
Jan 8, 2024
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: 8 additions & 3 deletions .github/workflows/django.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,15 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8,3.9,'3.10', '3.11']
python-version:
- '3.8'
- '3.9'
- '3.10'
- '3.11'
- '3.12'
services:
postgres:
image: postgres:13-alpine
image: postgres:14-alpine
env:
POSTGRES_USER: postgres
POSTGRES_DB: postgres
Expand All @@ -37,7 +42,7 @@ jobs:
steps:
- uses: actions/checkout@v1
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand Down
44 changes: 0 additions & 44 deletions .travis.yml

This file was deleted.

3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
2023-10-30
Add support for Python 3.12

2023-10-18
Add alternative names for SubRegion
Graphql support types
Expand Down
11 changes: 10 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,21 @@ def read(fname):
classifiers=[
"Development Status :: 5 - Production/Stable",
"Environment :: Web Environment",
"Framework :: Django",
"Intended Audience :: Developers",
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
"Framework :: Django",
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.0",
"Framework :: Django :: 4.1",
"Framework :: Django :: 4.2",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Topic :: Internet :: WWW/HTTP",
"Topic :: Software Development :: Libraries :: Python Modules",
],
Expand Down
20 changes: 13 additions & 7 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
[tox]
envlist =
py{38,39,310,3.11,3.12}-django{32,40,41,42}{-sqlite,-mysql,-postgresql},
checkqa,
pylint,
py{38,39,310,311,312}-django42-{sqlite,mysql,postgresql}
py{38,39,310,311}-django41-{sqlite,mysql,postgresql}
py{38,39,310}-django40-{sqlite,mysql,postgresql}
py{38,39,310}-django32-{sqlite,mysql,postgresql}
checkqa
pylint
docs
skip_missing_interpreters = True
sitepackages = False
Expand All @@ -13,6 +16,7 @@ python =
3.9: py39
3.10: py310
3.11: py311
3.12: py312

[base]
deps =
Expand All @@ -25,7 +29,8 @@ deps =
deps =
# sphinx
Sphinx==4.2.0
django-dbdiff
; django-dbdiff
git+https://github.com/pfouque/django-dbdiff.git@fix312#egg=django-dbdiff
Copy link
Author

Choose a reason for hiding this comment

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

@marianoeramirez you're now hooked to my fork of django-dbdiff ... :/

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yes, but we will have to wait a long time before them review and integrate the PR. Once that happen I will update the project.

Copy link
Author

Choose a reason for hiding this comment

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

Ok, I'm fine with that, I wanted to be sure you noticed! ;)

In the meantime, I started a branch to remove this dependency,
and use load_fixtures/dump_fixtures instead + a backport of the assertNoDiff statement
It was promising, and only the command was missing tests.

Do you want me to publish the draft?

Copy link
Author

Choose a reason for hiding this comment

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


[test]
deps =
Expand All @@ -36,7 +41,8 @@ deps =
pylint
pylint-django
djangorestframework
django-dbdiff
; django-dbdiff
git+https://github.com/pfouque/django-dbdiff.git@fix312#egg=django-dbdiff
django-ajax-selects==2.2.0
django-autoslug==1.9.9
graphene==3.3
Expand All @@ -56,8 +62,8 @@ deps =
django32: Django>=3.2,<4.0
django40: Django>=4.0,<4.1
django41: Django>=4.1,<4.2
django42: Django>=4.2,<5.0
postgresql: psycopg2-binary==2.9.6
django42: Django>=4.2.8,<5.0
postgresql: psycopg2-binary==2.9.9
mysql: mysqlclient
setenv =
PIP_ALLOW_EXTERNAL=true
Expand Down