Skip to content

Commit

Permalink
Begin the changelog for 36.0.2 (#6942)
Browse files Browse the repository at this point in the history
* Begin the changelog for 36.0.2

* Switch from centos to rhel in CI (#6844)

* Switch from centos to rhel in CI

* Update installation.rst

* Update installation.rst

* Re-blackify for latest black

* Fix mypy (#6711)

* Fix mypy

* Poke for GHA

* Backport CircleCI

* Remove Zuul from our CI (#6778)

It was providing arm64 builds, but we now do those on CircleCI
  • Loading branch information
alex committed Mar 10, 2022
1 parent 3fd9d5a commit eeaca2d
Show file tree
Hide file tree
Showing 30 changed files with 196 additions and 352 deletions.
35 changes: 35 additions & 0 deletions .circleci/build-wheel.sh
@@ -0,0 +1,35 @@
#!/bin/bash -ex

cd /test

echo "Building for ${PLATFORM}"

PYBIN="/opt/python/${PYTHON}/bin"

mkdir -p /test/wheelhouse.final

"${PYBIN}"/python -m venv .venv

.venv/bin/pip install -U pip wheel cffi setuptools-rust

.venv/bin/python setup.py sdist
cd dist
tar zxf cryptography*.tar.gz
rm -rf cryptograph*.tar.gz
cd cryptography*

REGEX="cp3([0-9])*"
if [[ "${PYBIN}" =~ $REGEX ]]; then
PY_LIMITED_API="--py-limited-api=cp3${BASH_REMATCH[1]}"
fi

LDFLAGS="-L/opt/pyca/cryptography/openssl/lib" \
CFLAGS="-I/opt/pyca/cryptography/openssl/include -Wl,--exclude-libs,ALL" \
../../.venv/bin/python setup.py bdist_wheel "$PY_LIMITED_API"

auditwheel repair --plat "${PLATFORM}" -w wheelhouse/ dist/cryptography*.whl

../../.venv/bin/pip install cryptography --no-index -f wheelhouse/
../../.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'))"

mv wheelhouse/* /test/wheelhouse.final
104 changes: 104 additions & 0 deletions .circleci/config.yml
@@ -0,0 +1,104 @@
version: 2.1

commands:
docker-pull:
parameters:
image:
type: string
steps:
- run: docker pull <<parameters.image>>
docker-run:
parameters:
image:
type: string
command:
type: string
steps:
- run: docker run -e PLATFORM -e PYTHON -v $(pwd):/test <<parameters.image>> /bin/bash -c 'cd /test;<<parameters.command>>'

jobs:
linux-arm64:
machine:
image: ubuntu-2004:202111-02
resource_class: arm.medium
parameters:
image:
type: string
toxenv:
type: string
steps:
- checkout
- docker-pull:
image: <<parameters.image>>
- docker-run:
image: <<parameters.image>>
command: tox -e <<parameters.toxenv>>
linux-arm64-wheel:
machine:
image: ubuntu-2004:202111-02
resource_class: arm.medium
parameters:
image:
type: string
platform:
type: string
python:
type: string
environment:
PLATFORM: <<parameters.platform>>
PYTHON: <<parameters.python>>
steps:
- checkout
- docker-pull:
image: <<parameters.image>>
- docker-run:
image: <<parameters.image>>
command: /test/.circleci/build-wheel.sh
- store_artifacts:
path: wheelhouse.final

workflows:
ci:
jobs:
- linux-arm64:
# Changing this name should only be done in conjunction with updating
# the required checks on GH
name: linux-arm64-ci
image: ghcr.io/pyca/cryptography-runner-ubuntu-focal:aarch64
toxenv: py38
# This makes sure it runs on all tags in addition to PRs/branches.
# By default CircleCI ignores tags.
filters:
tags:
only: /.*/
- linux-arm64:
name: linux-arm64-alpine-ci
image: ghcr.io/pyca/cryptography-runner-alpine:aarch64
toxenv: py39
filters:
tags:
only: /.*/
- linux-arm64-wheel:
name: manylinux2014_aarch64-wheel
image: ghcr.io/pyca/cryptography-manylinux2014_aarch64:latest
python: cp36-cp36m
platform: manylinux2014_aarch64
filters:
tags:
only: /.*/
- linux-arm64-wheel:
name: manylinux_2_24_aarch64-wheel
image: ghcr.io/pyca/cryptography-manylinux_2_24:aarch64
python: cp36-cp36m
platform: manylinux_2_24_aarch64
filters:
tags:
only: /.*/
- linux-arm64-wheel:
name: musllinux_1_1_aarch64-wheel
image: ghcr.io/pyca/cryptography-musllinux_1_1:aarch64
python: cp36-cp36m
platform: musllinux_1_1_aarch64
filters:
tags:
only: /.*/
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Expand Up @@ -130,8 +130,8 @@ jobs:
fail-fast: false
matrix:
IMAGE:
- {IMAGE: "centos8", TOXENV: "py36"}
- {IMAGE: "centos8-fips", TOXENV: "py36", FIPS: true}
- {IMAGE: "rhel8", TOXENV: "py36"}
- {IMAGE: "rhel8-fips", TOXENV: "py36", FIPS: true}
- {IMAGE: "buster", TOXENV: "py37"}
- {IMAGE: "bullseye", TOXENV: "py39"}
- {IMAGE: "bookworm", TOXENV: "py39"}
Expand Down
52 changes: 0 additions & 52 deletions .zuul.d/jobs.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions .zuul.d/project.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions .zuul.playbooks/playbooks/tox/main.yaml

This file was deleted.

38 changes: 0 additions & 38 deletions .zuul.playbooks/playbooks/tox/pre.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions .zuul.playbooks/playbooks/wheel/main.yaml

This file was deleted.

42 changes: 0 additions & 42 deletions .zuul.playbooks/playbooks/wheel/pre.yaml

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit eeaca2d

Please sign in to comment.