Skip to content

Commit 735609d

Browse files
authored
Bump version for 4.2.1 (#914)
Backports fixes to pypi-publish from cryptography.
1 parent 137ae46 commit 735609d

File tree

5 files changed

+19
-24
lines changed

5 files changed

+19
-24
lines changed

.github/workflows/pypi-publish.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,14 @@ jobs:
3232
- run: echo "$EVENT_CONTEXT"
3333
env:
3434
EVENT_CONTEXT: ${{ toJson(github.event) }}
35+
36+
- run: |
37+
echo "PYPI_URL=https://upload.pypi.org/legacy/" >> $GITHUB_ENV
38+
if: github.event_name == 'workflow_run' || (github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'pypi')
39+
- run: |
40+
echo "PYPI_URL=https://test.pypi.org/legacy/" >> $GITHUB_ENV
41+
if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'testpypi'
42+
3543
- uses: dawidd6/action-download-artifact@bf251b5aa9c2f7eeb574a96ee720e24f801b7c11 # v6
3644
with:
3745
path: tmpdist/
@@ -40,20 +48,13 @@ jobs:
4048
- run: |
4149
find tmpdist/ -type f -name 'bcrypt*' -exec mv {} dist/ \;
4250
43-
- run: |
44-
echo "PYPI_URL=https://pypi.org/legacy/" >> $GITHUB_ENV
45-
if: github.event_name == 'workflow_run' || (github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'pypi')
46-
- run: |
47-
echo "PYPI_URL=https://test.pypi.org/legacy/" >> $GITHUB_ENV
48-
if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'testpypi'
49-
5051
- name: Publish package distributions to PyPI
51-
uses: pypa/[email protected]
52+
uses: pypa/gh-action-pypi-publish@15c56dba361d8335944d31a2ecd17d700fc7bcbc # v1.12.2
5253
with:
5354
repository-url: ${{ env.PYPI_URL }}
5455
skip-existing: true
5556
# Do not perform attestation for things for TestPyPI. This is
5657
# because there's nothing that would prevent a malicious PyPI from
5758
# serving a signed TestPyPI asset in place of a release intended for
5859
# PyPI.
59-
attestations: ${{ env.PYPI_URL == 'https://pypi.org/legacy/' }}
60+
attestations: ${{ env.PYPI_URL == 'https://upload.pypi.org/legacy/' }}

.github/workflows/wheel-builder.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ jobs:
4949
PYTHON:
5050
- { VERSION: "cp37-cp37m", ABI_VERSION: 'cp37' }
5151
- { VERSION: "cp39-cp39", ABI_VERSION: 'cp39' }
52-
- { VERSION: "pp39-pypy39_pp73" }
5352
- { VERSION: "pp310-pypy310_pp73" }
5453
MANYLINUX:
5554
- { NAME: "manylinux2014_x86_64", CONTAINER: "cryptography-manylinux2014:x86_64", RUNNER: "ubuntu-latest" }
@@ -63,31 +62,19 @@ jobs:
6362
- { NAME: "musllinux_1_2_aarch64", CONTAINER: "cryptography-musllinux_1_2:aarch64", RUNNER: [self-hosted, Linux, ARM64]}
6463
exclude:
6564
# There are no readily available musllinux PyPy distributions
66-
- PYTHON: { VERSION: "pp39-pypy39_pp73" }
67-
MANYLINUX: { NAME: "musllinux_1_1_x86_64", CONTAINER: "cryptography-musllinux_1_1:x86_64", RUNNER: "ubuntu-latest"}
6865
- PYTHON: { VERSION: "pp310-pypy310_pp73" }
6966
MANYLINUX: { NAME: "musllinux_1_1_x86_64", CONTAINER: "cryptography-musllinux_1_1:x86_64", RUNNER: "ubuntu-latest"}
70-
- PYTHON: { VERSION: "pp39-pypy39_pp73" }
71-
MANYLINUX: { NAME: "musllinux_1_1_aarch64", CONTAINER: "cryptography-musllinux_1_1:aarch64", RUNNER: [self-hosted, Linux, ARM64]}
7267
- PYTHON: { VERSION: "pp310-pypy310_pp73" }
7368
MANYLINUX: { NAME: "musllinux_1_1_aarch64", CONTAINER: "cryptography-musllinux_1_1:aarch64", RUNNER: [self-hosted, Linux, ARM64]}
7469

75-
- PYTHON: { VERSION: "pp39-pypy39_pp73" }
76-
MANYLINUX: { NAME: "musllinux_1_2_x86_64", CONTAINER: "cryptography-musllinux_1_2:x86_64", RUNNER: "ubuntu-latest"}
7770
- PYTHON: { VERSION: "pp310-pypy310_pp73" }
7871
MANYLINUX: { NAME: "musllinux_1_2_x86_64", CONTAINER: "cryptography-musllinux_1_2:x86_64", RUNNER: "ubuntu-latest"}
79-
- PYTHON: { VERSION: "pp39-pypy39_pp73" }
80-
MANYLINUX: { NAME: "musllinux_1_2_aarch64", CONTAINER: "cryptography-musllinux_1_2:aarch64", RUNNER: [self-hosted, Linux, ARM64]}
8172
- PYTHON: { VERSION: "pp310-pypy310_pp73" }
8273
MANYLINUX: { NAME: "musllinux_1_2_aarch64", CONTAINER: "cryptography-musllinux_1_2:aarch64", RUNNER: [self-hosted, Linux, ARM64]}
8374

8475
# We also don't build pypy wheels for anything except the latest manylinux
85-
- PYTHON: { VERSION: "pp39-pypy39_pp73" }
86-
MANYLINUX: { NAME: "manylinux2014_x86_64", CONTAINER: "cryptography-manylinux2014:x86_64", RUNNER: "ubuntu-latest"}
8776
- PYTHON: { VERSION: "pp310-pypy310_pp73" }
8877
MANYLINUX: { NAME: "manylinux2014_x86_64", CONTAINER: "cryptography-manylinux2014:x86_64", RUNNER: "ubuntu-latest"}
89-
- PYTHON: { VERSION: "pp39-pypy39_pp73" }
90-
MANYLINUX: { NAME: "manylinux2014_aarch64", CONTAINER: "cryptography-manylinux2014_aarch64", RUNNER: [self-hosted, Linux, ARM64]}
9178
- PYTHON: { VERSION: "pp310-pypy310_pp73" }
9279
MANYLINUX: { NAME: "manylinux2014_aarch64", CONTAINER: "cryptography-manylinux2014_aarch64", RUNNER: [self-hosted, Linux, ARM64]}
9380
name: "${{ matrix.PYTHON.VERSION }} for ${{ matrix.MANYLINUX.NAME }}"

README.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@ While bcrypt remains an acceptable choice for password storage, depending on you
5151
Changelog
5252
=========
5353

54+
4.2.1
55+
-----
56+
57+
* Bump Rust dependency versions - this should resolve crashes on Python 3.13
58+
free-threaded builds.
59+
* We no longer build ``manylinux`` wheels for PyPy 3.9.
60+
5461
4.2.0
5562
-----
5663

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ build-backend = "setuptools.build_meta"
1111
[project]
1212
name = "bcrypt"
1313
# When updating this, also update lib.rs
14-
version = "4.2.0"
14+
version = "4.2.1"
1515
authors = [
1616
{name = "The Python Cryptographic Authority developers", email = "[email protected]"}
1717
]

src/_bcrypt/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ mod _bcrypt {
197197
// When updating this, also update pyproject.toml
198198
// This isn't named __version__ because passlib treats the existence of
199199
// that attribute as proof that we're a different module
200-
m.add("__version_ex__", "4.2.0")?;
200+
m.add("__version_ex__", "4.2.1")?;
201201

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

0 commit comments

Comments
 (0)