From 933e8c26d168a78e0222f19cbcb717cc9ce25ca4 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sun, 30 Jun 2024 09:38:18 -0400 Subject: [PATCH] Bump minimum to py37 --- .circleci/config.yml | 6 +++--- .github/workflows/ci.yml | 6 ++---- .github/workflows/wheel-builder.yml | 6 +++--- README.rst | 2 +- pyproject.toml | 3 +-- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fe4b6190..3cb3c162 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -74,7 +74,7 @@ workflows: - linux-arm64-wheel: name: manylinux2014_aarch64-wheel image: ghcr.io/pyca/cryptography-manylinux2014_aarch64:latest - python: cp36-cp36m + python: cp37-cp37m platform: manylinux2014_aarch64 filters: tags: @@ -82,7 +82,7 @@ workflows: - linux-arm64-wheel: name: manylinux_2_28_aarch64-wheel image: ghcr.io/pyca/cryptography-manylinux_2_28:aarch64 - python: cp36-cp36m + python: cp37-cp37m platform: manylinux_2_28_aarch64 filters: tags: @@ -90,7 +90,7 @@ workflows: - linux-arm64-wheel: name: musllinux_1_1_aarch64-wheel image: ghcr.io/pyca/cryptography-musllinux_1_1:aarch64 - python: cp36-cp36m + python: cp37-cp37m platform: musllinux_1_1_aarch64 filters: tags: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4fc65621..40a580ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,6 @@ jobs: - {VERSION: "3.12", TOXENV: "mypy", COVERAGE: "false"} - {VERSION: "pypy-3.9", TOXENV: "pypy3"} - {VERSION: "pypy-3.10", TOXENV: "pypy3"} - - {VERSION: "3.6", TOXENV: "py36"} - {VERSION: "3.7", TOXENV: "py37"} - {VERSION: "3.8", TOXENV: "py38"} - {VERSION: "3.9", TOXENV: "py39"} @@ -71,11 +70,11 @@ jobs: - 'macos-13' - 'macos-latest' PYTHON: - - {VERSION: "3.6", TOXENV: "py36"} + - {VERSION: "3.7", TOXENV: "py37"} - {VERSION: "3.12", TOXENV: "py312"} - {VERSION: "3.12", TOXENV: "py312", NOTE: " (minimal build)", SODIUM_INSTALL_MINIMAL: "1"} exclude: - - PYTHON: {VERSION: "3.6", TOXENV: "py36"} + - PYTHON: {VERSION: "3.7", TOXENV: "py37"} RUNNER: macos-latest name: "Python ${{ matrix.PYTHON.VERSION }}${{ matrix.PYTHON.NOTE }} on ${{ matrix.RUNNER }}" steps: @@ -103,7 +102,6 @@ jobs: - {ARCH: 'x86', SODIUM_ARCH: 'Win32'} - {ARCH: 'x64', SODIUM_ARCH: 'x64'} PYTHON: - - {VERSION: "3.6", TOXENV: "py36", SODIUM_MSVC_VERSION: "v142"} - {VERSION: "3.7", TOXENV: "py37", SODIUM_MSVC_VERSION: "v142"} - {VERSION: "3.8", TOXENV: "py38", SODIUM_MSVC_VERSION: "v142"} - {VERSION: "3.9", TOXENV: "py39", SODIUM_MSVC_VERSION: "v142"} diff --git a/.github/workflows/wheel-builder.yml b/.github/workflows/wheel-builder.yml index b174992d..88ba5c22 100644 --- a/.github/workflows/wheel-builder.yml +++ b/.github/workflows/wheel-builder.yml @@ -28,7 +28,7 @@ jobs: strategy: matrix: PYTHON: - - { VERSION: "cp36-cp36m", PATH: "/opt/python/cp36-cp36m/bin/python", ABI_VERSION: 'cp36' } + - { VERSION: "cp3-cp37m", PATH: "/opt/python/cp37-cp37m/bin/python", ABI_VERSION: 'cp37' } MANYLINUX: - { NAME: "manylinux2014_x86_64", CONTAINER: "cryptography-manylinux2014:x86_64" } - { name: "manylinux_2_28_x86_64", CONTAINER: "cryptography-manylinux_2_28:x86_64"} @@ -72,7 +72,7 @@ jobs: matrix: PYTHON: - VERSION: '3.10' - ABI_VERSION: 'cp36' + ABI_VERSION: 'cp37' DOWNLOAD_URL: 'https://www.python.org/ftp/python/3.10.1/python-3.10.1-macos11.pkg' BIN_PATH: '/Library/Frameworks/Python.framework/Versions/3.10/bin/python3' name: "Python ${{ matrix.PYTHON.VERSION }} for ABI ${{ matrix.PYTHON.ABI_VERSION }} on macOS" @@ -120,7 +120,7 @@ jobs: - {ARCH: 'x86', SODIUM_ARCH: 'Win32', VS_ARCH: 'x86'} - {ARCH: 'x64', SODIUM_ARCH: 'x64', VS_ARCH: 'amd64'} PYTHON: - - {VERSION: "3.9", SODIUM_MSVC_VERSION: "v142", "ABI_VERSION": "cp36"} + - {VERSION: "3.9", SODIUM_MSVC_VERSION: "v142", "ABI_VERSION": "cp37"} name: "${{ matrix.PYTHON.VERSION }} ${{ matrix.WINDOWS.ARCH }} ${{ matrix.PYTHON.ABI_VERSION }}" steps: - uses: actions/checkout@v4.1.7 diff --git a/README.rst b/README.rst index aca3b917..81ae389c 100644 --- a/README.rst +++ b/README.rst @@ -15,7 +15,7 @@ PyNaCl: Python binding to the libsodium library PyNaCl is a Python binding to `libsodium`_, which is a fork of the `Networking and Cryptography library`_. These libraries have a stated goal of -improving usability, security and speed. It supports Python 3.6+ as well as +improving usability, security and speed. It supports Python 3.7+ as well as PyPy 3. .. _libsodium: https://github.com/jedisct1/libsodium diff --git a/pyproject.toml b/pyproject.toml index c00c319d..e152bd84 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,6 @@ classifiers = [ "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", @@ -30,7 +29,7 @@ classifiers = [ "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", ] -requires-python = ">=3.6" +requires-python = ">=3.7" dependencies = [ "cffi>=1.4.1; platform_python_implementation != 'PyPy'" ]