Skip to content

Commit

Permalink
Python 3.7, 3.12, Django 5.0, PostgreSQL 16 (#90)
Browse files Browse the repository at this point in the history
* Python 3.7, 3.12, Django 5.0, PostgreSQL 16

* fixup! Python 3.7, 3.12, Django 5.0, PostgreSQL 16

* fixup! fixup! Python 3.7, 3.12, Django 5.0, PostgreSQL 16
  • Loading branch information
MarkusH committed Oct 3, 2023
1 parent ccf658c commit 5fa550f
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 14 deletions.
33 changes: 23 additions & 10 deletions .github/workflows/test-deploy.yml
Expand Up @@ -92,25 +92,38 @@ jobs:
--health-retries 5
ports:
- 5415:5432
postgres16:
image: postgres:16
env:
POSTGRES_PASSWORD: postgres
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
ports:
- 5416:5432
strategy:
matrix:
django-version: ["3.2.0", "4.1.0", "4.2.0"]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
django-version: ["3.2.0", "4.1.0", "4.2.0", "5.0a1"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
psycopg: ["psycopg2", "psycopg"]
exclude:
# 3.2
- django-version: "3.2.0"
python-version: "3.11"
- django-version: "3.2.0"
python-version: "3.12"
- django-version: "3.2.0"
psycopg: "psycopg"
# 4.1
- django-version: "4.1.0"
python-version: "3.7"
- django-version: "4.1.0"
psycopg: "psycopg"
# 4.2
- django-version: "4.2.0"
python-version: "3.7"
# 5.0
- django-version: "5.0a1"
python-version: "3.8"
- django-version: "5.0a1"
python-version: "3.9"
fail-fast: false
steps:
- uses: actions/checkout@v3
Expand All @@ -132,16 +145,16 @@ jobs:
- name: Run tests
run: |
if [ "${{ matrix.django-version }}" = "3.2.0" ] ; then
export PG_VERSIONS="96,10,11,12,13,14,15"
export PG_VERSIONS="96,10,11,12,13,14,15,16"
else
if [ "${{ matrix.django-version }}" = "4.1.0" ] ; then
export PG_VERSIONS="11,12,13,14,15"
export PG_VERSIONS="11,12,13,14,15,16"
fi
fi
coverage run "$(command -v django-admin)" test --pythonpath . -v 2 --settings=tests.settings
coverage report
env:
PG_VERSIONS: "12,13,14,15"
PG_VERSIONS: "12,13,14,15,16"
- name: Upload coverage to codecov.io
uses: codecov/codecov-action@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion README.md
@@ -1,6 +1,6 @@
# django-postgres-metrics

[![GitHub Build Status](https://img.shields.io/github/workflow/status/django-postgres-metrics/django-postgres-metrics/Test%20&%20Deploy/main?style=for-the-badge)](https://github.com/django-postgres-metrics/django-postgres-metrics/actions?query=branch%3Amain+event%3Apush)
[![GitHub Build Status](https://img.shields.io/github/actions/workflow/status/django-postgres-metrics/django-postgres-metrics/test-deploy.yml?style=for-the-badge)](https://github.com/django-postgres-metrics/django-postgres-metrics/actions/workflows/test-deploy.yml?query=event%3Apush+branch%3Amain)
[![Codecov coverage](https://img.shields.io/codecov/c/gh/django-postgres-metrics/django-postgres-metrics/main?style=for-the-badge)](https://app.codecov.io/gh/django-postgres-metrics/django-postgres-metrics/branch/main)
[![Read the Docs](https://img.shields.io/readthedocs/django-postgres-metrics?style=for-the-badge)](https://django-postgres-metrics.readthedocs.io/)
[![Version](https://img.shields.io/pypi/v/django-postgres-metrics?label=Version&style=for-the-badge)](https://pypi.org/project/django-postgres-metrics/)
Expand Down
12 changes: 12 additions & 0 deletions docs/source/changelog.rst
Expand Up @@ -7,6 +7,18 @@ Changelog
Under Development
=================

* Dropped official support for Python 3.7

.. warning::

Use version 0.15.0 for Python 3.7 support!

* Added support for Django 5.0.

* Added support for Python 3.12.

* Added support for PostgreSQL 16.

0.15.0 (2023-06-05)
===================

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Expand Up @@ -10,7 +10,7 @@ source = ["postgres_metrics/"]

[tool.coverage.report]
show_missing = true
fail_under = 98
fail_under = 95

[tool.isort]
combine_as_imports = true
Expand Down
5 changes: 3 additions & 2 deletions setup.py
Expand Up @@ -48,16 +48,17 @@
"Framework :: Django :: 3.2",
"Framework :: Django :: 4.1",
"Framework :: Django :: 4.2",
"Framework :: Django :: 5.0",
"Intended Audience :: Developers",
"License :: OSI Approved :: BSD License",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"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",
],
python_requires=">=3.7",
python_requires=">=3.8",
)

0 comments on commit 5fa550f

Please sign in to comment.