From 2f5452c6fe1ea357ebfcea27fa67e3a1e6b50d7c Mon Sep 17 00:00:00 2001 From: Mike Manger Date: Mon, 16 Dec 2024 12:05:21 +0000 Subject: [PATCH 1/9] Update test matrix to tests against supported versions of Python and Django --- .github/workflows/ci.yml | 20 +++++++++++--------- pyproject.toml | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 05840ac..cce7c35 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,19 +15,21 @@ jobs: strategy: matrix: python: - - '3.5' - - '3.6' - - '3.7' + - '3.9' + - '3.10' + - '3.11' + - '3.12' + - '3.13' - 'pypy3' django: - - '1.11' - - '2.2' - - '3.0' + - '4.2' + - '5.0' + - '5.1' name: Python ${{ matrix.python }} / Django ${{ matrix.django }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup python ${{ matrix.python }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python }} - name: Setup django ${{ matrix.django }} @@ -39,7 +41,7 @@ jobs: runs-on: ubuntu-latest name: Check code formatting steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Black Code Formatter uses: lgeiger/black-action@master with: diff --git a/pyproject.toml b/pyproject.toml index 929821d..06bdfa9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,3 @@ [tool.black] -target-version = ['py33'] +target-version = ['py39'] skip-string-normalization = true From c64ecb811a66f970af070b9cc8e764f5ddd33f60 Mon Sep 17 00:00:00 2001 From: Mike Manger Date: Mon, 16 Dec 2024 12:06:25 +0000 Subject: [PATCH 2/9] Update classifiers --- setup.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index 7e7ed90..e3a6c40 100644 --- a/setup.py +++ b/setup.py @@ -21,11 +21,11 @@ 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', - 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', + 'Programming Language :: Python :: 3.13', 'Programming Language :: Python :: Implementation :: CPython', 'Programming Language :: Python :: Implementation :: PyPy', 'Topic :: Internet :: WWW/HTTP', From e6dee8421a1a5c4866bad86a2efc127c60cc8704 Mon Sep 17 00:00:00 2001 From: Mike Manger Date: Mon, 16 Dec 2024 12:08:04 +0000 Subject: [PATCH 3/9] Disable GH workflow schedule as seems a bit excessive --- .github/workflows/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cce7c35..d436230 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,8 +3,6 @@ on: branches: - master pull_request: - schedule: - - cron: '30 3 * * 2' name: CI From 84c3980142137f947ee6aafc2f761a99bc4a3919 Mon Sep 17 00:00:00 2001 From: Mike Manger Date: Mon, 16 Dec 2024 12:11:05 +0000 Subject: [PATCH 4/9] Ignore .env folder --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6d18ee4..df77a8a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /*.egg-info/ /.tox/ /.coverage +/.env/ \ No newline at end of file From d728be075b85bd1de0cb1324f1ab5c54def52a33 Mon Sep 17 00:00:00 2001 From: Mike Manger Date: Mon, 16 Dec 2024 12:11:17 +0000 Subject: [PATCH 5/9] Add workflow dispatch method --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d436230..729c98b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,6 +3,7 @@ on: branches: - master pull_request: + workflow_dispatch: name: CI From ba806f06bafe11dbb619b913a92ab7495e0af8e9 Mon Sep 17 00:00:00 2001 From: Mike Manger Date: Mon, 16 Dec 2024 12:15:05 +0000 Subject: [PATCH 6/9] Update pypy version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 729c98b..0320cf5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: - '3.11' - '3.12' - '3.13' - - 'pypy3' + - 'pypy3.10' django: - '4.2' - '5.0' From 408e4321b48838136de1bf1915056035e0bb68d7 Mon Sep 17 00:00:00 2001 From: Mike Manger Date: Mon, 16 Dec 2024 12:24:40 +0000 Subject: [PATCH 7/9] Update readme badges --- README.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index a560a7a..e11961f 100644 --- a/README.rst +++ b/README.rst @@ -2,13 +2,13 @@ django-mathfilters ################## -.. image:: https://github.com/dbrgn/django-mathfilters/workflows/CI/badge.svg +.. image:: https://github.com/dbrgn/django-mathfilters/actions/workflows/ci.yml/badge.svg :alt: Build status - :target: https://github.com/dbrgn/django-mathfilters/actions?query=branch%3Amaster + :target: https://github.com/dbrgn/django-mathfilters/actions/workflows/ci.yml -.. image:: https://pypip.in/d/django-mathfilters/badge.png - :alt: PyPI download stats - :target: https://crate.io/packages/django-mathfilters +.. image:: https://badge.fury.io/py/django-mathfilters.svg + :alt: PyPI badge + :target: https://pypi.org/project/django-mathfilters/ django-mathfilters is a Python 3 module that provides different simple math From 363c132f9a9f338f597b8c4c402ce216d6717693 Mon Sep 17 00:00:00 2001 From: Mike Manger Date: Mon, 16 Dec 2024 12:29:38 +0000 Subject: [PATCH 8/9] Update readme to state supported versions --- README.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index e11961f..03e7902 100644 --- a/README.rst +++ b/README.rst @@ -80,10 +80,11 @@ provides the following filters: Version Support =============== -This module officially supports Python 3.5+ as well as PyPy3. Support for Python -3.3 and 3.4 is provided on best-effort basis, but there are no CI tests for it. +This module officially supports Python 3.9+ as well as PyPy3. -Supported Django versions are 1.11+, 2.x and 3.x. +Supported Django versions are 4.2, 5.0 and 5.1. + +Support for older versions of both is possible however there are no CI tests for them. Development From 5ba4dd8bf0c59249543704fd97ed9edfecba3c0c Mon Sep 17 00:00:00 2001 From: Mike Manger Date: Mon, 16 Dec 2024 12:30:13 +0000 Subject: [PATCH 9/9] Use https for readme link --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 03e7902..b0ea986 100644 --- a/README.rst +++ b/README.rst @@ -97,4 +97,4 @@ auto-formatting. Adherence to the rules is enforced in CI. License ======= -`MIT License `_, see LICENSE file. +`MIT License `_, see LICENSE file.