From 86e0e6ca23427c7bde1403e933dd221061d60e73 Mon Sep 17 00:00:00 2001 From: Chris Markiewicz Date: Thu, 11 Jul 2024 12:24:21 -0400 Subject: [PATCH 1/5] chore(dependabot): Configure dependabot to update actions --- .github/dependabot.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..d13cfde6 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,14 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "monthly" + groups: + actions-infrastructure: + patterns: + - "actions/*" + third-party: + patterns: + - "docker/*" + - "pypa/*" From 2494869aa70058f791833fb22ddba55f5bcf5598 Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Tue, 16 Jul 2024 10:43:10 +0100 Subject: [PATCH 2/5] CI: Update action versions --- .github/workflows/main.yaml | 14 ++++++------- .github/workflows/pull_request.yaml | 6 +++--- .github/workflows/release.yaml | 32 ++++++++++++++--------------- .github/workflows/test_release.yaml | 26 +++++++++++------------ 4 files changed, 39 insertions(+), 39 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 8b41deb6..9a379fe5 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -37,9 +37,9 @@ jobs: ENV_DIR: ./test.env steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} architecture: x64 @@ -108,9 +108,9 @@ jobs: ENV_DIR: ./test.env steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: "3.10" architecture: x64 @@ -220,9 +220,9 @@ jobs: ENV_DIR: ./test.env steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: "3.10" architecture: "x64" @@ -257,7 +257,7 @@ jobs: steps: - name: Install git run: apt-get update -y && apt-get install -y git - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Install system dependencies run: bash ./.ci/install_32bit_dependencies.sh - name: Create test environment diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 892f3a1e..5ea53acc 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -28,9 +28,9 @@ jobs: ENV_DIR: ./test.env steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} architecture: x64 @@ -69,7 +69,7 @@ jobs: steps: - name: Install git run: apt-get update -y && apt-get install -y git - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Install system dependencies run: bash ./.ci/install_32bit_dependencies.sh - name: Create test environment diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8e3f0dcc..8b47e5dc 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -16,9 +16,9 @@ jobs: name: Build source distribution runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v5 name: Install Python with: python-version: "3.10" @@ -26,7 +26,7 @@ jobs: - name: Build sdist run: python setup.py sdist - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: sdist path: ./dist/*.tar.gz @@ -40,8 +40,8 @@ jobs: CIBW_ARCHS_MACOS: "x86_64 arm64 universal2" steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 name: Install Python with: python-version: "3.10" @@ -49,7 +49,7 @@ jobs: - name: Build wheels run: bash ./.ci/build_wheels.sh - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: wheels path: ./dist/*.whl @@ -67,8 +67,8 @@ jobs: CIBW_ARCHS_WINDOWS: ${{ matrix.arch }} steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 name: Install Python with: python-version: "3.10" @@ -76,7 +76,7 @@ jobs: run: bash ./.ci/download_zlib.sh - name: Build wheels run: bash ./.ci/build_wheels.sh - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: wheels path: ./dist/*.whl @@ -95,17 +95,17 @@ jobs: CIBW_ARCHS_LINUX: ${{ matrix.arch }} steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 name: Install Python with: python-version: "3.10" - name: Set up QEMU for emulated (e.g. ARM) builds if: ${{ matrix.arch == 'aarch64' }} - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 - name: Build wheels run: bash ./.ci/build_wheels.sh - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: wheels path: ./dist/*.whl @@ -118,18 +118,18 @@ jobs: steps: - name: Download source archive - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: sdist path: dist/ - name: Download wheel archives - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: wheels path: dist/ - name: Publish archives to PyPI - uses: pypa/gh-action-pypi-publish@v1.4.1 + uses: pypa/gh-action-pypi-publish@v1.9.0 with: user: __token__ password: ${{ secrets.PYPI_TOKEN }} diff --git a/.github/workflows/test_release.yaml b/.github/workflows/test_release.yaml index 85e48d11..c3a57691 100644 --- a/.github/workflows/test_release.yaml +++ b/.github/workflows/test_release.yaml @@ -15,9 +15,9 @@ jobs: name: Build source distribution runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v5 name: Install Python with: python-version: "3.10" @@ -25,7 +25,7 @@ jobs: - name: Build sdist run: python setup.py sdist - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: sdist path: ./dist/*.tar.gz @@ -39,8 +39,8 @@ jobs: CIBW_ARCHS_MACOS: "x86_64 arm64 universal2" steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 name: Install Python with: python-version: "3.10" @@ -48,7 +48,7 @@ jobs: - name: Build wheels run: bash ./.ci/build_wheels.sh - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: wheels path: ./dist/*.whl @@ -66,8 +66,8 @@ jobs: CIBW_ARCHS_WINDOWS: ${{ matrix.arch }} steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 name: Install Python with: python-version: "3.10" @@ -75,7 +75,7 @@ jobs: run: bash ./.ci/download_zlib.sh - name: Build wheels run: bash ./.ci/build_wheels.sh - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: wheels path: ./dist/*.whl @@ -94,17 +94,17 @@ jobs: CIBW_ARCHS_LINUX: ${{ matrix.arch }} steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 name: Install Python with: python-version: "3.10" - name: Set up QEMU for emulated (e.g. ARM) builds if: ${{ matrix.arch == 'aarch64' }} - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 - name: Build wheels run: bash ./.ci/build_wheels.sh - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: name: wheels path: ./dist/*.whl From ad67d0336097682d5c7db0bd6c98dd367b9057c6 Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Tue, 16 Jul 2024 10:57:36 +0100 Subject: [PATCH 3/5] CI: Don't specify architecture for setup-python action (not sure why it was there in the first place) --- .github/workflows/main.yaml | 3 --- .github/workflows/pull_request.yaml | 1 - 2 files changed, 4 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 9a379fe5..3c08cca5 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -42,7 +42,6 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - architecture: x64 - name: Create test environment run: bash ./.ci/create_test_env.sh "$ENV_DIR" - name: Log test environment @@ -113,7 +112,6 @@ jobs: uses: actions/setup-python@v5 with: python-version: "3.10" - architecture: x64 - name: Create test environment run: bash ./.ci/create_test_env.sh "$ENV_DIR" - name: Log test environment @@ -225,7 +223,6 @@ jobs: uses: actions/setup-python@v5 with: python-version: "3.10" - architecture: "x64" - name: Create test environment run: bash ./.ci/create_test_env.sh "$ENV_DIR" - name: Log test environment diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 5ea53acc..716e8a31 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -33,7 +33,6 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - architecture: x64 - name: Create test environment run: bash ./.ci/create_test_env.sh "$ENV_DIR" - name: Log test environment From 8dda0762c2b68807711f594c220a59917ec3dbcb Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Tue, 16 Jul 2024 11:20:16 +0100 Subject: [PATCH 4/5] CI: Bump python version for emulated 32 bit tests (3.10 doesn't seem to be available??). Update zlib version on windows. Roll-back actions/checkout version for 32 bit test due to gha / node issue (https://github.com/actions/checkout/issues/1681) --- .ci/download_zlib.sh | 2 +- .github/workflows/main.yaml | 5 ++--- .github/workflows/pull_request.yaml | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.ci/download_zlib.sh b/.ci/download_zlib.sh index 4f5a27d3..c003d731 100755 --- a/.ci/download_zlib.sh +++ b/.ci/download_zlib.sh @@ -4,7 +4,7 @@ # set -e -ZLIB_VERSION=1.3 +ZLIB_VERSION=1.3.1 curl -o zlib.tar.gz https://www.zlib.net/zlib-${ZLIB_VERSION}.tar.gz diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 3c08cca5..8701b5e2 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -14,7 +14,6 @@ defaults: run: shell: bash - jobs: # Quick tests run on all OSes/python versions @@ -242,7 +241,7 @@ jobs: container: i386/ubuntu:20.04 strategy: matrix: - python-version: ["3.9"] + python-version: ["3.11"] extra-args: ["", "--concat"] env: @@ -254,7 +253,7 @@ jobs: steps: - name: Install git run: apt-get update -y && apt-get install -y git - - uses: actions/checkout@v4 + - uses: actions/checkout@v1 - name: Install system dependencies run: bash ./.ci/install_32bit_dependencies.sh - name: Create test environment diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 716e8a31..f6b737d3 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -55,7 +55,7 @@ jobs: container: i386/ubuntu:20.04 strategy: matrix: - python-version: ["3.9"] + python-version: ["3.11"] extra-args: ["", "--concat"] env: @@ -68,7 +68,7 @@ jobs: steps: - name: Install git run: apt-get update -y && apt-get install -y git - - uses: actions/checkout@v4 + - uses: actions/checkout@v1 - name: Install system dependencies run: bash ./.ci/install_32bit_dependencies.sh - name: Create test environment From d236597510fe320bfaedb8b6e0840e545ad1cd83 Mon Sep 17 00:00:00 2001 From: Paul McCarthy Date: Tue, 16 Jul 2024 11:57:23 +0100 Subject: [PATCH 5/5] CI: Remove 32 bit testing as they are such a massive can of worms, and I can't be bothered spending time fixing them --- .github/workflows/main.yaml | 34 ---------------------------- .github/workflows/pull_request.yaml | 35 ----------------------------- 2 files changed, 69 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 8701b5e2..15fcf1b3 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -233,37 +233,3 @@ jobs: run: bash ./.ci/build_dev_indexed_gzip.sh "$ENV_DIR" - name: Run tests run: bash ./.ci/run_tests.sh "$ENV_DIR" - - - # Tests on 32 bit platform - test-32bit: - runs-on: ubuntu-latest - container: i386/ubuntu:20.04 - strategy: - matrix: - python-version: ["3.11"] - extra-args: ["", "--concat"] - - env: - USING_OS_PYTHON: 1 - PYTHON_VERSION: ${{ matrix.python-version }} - EXTRA_ARGS: ${{ matrix.extra-args }} - ENV_DIR: ./test.env - - steps: - - name: Install git - run: apt-get update -y && apt-get install -y git - - uses: actions/checkout@v1 - - name: Install system dependencies - run: bash ./.ci/install_32bit_dependencies.sh - - name: Create test environment - run: bash ./.ci/create_test_env.sh "$ENV_DIR" - - name: Log test environment - run: | - source ./.ci/activate_env.sh "$ENV_DIR" - python -V - pip freeze - - name: Build indexed_gzip - run: bash ./.ci/build_dev_indexed_gzip.sh "$ENV_DIR" - - name: Run tests - run: bash ./.ci/run_tests.sh "$ENV_DIR" diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index f6b737d3..53d5d30a 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -47,38 +47,3 @@ jobs: run: bash ./.ci/build_dev_indexed_gzip.sh "$ENV_DIR" - name: Run tests run: bash ./.ci/run_tests.sh "$ENV_DIR" - - - # Quick tests on 32 bit platform - test-32bit: - runs-on: ubuntu-latest - container: i386/ubuntu:20.04 - strategy: - matrix: - python-version: ["3.11"] - extra-args: ["", "--concat"] - - env: - USING_OS_PYTHON: 1 - PYTHON_VERSION: ${{ matrix.python-version }} - TEST_SUITE: "not slow_test" - EXTRA_ARGS: ${{ matrix.extra-args }} - ENV_DIR: ./test.env - - steps: - - name: Install git - run: apt-get update -y && apt-get install -y git - - uses: actions/checkout@v1 - - name: Install system dependencies - run: bash ./.ci/install_32bit_dependencies.sh - - name: Create test environment - run: bash ./.ci/create_test_env.sh "$ENV_DIR" - - name: Log test environment - run: | - source ./.ci/activate_env.sh "$ENV_DIR" - python -V - pip freeze - - name: Build indexed_gzip - run: bash ./.ci/build_dev_indexed_gzip.sh "$ENV_DIR" - - name: Run tests - run: bash ./.ci/run_tests.sh "$ENV_DIR"