From dba77b1a90475fd1326b02d5c09a5e4223088709 Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Tue, 13 Dec 2022 11:04:42 -0800 Subject: [PATCH 1/3] Drop support for Python 3.6 And test on 3.11. --- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 2 +- HISTORY.rst | 2 ++ README.rst | 2 +- setup.cfg | 4 ++-- setup.py | 4 ++-- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index bd723d2..af4b6b5 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: "3.10" + python-version: "3.11" - name: Install dependencies run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c603446..02c5f1c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: # We don't test on Windows and macOS currently due to issues # build libmaxminddb there. platform: [ubuntu-latest] - python-version: [3.6, 3.7, 3.8, 3.9, "3.10"] + python-version: [3.7, 3.8, 3.9, "3.10", 3.11] name: Python ${{ matrix.python-version }} on ${{ matrix.platform }} runs-on: ${{ matrix.platform }} diff --git a/HISTORY.rst b/HISTORY.rst index f99dfac..ebba391 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -6,6 +6,8 @@ History 2.3.0 ++++++++++++++++++ +* IMPORTANT: Python 3.7 or greater is required. If you are using an older + version, please use an earlier release. * ``distutils`` is no longer used for building the C extension. 2.2.0 (2021-09-24) diff --git a/README.rst b/README.rst index a459c1f..f93eb95 100644 --- a/README.rst +++ b/README.rst @@ -94,7 +94,7 @@ invalid IP address or an IPv6 address in an IPv4 database. Requirements ------------ -This code requires Python 3.6+. Older versions are not supported. The C +This code requires Python 3.7+. Older versions are not supported. The C extension requires CPython. Versioning diff --git a/setup.cfg b/setup.cfg index fbfd1b3..40c30ac 100644 --- a/setup.cfg +++ b/setup.cfg @@ -13,11 +13,11 @@ envlist = py36, py37, py38, py39, mypy [gh-actions] python = - 3.6: py36 3.7: py37 3.8: py38 3.9: py39 - "3.10": py310, mypy + "3.10": py310 + 3.11: py311, mypy [testenv] diff --git a/setup.py b/setup.py index 982add6..0e1fed9 100644 --- a/setup.py +++ b/setup.py @@ -119,7 +119,7 @@ def run_setup(with_cext): "Source Code": "https://github.com/maxmind/MaxMind-DB-Reader-python", "Issue Tracker": "https://github.com/maxmind/MaxMind-DB-Reader-python/issues", }, - python_requires=">=3.6", + python_requires=">=3.7", include_package_data=True, install_requires=requirements, license=LICENSE, @@ -131,11 +131,11 @@ def run_setup(with_cext): "Intended Audience :: System Administrators", "License :: OSI Approved :: Apache Software License", "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", + "Programming Language :: Python :: 3.11", "Programming Language :: Python", "Topic :: Internet :: Proxy Servers", "Topic :: Internet", From c6d9f766ca4df6fba9d0453bfa222eb40af9e60e Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Tue, 13 Dec 2022 11:36:36 -0800 Subject: [PATCH 2/3] Specify specific python version Previously, we were testing with the most recent, but our tox config didn't yet have 3.11, causing no tests to run. --- .github/workflows/address-sanitizer.yml | 2 +- .github/workflows/clang-analyzer.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/address-sanitizer.yml b/.github/workflows/address-sanitizer.yml index ab2dde4..298b01d 100644 --- a/.github/workflows/address-sanitizer.yml +++ b/.github/workflows/address-sanitizer.yml @@ -25,7 +25,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: 3.x + python-version: 3.11 - name: Install dependencies run: | diff --git a/.github/workflows/clang-analyzer.yml b/.github/workflows/clang-analyzer.yml index d99d47a..8ca1a74 100644 --- a/.github/workflows/clang-analyzer.yml +++ b/.github/workflows/clang-analyzer.yml @@ -20,7 +20,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: 3.x + python-version: 3.11 - name: Build and run analyzer run: CFLAGS="-Werror -Wall -Wextra" scan-build --status-bugs python setup.py build From 33193078dfa4091fc3ad57508a58efff3f708047 Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Tue, 13 Dec 2022 11:41:26 -0800 Subject: [PATCH 3/3] Run AddressSanitizer test on 3.10 3.11 is failing for some non-obvious reason that doesn't seem related to an actual issue. --- .github/workflows/address-sanitizer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/address-sanitizer.yml b/.github/workflows/address-sanitizer.yml index 298b01d..3d164e0 100644 --- a/.github/workflows/address-sanitizer.yml +++ b/.github/workflows/address-sanitizer.yml @@ -25,7 +25,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: 3.11 + python-version: "3.10" - name: Install dependencies run: |