From 789cf541a2c94569ccb50f326c3a0df45fa9a70e Mon Sep 17 00:00:00 2001 From: Thomas Waldmann <tw@waldmann-edv.de> Date: Sat, 12 Oct 2024 14:47:15 +0200 Subject: [PATCH 1/4] it's 2024 --- LICENSE | 2 +- docs/conf.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index c4814438..9fbe3d49 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ This project is licensed under the the 3-clause BSD license (also known as "Revised BSD License", "New BSD License", or "Modified BSD License"): -Copyright (c) 2013-2023, The nsupdate.info Development Team (see AUTHORS file) +Copyright (c) 2013-2024, The nsupdate.info Development Team (see AUTHORS file) All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/docs/conf.py b/docs/conf.py index 92cbca04..8643c319 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -42,7 +42,7 @@ # General information about the project. project = u'nsupdate.info' -copyright = u'2013-2023, The nsupdate.info Team' +copyright = u'2013-2024, The nsupdate.info Team' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the From cc502a6cc7c37a2807df72c74a62e5ff0166381c Mon Sep 17 00:00:00 2001 From: Thomas Waldmann <tw@waldmann-edv.de> Date: Sat, 12 Oct 2024 14:40:55 +0200 Subject: [PATCH 2/4] support / test on Python 3.12 --- .github/workflows/ci.yml | 9 ++++++--- setup.py | 3 ++- tox.ini | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ae88f6a..abd368fa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ on: jobs: lint: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 timeout-minutes: 10 steps: @@ -33,7 +33,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: 3.12 - name: Lint with flake8 run: | pip install flake8 @@ -55,9 +55,12 @@ jobs: - os: ubuntu-22.04 python-version: '3.10' toxenv: py310 - - os: ubuntu-22.04 + - os: ubuntu-24.04 python-version: '3.11' toxenv: py311 + - os: ubuntu-24.04 + python-version: '3.12' + toxenv: py312 env: TOXENV: ${{ matrix.toxenv }} diff --git a/setup.py b/setup.py index ff07c51a..6e897c53 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ include_package_data=True, zip_safe=False, platforms='any', - python_requires='>=3.8, <3.12', + python_requires='>=3.8, <3.13', setup_requires=['setuptools_scm'], install_requires=[ 'dnspython', @@ -53,6 +53,7 @@ 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', 'Topic :: Internet :: Name Service (DNS)', ], ) diff --git a/tox.ini b/tox.ini index a5ad3294..3961a412 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ # tox --recreate [tox] -envlist = py{38,39,310,311} +envlist = py{38,39,310,311,312} [testenv] deps = From 37350fd507b087208d3336fdced6a6ff7ed0461c Mon Sep 17 00:00:00 2001 From: Thomas Waldmann <tw@waldmann-edv.de> Date: Sat, 12 Oct 2024 14:53:40 +0200 Subject: [PATCH 3/4] checkout v4 setup-python v5 cache v4 codecov-action v4 --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index abd368fa..bef70d9f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,9 +29,9 @@ jobs: timeout-minutes: 10 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.12 - name: Lint with flake8 @@ -69,16 +69,16 @@ jobs: timeout-minutes: 40 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # just fetching 1 commit is not enough for setuptools-scm, so we fetch all fetch-depth: 0 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Cache pip - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('requirements.d/dev.txt') }} @@ -96,7 +96,7 @@ jobs: run: | tox --skip-missing-interpreters - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 env: OS: ${{ runner.os }} python: ${{ matrix.python-version }} From 97a9366e05b9f410e95b96c59f1139c1bb2f357a Mon Sep 17 00:00:00 2001 From: Thomas Waldmann <tw@waldmann-edv.de> Date: Sat, 12 Oct 2024 15:17:50 +0200 Subject: [PATCH 4/4] USE_L10N is deprecated. --- src/nsupdate/settings/base.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/nsupdate/settings/base.py b/src/nsupdate/settings/base.py index 235f6ab9..c4bbc60b 100644 --- a/src/nsupdate/settings/base.py +++ b/src/nsupdate/settings/base.py @@ -91,10 +91,6 @@ # to load the internationalization machinery. USE_I18N = True -# If you set this to False, Django will not format dates, numbers and -# calendars according to the current locale. -USE_L10N = True - # If you set this to False, Django will not use timezone-aware datetimes. USE_TZ = True