diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index 93556e38..68bf9c4e 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -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 @@ -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 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index e1d0c369..00000000 --- a/.travis.yml +++ /dev/null @@ -1,44 +0,0 @@ -language: python -services: - - mysql - - postgresql -cache: - pip: true -python: - - 3.6 - - 3.7 - - 3.8 -jobs: - allow_failures: - - env: TOXENV=py37-djangodev-sqlite - - env: TOXENV=py37-djangodev-mysql - - env: TOXENV=py37-djangodev-postgresql - include: - - stage: deploy - if: tag IS present - python: 3.7 - script: skip - deploy: - provider: pypi - user: jazzband - server: https://jazzband.co/projects/django-cities-light/upload - distributions: sdist bdist_wheel - password: - secure: POps88GX3PHO2xb+XaX/5IlnpQGWwWI+vw/BFPoiJABOqwcOms3vpFT7XKYxYG40e7WSIifndzn8rS2hYr2C4tlZvyCf1+BMfLtNMzGLQAOJAPn+qO4BwEdBdwUBdkGmpHVaO9wndjLHKuimQ8HM4qmdKJU74zp39Kpulo3hBQM= - skip_existing: true - on: - tags: true - repo: jazzband/django-cities-light -install: -- travis_retry pip install -U pip -- travis_retry pip install tox-travis codecov -script: -- tox -v -after_success: -- codecov -notifications: - irc: - channels: - - irc.freenode.org#yourlabs - template: - - "%{repository} (%{commit} %{author}) : %{message} %{build_url} %{compare_url}" diff --git a/CHANGELOG b/CHANGELOG index af972c4f..0bc5eb71 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2023-10-30 + Add support for Python 3.12 + 2023-10-18 Add alternative names for SubRegion Graphql support types diff --git a/setup.py b/setup.py index 3db57142..f87b285b 100644 --- a/setup.py +++ b/setup.py @@ -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", ], diff --git a/tox.ini b/tox.ini index 94e1c125..f4870ad0 100644 --- a/tox.ini +++ b/tox.ini @@ -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 @@ -13,6 +16,7 @@ python = 3.9: py39 3.10: py310 3.11: py311 + 3.12: py312 [base] deps = @@ -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 [test] deps = @@ -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 @@ -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