Skip to content

Commit 68c2e5b

Browse files
authored
Merge pull request #37 from matagus/upgarde-to-python-3.14
Upgrade to Python 3.14
2 parents f6258e2 + 295e80f commit 68c2e5b

File tree

8 files changed

+33
-30
lines changed

8 files changed

+33
-30
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,20 @@ jobs:
1313
max-parallel: 2
1414
fail-fast: true
1515
matrix:
16-
python-version: ["3.10", "3.11", "3.12", "3.13"]
16+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
1717
django-version: ["4.2", "5.0", "5.1", "5.2"]
1818
os: [ubuntu-latest]
1919
exclude:
2020
- django-version: "4.2"
2121
python-version: "3.13"
22+
- django-version: "4.2"
23+
python-version: "3.14"
2224
- django-version: "5.0"
2325
python-version: "3.13"
26+
- django-version: "5.0"
27+
python-version: "3.14"
28+
- django-version: "5.1"
29+
python-version: "3.14"
2430
runs-on: ${{ matrix.os }}
2531
steps:
2632
- uses: actions/checkout@v6

.github/workflows/publish.yml

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,27 @@ permissions:
1010

1111
jobs:
1212
deploy:
13-
1413
runs-on: ubuntu-latest
1514

1615
environment: release
1716
permissions:
1817
id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
1918

2019
steps:
21-
- uses: actions/checkout@v6
22-
- name: Set up Python
23-
uses: actions/setup-python@v6
24-
with:
25-
python-version: "3.13"
26-
cache: "pip"
27-
- name: Install dependencies
28-
run: |
29-
python -m pip install --upgrade pip
30-
pip install hatch
31-
- name: Build package
32-
run: hatch build
33-
- name: Publish package distributions to PyPI
34-
uses: pypa/gh-action-pypi-publish@release/v1
35-
with:
36-
user: __token__
37-
password: ${{ secrets.PYPI_API_TOKEN }}
20+
- uses: actions/checkout@v6
21+
- name: Set up Python
22+
uses: actions/setup-python@v6
23+
with:
24+
python-version: "3.14"
25+
cache: "pip"
26+
- name: Install dependencies
27+
run: |
28+
python -m pip install --upgrade pip
29+
pip install hatch
30+
- name: Build package
31+
run: hatch build
32+
- name: Publish package distributions to PyPI
33+
uses: pypa/gh-action-pypi-publish@release/v1
34+
with:
35+
user: __token__
36+
password: ${{ secrets.PYPI_API_TOKEN }}

.pre-commit-config.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ repos:
1919
- "--target-version=py311"
2020
- "--target-version=py312"
2121
- "--target-version=py313"
22+
- "--target-version=py314"
2223
types: [python]
2324

2425
- repo: https://github.com/pycqa/isort
@@ -64,5 +65,5 @@ repos:
6465
- repo: https://github.com/asottile/pyupgrade
6566
rev: v3.21.0
6667
hooks:
67-
- id: pyupgrade
68-
args: [--py313]
68+
- id: pyupgrade
69+
args: [--py314]

.python-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.13.0a5
1+
3.14.0

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
django-pagination-py3
22
====================
33

4-
![Python Compatibility](https://img.shields.io/badge/python-3.10%20%7C%203.11%20%7C%203.12%20%7C%203.13-blue.svg)
4+
![Python Compatibility](https://img.shields.io/badge/python-3.10%20%7C%203.11%20%7C%203.12%20%7C%203.13%20%7C%203.14-blue.svg)
55
![Django Compatibility](https://img.shields.io/badge/django-4.2%20|%205.0%20|%205.1%20|%205.2-%2344B78B?labelColor=%23092E20)
66
[![PyPi Version](https://img.shields.io/pypi/v/django-pagination-py3.svg)](https://pypi.python.org/pypi/django-pagination-py3)
77
![CI badge](https://github.com/matagus/django-pagination-py3/actions/workflows/ci.yml/badge.svg)
@@ -101,7 +101,7 @@ Running Tests
101101

102102
`hatch run test:test` will run the tests in every Python + Django versions combination.
103103

104-
`hatch run test.py3.13-5.2:test`: will run them for python 3.13 and Django 5.2. Please see possible combinations using
104+
`hatch run test.py3.14-5.2:test`: will run them for python 3.14 and Django 5.2. Please see possible combinations using
105105
`hatch env show` ("test" matrix).
106106

107107

pyproject.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ classifiers = [
3232
"Programming Language :: Python :: 3.11",
3333
"Programming Language :: Python :: 3.12",
3434
"Programming Language :: Python :: 3.13",
35+
"Programming Language :: Python :: 3.14",
3536
"Programming Language :: Python :: Implementation :: CPython",
3637
"Programming Language :: Python :: Implementation :: PyPy",
3738
"Topic :: Software Development :: Libraries",
@@ -85,7 +86,7 @@ dependencies = [
8586
# Test environment
8687
[[tool.hatch.envs.test.matrix]]
8788
django = ["4.2"]
88-
python = ["3.10", "3.11", "3.12", "3.13"]
89+
python = ["3.10", "3.11", "3.12"]
8990

9091
[[tool.hatch.envs.test.matrix]]
9192
django = ["5.0"]
@@ -97,7 +98,7 @@ python = ["3.10", "3.11", "3.12", "3.13"]
9798

9899
[[tool.hatch.envs.test.matrix]]
99100
django = ["5.2"]
100-
python = ["3.10", "3.11", "3.12", "3.13"]
101+
python = ["3.10", "3.11", "3.12", "3.13", "3.14"]
101102

102103
[tool.hatch.envs.test]
103104
dependencies = ["coverage[toml]", "django~={matrix:django}.0"]

tests/settings.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
Generated by Cookiecutter Django Package
55
"""
66

7-
from __future__ import annotations
8-
97
import os
108

119
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)

tests/urls.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from __future__ import annotations
2-
31
from django.contrib import admin
42
from django.urls import re_path
53

0 commit comments

Comments
 (0)