Skip to content

Commit

Permalink
Prep for 4.1.0 release (#667)
Browse files Browse the repository at this point in the history
  • Loading branch information
alex authored Nov 27, 2023
1 parent 96b80a4 commit 8ca5d51
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 8 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ jobs:
- {VERSION: "pypy-3.10", TOXENV: "pypy3"}

# MSRV
- {VERSION: "3.12", TOXENV: "py312", RUST_VERSION: "1.60.0"}
- {VERSION: "3.12", TOXENV: "py312", RUST_VERSION: "1.63.0"}
- {VERSION: "3.12", TOXENV: "py312", RUST_VERSION: "1.64.0"}
- {VERSION: "3.12", TOXENV: "py312", RUST_VERSION: "beta"}
- {VERSION: "3.12", TOXENV: "py312", RUST_VERSION: "nightly"}
name: "${{ matrix.PYTHON.TOXENV }} on linux, Rust ${{ matrix.PYTHON.RUST_VERSION || 'stable' }}"
Expand All @@ -120,6 +121,8 @@ jobs:
toolchain: ${{ matrix.PYTHON.RUST_VERSION || 'stable' }}

- run: pip install tox
- if: matrix.PYTHON.RUST_VERSION == '1.63.0'
run: echo 'BCRYPT_ALLOW_RUST_163=1' >> $GITHUB_ENV
- run: tox
env:
TOXENV: ${{ matrix.PYTHON.TOXENV }}
Expand Down
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ While bcrypt remains an acceptable choice for password storage, depending on you
Changelog
=========

5.0.0 (UNRELEASED)
------------------
4.1.0
-----

* Dropped support for Python 3.6.
* Bumped MSRV to 1.60.
* Bumped MSRV to 1.64. (Note: Rust 1.63 can be used by setting the ``BCRYPT_ALLOW_RUST_163`` environment variable)

4.0.1
-----
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ build-backend = "setuptools.build_meta"
[project]
name = "bcrypt"
# When updating this, also update lib.rs
version = "4.0.1"
version = "4.1.0"
authors = [
{name = "The Python Cryptographic Authority developers", email = "cryptography-dev@python.org"}
]
Expand Down
10 changes: 8 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import os
import platform
import re
import shutil
Expand Down Expand Up @@ -43,7 +44,11 @@
if platform.python_implementation() == "PyPy"
else ["pyo3/abi3-py37"]
),
rust_version=">=1.56.0",
rust_version=(
">=1.64.0"
if os.environ.get("BCRYPT_ALLOW_RUST_163", "0") != "0"
else ">=1.63.0"
),
),
],
)
Expand All @@ -66,7 +71,8 @@
1) Upgrade to the latest pip and try again. This will fix errors for most
users. See: https://pip.pypa.io/en/stable/installing/#upgrading-pip
2) Ensure you have a recent Rust toolchain installed. bcrypt requires
rustc >= 1.56.0.
rustc >= 1.64.0. (1.63 may be used by setting the BCRYPT_ALLOW_RUST_163
environment variable)
"""
)
print(f" Python: {'.'.join(str(v) for v in sys.version_info[:3])}")
Expand Down
2 changes: 1 addition & 1 deletion src/_bcrypt/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ fn _bcrypt(_py: pyo3::Python<'_>, m: &pyo3::types::PyModule) -> pyo3::PyResult<(
m.add("__uri__", "https://github.com/pyca/bcrypt/")?;

// When updating this, also update pyproject.toml
m.add("__version__", "4.0.1")?;
m.add("__version__", "4.1.0")?;

let author = "The Python Cryptographic Authority developers";
m.add("__author__", author)?;
Expand Down

0 comments on commit 8ca5d51

Please sign in to comment.