pyca/bcrypt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drop py36, pypy-3.7, test py311, other housecleaning (#547)

Browse Source 
* drop py36, pypy-3.7, test py311, other housecleaning

* wheel builder update

* also circle

* we can do more
This commit is contained in:
Paul Kehrer 2023-05-23 12:33:52 +09:00 committed by GitHub
parent f6e9a8e940
commit 9c7196586e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.circleci/config.yml
View File

@ -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:

27
.github/workflows/ci.yml vendored
View File

@ -13,8 +13,8 @@ jobs:
strategy:
matrix:
PYTHON:
- {VERSION: "3.6", TOXENV: "py36"}
- {VERSION: "3.10", TOXENV: "py310"}
- {VERSION: "3.7", TOXENV: "py37"}
- {VERSION: "3.11", TOXENV: "py311"}
name: "Python ${{ matrix.PYTHON.VERSION }} on macOS"
steps:
- uses: actions/checkout@v3.5.2
@ -49,8 +49,8 @@ jobs:
- {ARCH: 'x86', WINDOWS: 'win32', RUST_TRIPLE: 'i686-pc-windows-msvc'}
- {ARCH: 'x64', WINDOWS: 'win64', RUST_TRIPLE: 'x86_64-pc-windows-msvc'}
PYTHON:
- {VERSION: "3.6", TOXENV: "py36"}
- {VERSION: "3.10", TOXENV: "py310"}
- {VERSION: "3.7", TOXENV: "py37"}
- {VERSION: "3.11", TOXENV: "py311"}
name: "Python ${{ matrix.PYTHON.VERSION }} on ${{ matrix.WINDOWS.WINDOWS }}"
steps:
- uses: actions/checkout@v3.5.2
@ -71,7 +71,7 @@ jobs:
~/.cargo/registry/src/
~/.cargo/git/db/
src/_bcrypt/target/
key: ${{ runner.os }}-${{ matrix.WINDOWS.ARCH }}-${{ steps.setup-python.outputs.python-version }}-cargo-${{ hashFiles('**/Cargo.lock') }}
key: ${{ runner.os }}-${{ matrix.WINDOWS.ARCH }}-${{ steps.setup-python.outputs.python-version }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- run: pip install tox
- run: tox
@ -83,21 +83,20 @@ jobs:
strategy:
matrix:
PYTHON:
- {VERSION: "3.9", TOXENV: "pep8,packaging"}
- {VERSION: "3.9", TOXENV: "mypy"}
- {VERSION: "3.6", TOXENV: "py36"}
- {VERSION: "3.11", TOXENV: "pep8,packaging"}
- {VERSION: "3.11", TOXENV: "mypy"}
- {VERSION: "3.7", TOXENV: "py37"}
- {VERSION: "3.8", TOXENV: "py38"}
- {VERSION: "3.9", TOXENV: "py39"}
- {VERSION: "3.10", TOXENV: "py310"}
- {VERSION: "pypy-3.7-v7.3.9", TOXENV: "pypy3"}
- {VERSION: "pypy-3.8-v7.3.9", TOXENV: "pypy3"}
- {VERSION: "pypy-3.9-v7.3.9", TOXENV: "pypy3"}
- {VERSION: "3.11", TOXENV: "py311"}
- {VERSION: "pypy-3.8", TOXENV: "pypy3"}
- {VERSION: "pypy-3.9", TOXENV: "pypy3"}
# MSRV
- {VERSION: "3.10", TOXENV: "py310", RUST_VERSION: "1.56.0"}
- {VERSION: "3.10", TOXENV: "py310", RUST_VERSION: "beta"}
- {VERSION: "3.10", TOXENV: "py310", RUST_VERSION: "nightly"}
- {VERSION: "3.11", TOXENV: "py311", RUST_VERSION: "1.56.0"}
- {VERSION: "3.11", TOXENV: "py311", RUST_VERSION: "beta"}
- {VERSION: "3.11", TOXENV: "py311", RUST_VERSION: "nightly"}
name: "${{ matrix.PYTHON.TOXENV }} on linux, Rust ${{ matrix.PYTHON.RUST_VERSION || 'stable' }}"
steps:
- uses: actions/checkout@v3.5.2

15
.github/workflows/wheel-builder.yml vendored
View File

@ -21,8 +21,7 @@ jobs:
strategy:
matrix:
PYTHON:
- { VERSION: "cp36-cp36m", ABI_VERSION: 'cp36' }
- { VERSION: "pp37-pypy37_pp73" }
- { VERSION: "cp37-cp37m", ABI_VERSION: 'cp37' }
- { VERSION: "pp38-pypy38_pp73" }
- { VERSION: "pp39-pypy39_pp73" }
MANYLINUX:
@ -31,8 +30,6 @@ jobs:
- { CONTAINER: "cryptography-musllinux_1_1:x86_64", NAME: "musllinux_1_1" }
exclude:
# There are no readily available musllinux PyPy distributions
- PYTHON: { VERSION: "pp37-pypy37_pp73" }
MANYLINUX: { NAME: "musllinux_1_1", CONTAINER: "cryptography-musllinux_1_1:x86_64" }
- PYTHON: { VERSION: "pp38-pypy38_pp73" }
MANYLINUX: { NAME: "musllinux_1_1", CONTAINER: "cryptography-musllinux_1_1:x86_64"}
- PYTHON: { VERSION: "pp39-pypy39_pp73" }
@ -75,10 +72,10 @@ jobs:
strategy:
matrix:
PYTHON:
- VERSION: '3.10'
ABI_VERSION: 'cp36'
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'
- VERSION: '3.11'
ABI_VERSION: 'cp37'
DOWNLOAD_URL: 'https://www.python.org/ftp/python/3.11.3/python-3.11.3-macos11.pkg'
BIN_PATH: '/Library/Frameworks/Python.framework/Versions/3.11/bin/python3'
name: "Python ${{ matrix.PYTHON.VERSION }} for ABI ${{ matrix.PYTHON.ABI_VERSION }} on macOS"
steps:
- uses: actions/checkout@v3.5.2
@ -127,7 +124,7 @@ jobs:
- {ARCH: 'x86', RUST_TRIPLE: 'i686-pc-windows-msvc'}
- {ARCH: 'x64', RUST_TRIPLE: 'x86_64-pc-windows-msvc'}
PYTHON:
- {VERSION: "3.6", ABI_VERSION: "cp36"}
- {VERSION: "3.7", ABI_VERSION: "cp37"}
name: "${{ matrix.PYTHON.VERSION }} ${{ matrix.PYTHON.ABI_VERSION }} ${{ matrix.WINDOWS.ARCH }}"
steps:
- uses: actions/checkout@v3.5.2

5
README.rst
View File

@ -51,6 +51,11 @@ While bcrypt remains an acceptable choice for password storage, depending on you
Changelog
=========
5.0.0 (UNRELEASED)
------------------
* Dropped support for Python 3.6.
4.0.1
-----

2
pyproject.toml
View File

@ -11,4 +11,4 @@ build-backend = "setuptools.build_meta"
[tool.black]
line-length = 79
target-version = ["py36"]
target-version = ["py37"]

2
setup.cfg
View File

@ -16,11 +16,11 @@ classifiers =
Programming Language :: Python :: Implementation :: PyPy
Programming Language :: Python :: 3
Programming Language :: Python :: 3 :: Only
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
[options]
python_requires = >=3.6

2
setup.py
View File

@ -42,7 +42,7 @@ try:
features=(
[]
if platform.python_implementation() == "PyPy"
else ["pyo3/abi3-py36"]
else ["pyo3/abi3-py37"]
),
rust_version=">=1.56.0",
),