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 support django50 and python3.12 #233

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
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
28 changes: 28 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,17 @@ executors:
POSTGRES_DB: 'psqlextra'
POSTGRES_USER: 'psqlextra'
POSTGRES_PASSWORD: 'psqlextra'
python-rc:
parameters:
version:
type: string
docker:
- image: python:<< parameters.version >>-rc-buster
- image: postgres:16.0
environment:
POSTGRES_DB: 'psqlextra'
POSTGRES_USER: 'psqlextra'
POSTGRES_PASSWORD: 'psqlextra'

commands:
install-dependencies:
Expand Down Expand Up @@ -106,6 +117,17 @@ jobs:
extra: test
- run-tests:
pyversion: 311

test-python312:
executor:
name: python-rc
version: "3.12"
steps:
- checkout
- install-dependencies:
extra: test
- run-tests:
pyversion: 312
- store_test_results:
path: reports
- run:
Expand Down Expand Up @@ -188,6 +210,12 @@ workflows:
only: /.*/
branches:
only: /.*/
- test-python312:
filters:
tags:
only: /.*/
branches:
only: /.*/
- analysis:
filters:
tags:
Expand Down
11 changes: 8 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
import distutils.cmd
import os
import subprocess

from setuptools import find_packages, setup

try:
from distutils.cmd import Command as Command
except ImportError:
from setuptools import Command as Command

exec(open("psqlextra/_version.py").read())


class BaseCommand(distutils.cmd.Command):
class BaseCommand(Command):
user_options = []

def initialize_options(self):
Expand Down Expand Up @@ -63,12 +67,13 @@ def run(self):
"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 :: Internet :: WWW/HTTP :: Dynamic Content",
],
python_requires=">=3.6",
install_requires=[
"Django>=2.0,<5.0",
"Django>=2.0,<6.0",
"python-dateutil>=2.8.0,<=3.0.0",
],
extras_require={
Expand Down
7 changes: 5 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
envlist =
{py36,py37}-dj{20,21,22,30,31,32}-psycopg{28,29}
{py38,py39,py310}-dj{21,22,30,31,32,40}-psycopg{28,29}
{py38,py39,py310,py311}-dj{41}-psycopg{28,29}
{py38,py39,py310,py311}-dj{42}-psycopg{28,29,31}
{py38,py39,py310,py311,py312}-dj{41}-psycopg{28,29}
{py38,py39,py310,py311,py312}-dj{42}-psycopg{28,29,31}
{py310,py311,py312}-dj{50}-psycopg{31}


[testenv]
deps =
Expand All @@ -16,6 +18,7 @@ deps =
dj40: Django~=4.0.0
dj41: Django~=4.1.0
dj42: Django~=4.2.0
dj50: Django~=5.0.0
psycopg28: psycopg2[binary]~=2.8
psycopg29: psycopg2[binary]~=2.9
psycopg31: psycopg[binary]~=3.1
Expand Down