From 84569142ee52e6b3804d40bd73dd585293163745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gregor=20Jer=C5=A1e?= Date: Sun, 9 Apr 2023 21:44:14 +0200 Subject: [PATCH 1/6] Require Django 4.2 --- docs/CHANGELOG.rst | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 4483a51..439825d 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -6,6 +6,15 @@ All notable changes to this project are documented in this file. This project adheres to `Semantic Versioning `_. +========== +Unreleased +========== + +Changed +======= +- **BACKWARD INCOMPATIBLE:** Require ``Django 4.2`` + + ================ 4.0.0 2022-02-16 ================ diff --git a/setup.py b/setup.py index 14b2769..8cf4c45 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ packages=setuptools.find_packages('src'), package_dir={'': 'src'}, python_requires='>=3.6, <3.11', - install_requires=['Django~=3.2'], + install_requires=['Django~=4.2'], extras_require={ 'docs': ['Sphinx', 'sphinx_rtd_theme'], 'package': ['twine', 'wheel'], From a82b51b4bcf6033372b98d65e4ebdfbc69c27c7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gregor=20Jer=C5=A1e?= Date: Sun, 9 Apr 2023 21:45:07 +0200 Subject: [PATCH 2/6] Add support for Python 3.11 --- .github/workflows/ci.yml | 20 +++++++++++--------- docs/CHANGELOG.rst | 2 +- pyproject.toml | 2 +- setup.py | 3 ++- tox.ini | 7 ++++--- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 16d2a89..ee1437d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,11 +13,11 @@ on: jobs: test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false matrix: - tox-env: [py36, py37, py38, py39, py310, linters, packaging, migrations] + tox-env: [py36, py37, py38, py39, py310, py311, linters, packaging, migrations] include: - tox-env: py36 python-version: 3.6 @@ -29,12 +29,14 @@ jobs: python-version: 3.9 - tox-env: py310 python-version: "3.10" + - tox-env: py311 + python-version: "3.11" - tox-env: linters - python-version: "3.10" + python-version: "3.11" - tox-env: packaging - python-version: "3.10" + python-version: "3.11" - tox-env: migrations - python-version: "3.10" + python-version: "3.11" steps: - uses: actions/checkout@v2 @@ -50,13 +52,13 @@ jobs: tox -e ${{ matrix.tox-env }} --recreate - name: Upload coverage to Codecov - if: matrix.tox-env == 'py37' || matrix.tox-env == 'py38' || matrix.tox-env == 'py39' || matrix.tox-env == 'py310' + if: matrix.tox-env == 'py37' || matrix.tox-env == 'py38' || matrix.tox-env == 'py39' || matrix.tox-env == 'py310' || matrix.tox-env == 'py311' uses: codecov/codecov-action@v1 with: file: .coverage build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: test @@ -64,10 +66,10 @@ jobs: steps: - uses: actions/checkout@v1 - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v1 with: - python-version: "3.10" + python-version: "3.11" - name: Install build run: python -m pip install --user build - name: Build a binary wheel and a source tarball diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 439825d..1667b26 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -13,7 +13,7 @@ Unreleased Changed ======= - **BACKWARD INCOMPATIBLE:** Require ``Django 4.2`` - +- Add support for ``Python 3.11`` ================ 4.0.0 2022-02-16 diff --git a/pyproject.toml b/pyproject.toml index c469ea7..b1a76e9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,5 +6,5 @@ requires = [ build-backend = "setuptools.build_meta" [tool.black] -py36 = true +target-version = ['py310', 'py311'] skip-string-normalization = true diff --git a/setup.py b/setup.py index 8cf4c45..2431cb1 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ license=about['__license__'], packages=setuptools.find_packages('src'), package_dir={'': 'src'}, - python_requires='>=3.6, <3.11', + python_requires='>=3.6, <3.12', install_requires=['Django~=4.2'], extras_require={ 'docs': ['Sphinx', 'sphinx_rtd_theme'], @@ -57,6 +57,7 @@ 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', ], keywords='django transaction batching prioritization', ) diff --git a/tox.ini b/tox.ini index 0048b07..26c5348 100644 --- a/tox.ini +++ b/tox.ini @@ -23,13 +23,14 @@ basepython = py38: python3.8 py39: python3.9 py310: python3.10 - docs,linters,packaging,migrations: python3.10 + py311: python3.11 + docs,linters,packaging,migrations: python3.11 extras = docs: docs !docs: test setenv = # Enable pytest to find Django's setting module. - py{36,37,38,39,310}: PYTHONPATH={toxinidir}/tests + py{36,37,38,39,310,311}: PYTHONPATH={toxinidir}/tests ignore_errors = !linters: false # Run all linters to see their output even if one of them fails. @@ -46,7 +47,7 @@ commands_pre = commands = # General tests commands: # Run tests. - py{36,37,38,39,310}: pytest + py{36,37,38,39,310,311}: pytest # Docs commands: # Build documentation. From edf153d923fc5b0e713f54e6eb45df10bcae014d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gregor=20Jer=C5=A1e?= Date: Mon, 10 Apr 2023 19:11:13 +0200 Subject: [PATCH 3/6] Drop support for Python 3.6 and 3.7 --- .github/workflows/ci.yml | 8 ++------ docs/CHANGELOG.rst | 2 ++ setup.py | 4 +--- tox.ini | 6 ++---- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee1437d..0eb4a4b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,12 +17,8 @@ jobs: strategy: fail-fast: false matrix: - tox-env: [py36, py37, py38, py39, py310, py311, linters, packaging, migrations] + tox-env: [py38, py39, py310, py311, linters, packaging, migrations] include: - - tox-env: py36 - python-version: 3.6 - - tox-env: py37 - python-version: 3.7 - tox-env: py38 python-version: 3.8 - tox-env: py39 @@ -52,7 +48,7 @@ jobs: tox -e ${{ matrix.tox-env }} --recreate - name: Upload coverage to Codecov - if: matrix.tox-env == 'py37' || matrix.tox-env == 'py38' || matrix.tox-env == 'py39' || matrix.tox-env == 'py310' || matrix.tox-env == 'py311' + if: matrix.tox-env == 'py38' || matrix.tox-env == 'py39' || matrix.tox-env == 'py310' || matrix.tox-env == 'py311' uses: codecov/codecov-action@v1 with: file: .coverage diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 1667b26..2ef6222 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -14,6 +14,8 @@ Changed ======= - **BACKWARD INCOMPATIBLE:** Require ``Django 4.2`` - Add support for ``Python 3.11`` +- Drop support for ``Python 3.6`` and ``Python 3.7`` + ================ 4.0.0 2022-02-16 diff --git a/setup.py b/setup.py index 2431cb1..2e1117e 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ license=about['__license__'], packages=setuptools.find_packages('src'), package_dir={'': 'src'}, - python_requires='>=3.6, <3.12', + python_requires='>=3.8, <3.12', install_requires=['Django~=4.2'], extras_require={ 'docs': ['Sphinx', 'sphinx_rtd_theme'], @@ -52,8 +52,6 @@ 'Operating System :: OS Independent', 'Programming Language :: Python', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', diff --git a/tox.ini b/tox.ini index 26c5348..35f42b5 100644 --- a/tox.ini +++ b/tox.ini @@ -18,8 +18,6 @@ basepython = python3 [testenv] basepython = - py36: python3.6 - py37: python3.7 py38: python3.8 py39: python3.9 py310: python3.10 @@ -30,7 +28,7 @@ extras = !docs: test setenv = # Enable pytest to find Django's setting module. - py{36,37,38,39,310,311}: PYTHONPATH={toxinidir}/tests + py{38,39,310,311}: PYTHONPATH={toxinidir}/tests ignore_errors = !linters: false # Run all linters to see their output even if one of them fails. @@ -47,7 +45,7 @@ commands_pre = commands = # General tests commands: # Run tests. - py{36,37,38,39,310,311}: pytest + py{38,39,310,311}: pytest # Docs commands: # Build documentation. From 5010e50f5aa0417d9f151bebfeb0b346fa60bd3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gregor=20Jer=C5=A1e?= Date: Sun, 9 Apr 2023 21:48:08 +0200 Subject: [PATCH 4/6] Bump setuptools version --- docs/CHANGELOG.rst | 1 + pyproject.toml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index 2ef6222..aaa6881 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -15,6 +15,7 @@ Changed - **BACKWARD INCOMPATIBLE:** Require ``Django 4.2`` - Add support for ``Python 3.11`` - Drop support for ``Python 3.6`` and ``Python 3.7`` +- Bump ``setuptools`` version ================ diff --git a/pyproject.toml b/pyproject.toml index b1a76e9..23173aa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [build-system] requires = [ - "setuptools >= 59.6.0", - "setuptools_scm >= 6.4.2, <7", + "setuptools >= 67.6.1", + "setuptools_scm >= 7.1.0", ] build-backend = "setuptools.build_meta" From a4e3ed4d8d46fc9345869eb1191fac186660289d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gregor=20Jer=C5=A1e?= Date: Mon, 10 Apr 2023 19:08:34 +0200 Subject: [PATCH 5/6] Reformat using latest black --- src/django_priority_batch/prioritized_batcher.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/django_priority_batch/prioritized_batcher.py b/src/django_priority_batch/prioritized_batcher.py index a8ea076..86a583f 100644 --- a/src/django_priority_batch/prioritized_batcher.py +++ b/src/django_priority_batch/prioritized_batcher.py @@ -35,7 +35,6 @@ def global_instance(cls): try: return GLOBAL_BATCHER.instance except AttributeError: - instance = PrioritizedBatcher( **getattr(settings, 'PRIORITIZED_BATCHER', {}) ) From 6410ee6f379745f4d65ae91e60376c80f82456bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gregor=20Jer=C5=A1e?= Date: Sun, 9 Apr 2023 21:48:45 +0200 Subject: [PATCH 6/6] Prepare release 5.0.0 --- docs/CHANGELOG.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst index aaa6881..6268a1c 100644 --- a/docs/CHANGELOG.rst +++ b/docs/CHANGELOG.rst @@ -6,9 +6,9 @@ All notable changes to this project are documented in this file. This project adheres to `Semantic Versioning `_. -========== -Unreleased -========== +================== +5.0.0 - 2023-04-09 +================== Changed =======