diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index 6254bf2d1..d3e8051a1 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -145,7 +145,6 @@ jobs: matrix: # Python versions to build wheels on python: [ - "cp37", "cp38", "cp39", "cp310", @@ -208,7 +207,6 @@ jobs: matrix: # Python versions to build wheels on python: [ - ["cp37", "3.7"], ["cp38", "3.8"], ["cp39", "3.9"], ["cp310", "3.10"], @@ -405,7 +403,6 @@ jobs: fail-fast: false matrix: python-version: [ - ["cp37", "3.7"], ["cp38", "3.8"], ["cp39", "3.9"], ["cp310", "3.10"], diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5c243db31..5d0369cc5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,5 +1,8 @@ name: PR pre-merge tests +env: + LOWEST_SUPPORTED_PY_VERSION: '3.8' + # Trigger test workflow whenever: # 1. A pull request is updated (e.g with new commits) # 2. Commits are pushed directly to the stage or master branch @@ -36,7 +39,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - py-version: ["3.7", "3.8", "3.9", "3.10", "3.11"] + py-version: ["3.8", "3.9", "3.10", "3.11"] fail-fast: false steps: @@ -162,12 +165,12 @@ jobs: - uses: actions/setup-python@v2 with: - python-version: '3.7' + python-version: ${{ env.LOWEST_SUPPORTED_PY_VERSION }} architecture: 'x64' - uses: actions/download-artifact@v3 with: - name: wheel-3.7 + name: wheel-${{ env.LOWEST_SUPPORTED_PY_VERSION }} - name: Install client run: pip install *.whl @@ -190,12 +193,12 @@ jobs: - uses: actions/setup-python@v2 with: - python-version: '3.7' + python-version: ${{ env.LOWEST_SUPPORTED_PY_VERSION }} architecture: 'x64' - uses: actions/download-artifact@v3 with: - name: wheel-3.7 + name: wheel-${{ env.LOWEST_SUPPORTED_PY_VERSION }} - name: Install client run: pip install *.whl @@ -220,7 +223,6 @@ jobs: strategy: matrix: py-version: [ - "3.7", "3.8", "3.9", "3.10", @@ -274,12 +276,12 @@ jobs: - uses: actions/setup-python@v2 with: - python-version: "3.7" + python-version: ${{ env.LOWEST_SUPPORTED_PY_VERSION }} architecture: 'x64' - uses: actions/download-artifact@v3 with: - name: wheel-3.7 + name: wheel-${{ env.LOWEST_SUPPORTED_PY_VERSION }} - name: Install client run: pip install *.whl @@ -310,12 +312,12 @@ jobs: - uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: ${{ env.LOWEST_SUPPORTED_PY_VERSION }} architecture: 'x64' - uses: actions/download-artifact@v3 with: - name: wheel-3.7 + name: wheel-${{ env.LOWEST_SUPPORTED_PY_VERSION }} - name: Install client run: pip install *.whl diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml index dbbcae8e6..85c10da22 100644 --- a/.github/workflows/valgrind.yml +++ b/.github/workflows/valgrind.yml @@ -21,7 +21,7 @@ jobs: - uses: actions/setup-python@v2 with: - python-version: "3.7" + python-version: '3.8' architecture: 'x64' - name: Install client diff --git a/README.rst b/README.rst index 466c7515d..324fe8215 100644 --- a/README.rst +++ b/README.rst @@ -11,7 +11,7 @@ Aerospike Python Client Compatibility ------------- -The Python client for Aerospike works with Python 3.7 - 3.11 and supports the following OS'es: +The Python client for Aerospike works with Python 3.8 - 3.11 and supports the following OS'es: * macOS 11 and 12 * CentOS 7 Linux diff --git a/aerospike-stubs/aerospike.pyi b/aerospike-stubs/aerospike.pyi index 77948925c..c661d0538 100644 --- a/aerospike-stubs/aerospike.pyi +++ b/aerospike-stubs/aerospike.pyi @@ -1,5 +1,4 @@ -from typing import Any, Callable, Union -from typing_extensions import final, Literal +from typing import Any, Callable, Union, final, Literal from aerospike_helpers.batch.records import BatchRecords AS_BOOL: Literal[1] diff --git a/pyproject.toml b/pyproject.toml index 6c2797cd3..517a37196 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,6 @@ classifiers = [ "License :: OSI Approved :: Apache Software License", "Operating System :: POSIX :: Linux", "Operating System :: MacOS :: MacOS X", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", diff --git a/test/tox.ini b/test/tox.ini index fb7d174ca..e4ba6e5b1 100644 --- a/test/tox.ini +++ b/test/tox.ini @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] skipsdist = True -envlist = py37, py38, py39, py310, py311 +envlist = py38, py39, py310, py311 [testenv] commands = pip install --find-links=local/wheels --no-index aerospike