Skip to content

Commit 761ef4b

Browse files
authored
bump for 42.0.8 release (#11072)
* bump for 42.0.8 release * backport insanity * oh right * oops
1 parent 0cc7fc3 commit 761ef4b

File tree

6 files changed

+38
-24
lines changed

6 files changed

+38
-24
lines changed

.github/workflows/wheel-builder.yml

+27-20
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ubuntu-latest
2828
name: sdists
2929
steps:
30-
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
30+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
3131
with:
3232
# The tag to build or the tag received by the tag event
3333
ref: ${{ github.event.inputs.version || github.ref }}
@@ -40,19 +40,23 @@ jobs:
4040
run: .venv/bin/python -m build --sdist
4141
- name: Make sdist and wheel (vectors)
4242
run: cd vectors/ && ../.venv/bin/python -m build
43-
- uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
43+
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
4444
with:
4545
name: "cryptography-sdist"
4646
path: dist/cryptography*
47-
- uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
47+
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
4848
with:
4949
name: "vectors-sdist-wheel"
5050
path: vectors/dist/cryptography*
5151

5252
manylinux:
5353
needs: [sdist]
5454
runs-on: ${{ matrix.MANYLINUX.RUNNER }}
55-
container: ghcr.io/pyca/${{ matrix.MANYLINUX.CONTAINER }}
55+
container:
56+
image: ghcr.io/pyca/${{ matrix.MANYLINUX.CONTAINER }}
57+
volumes:
58+
- /staticnodehost:/staticnodecontainer:rw,rshared
59+
- /staticnodehost:/__e/node20:ro,rshared
5660
strategy:
5761
fail-fast: false
5862
matrix:
@@ -102,6 +106,9 @@ jobs:
102106
MANYLINUX: { NAME: "manylinux2014_aarch64", CONTAINER: "cryptography-manylinux2014_aarch64", RUNNER: [self-hosted, Linux, ARM64]}
103107
name: "${{ matrix.PYTHON.VERSION }} for ${{ matrix.MANYLINUX.NAME }}"
104108
steps:
109+
- name: Ridiculous-er workaround for static node20
110+
run: |
111+
cp -R /staticnode/* /staticnodecontainer/
105112
- name: Ridiculous alpine workaround for actions support on arm64
106113
run: |
107114
# This modifies /etc/os-release so the JS actions
@@ -112,7 +119,7 @@ jobs:
112119
if: startsWith(matrix.MANYLINUX.NAME, 'musllinux') && endsWith(matrix.MANYLINUX.NAME, 'aarch64')
113120

114121
- name: Get build-requirements.txt from repository
115-
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
122+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
116123
with:
117124
# The tag to build or the tag received by the tag event
118125
ref: ${{ github.event.inputs.version || github.ref }}
@@ -124,7 +131,7 @@ jobs:
124131
- name: Install Python dependencies
125132
run: .venv/bin/pip install --require-hashes -r ${{ env.BUILD_REQUIREMENTS_PATH }}
126133

127-
- uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
134+
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
128135
with:
129136
name: cryptography-sdist
130137
- run: mkdir tmpwheelhouse
@@ -135,7 +142,7 @@ jobs:
135142
fi
136143
OPENSSL_DIR="/opt/pyca/cryptography/openssl" \
137144
OPENSSL_STATIC=1 \
138-
.venv/bin/python -m pip wheel -v $PY_LIMITED_API cryptograph*.tar.gz -w dist/ && mv dist/cryptography*.whl tmpwheelhouse
145+
.venv/bin/python -m pip wheel -v --no-deps $PY_LIMITED_API cryptograph*.tar.gz -w dist/ && mv dist/cryptography*.whl tmpwheelhouse
139146
env:
140147
RUSTUP_HOME: /root/.rustup
141148
- run: auditwheel repair --plat ${{ matrix.MANYLINUX.NAME }} tmpwheelhouse/cryptograph*.whl -w wheelhouse/
@@ -153,7 +160,7 @@ jobs:
153160
.venv/bin/python -c "from cryptography.hazmat.backends.openssl.backend import backend;print('Loaded: ' + backend.openssl_version_text());print('Linked Against: ' + backend._ffi.string(backend._lib.OPENSSL_VERSION_TEXT).decode('ascii'))"
154161
- run: mkdir cryptography-wheelhouse
155162
- run: mv wheelhouse/cryptography*.whl cryptography-wheelhouse/
156-
- uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
163+
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
157164
with:
158165
name: "cryptography-${{ github.event.inputs.version }}-${{ matrix.MANYLINUX.NAME }}-${{ matrix.PYTHON.VERSION }}-${{ matrix.PYTHON.ABI_VERSION }}"
159166
path: cryptography-wheelhouse/
@@ -212,7 +219,7 @@ jobs:
212219
name: "${{ matrix.PYTHON.VERSION }} ABI ${{ matrix.PYTHON.ABI_VERSION }} macOS ${{ matrix.PYTHON.ARCHFLAGS }}"
213220
steps:
214221
- name: Get build-requirements.txt from repository
215-
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
222+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
216223
with:
217224
# The tag to build or the tag received by the tag event
218225
ref: ${{ github.event.inputs.version || github.ref }}
@@ -228,11 +235,11 @@ jobs:
228235
PYTHON_DOWNLOAD_URL: ${{ matrix.PYTHON.DOWNLOAD_URL }}
229236
if: contains(matrix.PYTHON.VERSION, 'pypy') == false
230237
- name: Setup pypy
231-
uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
238+
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
232239
with:
233240
python-version: ${{ matrix.PYTHON.VERSION }}
234241
if: contains(matrix.PYTHON.VERSION, 'pypy')
235-
- uses: dawidd6/action-download-artifact@e7466d1a7587ed14867642c2ca74b5bcc1e19a2d # v3.0.0
242+
- uses: dawidd6/action-download-artifact@deb3bb83256a78589fef6a7b942e5f2573ad7c13 # v5
236243
with:
237244
repo: pyca/infra
238245
workflow: build-macos-openssl.yml
@@ -250,7 +257,7 @@ jobs:
250257
- name: Install Python dependencies
251258
run: venv/bin/pip install --require-hashes -r ${{ env.BUILD_REQUIREMENTS_PATH }}
252259

253-
- uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
260+
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
254261
with:
255262
name: cryptography-sdist
256263
- run: mkdir wheelhouse
@@ -262,7 +269,7 @@ jobs:
262269
263270
OPENSSL_DIR="$(readlink -f ../openssl-macos-universal2/)" \
264271
OPENSSL_STATIC=1 \
265-
venv/bin/python -m pip wheel -v $PY_LIMITED_API cryptograph*.tar.gz -w dist/ && mv dist/cryptography*.whl wheelhouse
272+
venv/bin/python -m pip wheel -v --no-deps $PY_LIMITED_API cryptograph*.tar.gz -w dist/ && mv dist/cryptography*.whl wheelhouse
266273
env:
267274
MACOSX_DEPLOYMENT_TARGET: ${{ matrix.PYTHON.DEPLOYMENT_TARGET }}
268275
ARCHFLAGS: ${{ matrix.PYTHON.ARCHFLAGS }}
@@ -278,7 +285,7 @@ jobs:
278285
- run: mv wheelhouse/cryptography*.whl cryptography-wheelhouse/
279286
- run: |
280287
echo "CRYPTOGRAPHY_WHEEL_NAME=$(basename $(ls cryptography-wheelhouse/cryptography*.whl))" >> $GITHUB_ENV
281-
- uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
288+
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
282289
with:
283290
name: "${{ env.CRYPTOGRAPHY_WHEEL_NAME }}"
284291
path: cryptography-wheelhouse/
@@ -306,7 +313,7 @@ jobs:
306313
name: "${{ matrix.PYTHON.VERSION }} ${{ matrix.WINDOWS.WINDOWS }} ${{ matrix.PYTHON.ABI_VERSION }}"
307314
steps:
308315
- name: Get build-requirements.txt from repository
309-
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
316+
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
310317
with:
311318
# The tag to build or the tag received by the tag event
312319
ref: ${{ github.event.inputs.version || github.ref }}
@@ -315,12 +322,12 @@ jobs:
315322
${{ env.BUILD_REQUIREMENTS_PATH }}
316323
sparse-checkout-cone-mode: false
317324

318-
- uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
325+
- uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
319326
with:
320327
name: cryptography-sdist
321328

322329
- name: Setup python
323-
uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
330+
uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
324331
with:
325332
python-version: ${{ matrix.PYTHON.VERSION }}
326333
architecture: ${{ matrix.WINDOWS.ARCH }}
@@ -329,7 +336,7 @@ jobs:
329336
toolchain: 1.77.2
330337
target: ${{ matrix.WINDOWS.RUST_TRIPLE }}
331338

332-
- uses: dawidd6/action-download-artifact@e7466d1a7587ed14867642c2ca74b5bcc1e19a2d # v3.0.0
339+
- uses: dawidd6/action-download-artifact@deb3bb83256a78589fef6a7b942e5f2573ad7c13 # v5
333340
with:
334341
repo: pyca/infra
335342
workflow: build-windows-openssl.yml
@@ -351,7 +358,7 @@ jobs:
351358
PY_LIMITED_API="--config-settings=--build-option=--py-limited-api=${{ matrix.PYTHON.ABI_VERSION }} --no-build-isolation"
352359
fi
353360
354-
python -m pip wheel -v cryptography*.tar.gz $PY_LIMITED_API -w dist/ && mv dist/cryptography*.whl wheelhouse/
361+
python -m pip wheel -v --no-deps cryptography*.tar.gz $PY_LIMITED_API -w dist/ && mv dist/cryptography*.whl wheelhouse/
355362
shell: bash
356363
- run: pip install -f wheelhouse --no-index cryptography
357364
- name: Print the OpenSSL we built and linked against
@@ -360,7 +367,7 @@ jobs:
360367
361368
- run: mkdir cryptography-wheelhouse
362369
- run: move wheelhouse\cryptography*.whl cryptography-wheelhouse\
363-
- uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
370+
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
364371
with:
365372
name: "cryptography-${{ github.event.inputs.version }}-${{ matrix.WINDOWS.WINDOWS }}-${{ matrix.PYTHON.VERSION }}-${{ matrix.PYTHON.ABI_VERSION }}"
366373
path: cryptography-wheelhouse\

CHANGELOG.rst

+7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
Changelog
22
=========
33

4+
.. _v42-0-8:
5+
6+
42.0.8 - 2024-06-04
7+
~~~~~~~~~~~~~~~~~~~
8+
9+
* Updated Windows, macOS, and Linux wheels to be compiled with OpenSSL 3.2.2.
10+
411
.. _v42-0-7:
512

613
42.0.7 - 2024-05-06

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ build-backend = "setuptools.build_meta"
1212

1313
[project]
1414
name = "cryptography"
15-
version = "42.0.7"
15+
version = "42.0.8"
1616
authors = [
1717
{name = "The Python Cryptographic Authority and individual contributors", email = "[email protected]"}
1818
]

src/cryptography/__about__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"__copyright__",
1111
]
1212

13-
__version__ = "42.0.7"
13+
__version__ = "42.0.8"
1414

1515

1616
__author__ = "The Python Cryptographic Authority and individual contributors"

vectors/cryptography_vectors/__about__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
"__version__",
77
]
88

9-
__version__ = "42.0.7"
9+
__version__ = "42.0.8"

vectors/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"
44

55
[project]
66
name = "cryptography_vectors"
7-
version = "42.0.7"
7+
version = "42.0.8"
88
authors = [
99
{name = "The Python Cryptographic Authority and individual contributors", email = "[email protected]"}
1010
]

0 commit comments

Comments
 (0)