From a0cc8634997c55454824ee0eaeddf94e27338cb1 Mon Sep 17 00:00:00 2001 From: Matt Hooks Date: Wed, 19 Jul 2023 15:40:52 -0400 Subject: [PATCH] Bump manylinux to recent version. (#9) --- .github/workflows/release.yml | 8 ++++---- .github/workflows/test.yml | 24 ++++++++++++++++++++++++ pyproject.toml | 2 +- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b3e3020..887889b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,11 +14,10 @@ jobs: strategy: matrix: python-path: ['cp37-cp37m', 'cp38-cp38', 'cp39-cp39', 'cp310-cp310', 'cp311-cp311'] - container: quay.io/pypa/manylinux_2_24_x86_64:latest + container: quay.io/pypa/manylinux_2_28_x86_64:latest env: TWINE_PASSWORD: ${{secrets.TWINE_PASSWORD}} TWINE_USERNAME: ${{secrets.TWINE_USERNAME}} - steps: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 @@ -26,12 +25,13 @@ jobs: profile: minimal toolchain: stable override: true - - run: apt update && apt install libffi-dev libssl-dev -y + target: x86_64-unknown-linux-gnu + - run: yum makecache && yum -y install libffi-devel openssl-devel - run: /opt/python/${{ matrix.python-path }}/bin/python -m venv .venv - run: .venv/bin/pip install -U pip wheel - run: .venv/bin/pip install -U twine maturin - run: .venv/bin/pip install -r requirements.txt - - run: OPENSSL_STATIC=1 OPENSSL_LIB_DIR=/usr/lib/x86_64-linux-gnu/ OPENSSL_INCLUDE_DIR=/usr/include/openssl .venv/bin/maturin build --release --strip --manylinux 2_24 -i /opt/python/${{ matrix.python-path }}/bin/python --target x86_64-unknown-linux-gnu + - run: OPENSSL_STATIC=1 .venv/bin/maturin build --release --strip --manylinux 2_28 -i /opt/python/${{ matrix.python-path }}/bin/python --target x86_64-unknown-linux-gnu - run: .venv/bin/pip install rfernet --no-index -f target/wheels - run: .venv/bin/pytest - run: .venv/bin/twine upload --non-interactive --skip-existing target/wheels/* diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7839665..692e093 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -65,3 +65,27 @@ jobs: with: command: clippy args: -- -D warnings + + test_manylinux_release: + name: Test manylinux release build + runs-on: ubuntu-latest + strategy: + matrix: + python-path: ['cp37-cp37m', 'cp38-cp38', 'cp39-cp39', 'cp310-cp310', 'cp311-cp311'] + container: quay.io/pypa/manylinux_2_28_x86_64:latest + steps: + - uses: actions/checkout@v2 + - uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: stable + override: true + target: x86_64-unknown-linux-gnu + - run: yum makecache && yum -y install libffi-devel openssl-devel + - run: /opt/python/${{ matrix.python-path }}/bin/python -m venv .venv + - run: .venv/bin/pip install -U pip wheel + - run: .venv/bin/pip install -U twine maturin + - run: .venv/bin/pip install -r requirements.txt + - run: OPENSSL_STATIC=1 .venv/bin/maturin build --release --strip --manylinux 2_28 -i /opt/python/${{ matrix.python-path }}/bin/python --target x86_64-unknown-linux-gnu + - run: .venv/bin/pip install rfernet --no-index -f target/wheels + - run: .venv/bin/pytest diff --git a/pyproject.toml b/pyproject.toml index 583a8f6..81dc238 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,7 @@ classifier = [ [tool.poetry] name = "rfernet" -version = "0.3.0" +version = "0.3.1" description = "Fast Fernet bindings for Python" authors = ["Aviram Hassan "] license = "MIT"