From 8136f6c64e34c965c559e0c238820dcfc5806c4b Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Fri, 28 Jun 2024 10:01:18 +0100 Subject: [PATCH 1/4] Fix typo in directory name --- recipes/{cryptogrpahy => cryptography}/env.sh | 0 recipes/{cryptogrpahy => cryptography}/meta.yaml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename recipes/{cryptogrpahy => cryptography}/env.sh (100%) rename recipes/{cryptogrpahy => cryptography}/meta.yaml (100%) diff --git a/recipes/cryptogrpahy/env.sh b/recipes/cryptography/env.sh similarity index 100% rename from recipes/cryptogrpahy/env.sh rename to recipes/cryptography/env.sh diff --git a/recipes/cryptogrpahy/meta.yaml b/recipes/cryptography/meta.yaml similarity index 100% rename from recipes/cryptogrpahy/meta.yaml rename to recipes/cryptography/meta.yaml From 50320dcd1b5d613df2a37203107501cdaad4b7fc Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Fri, 28 Jun 2024 14:14:02 +0100 Subject: [PATCH 2/4] Update GitHub action versions Also: - Use Python 3.12 in GitHub workflows - Use `check` subcommand of ruff - Update ruff settings for 0.2.0 deprecations --- .github/workflows/ci.yaml | 25 +++++++++++++------------ .github/workflows/lint.yaml | 8 ++++---- pyproject.toml | 4 +++- tox.ini | 2 +- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1a616ad..3bc5923 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,7 +14,7 @@ jobs: outputs: recipes_found: ${{ steps.recipes_changes.outputs.recipes_found }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 # The range of commits to check for changes is: @@ -58,7 +58,7 @@ jobs: recipes_found=false fi echo "recipes_found=$recipes_found" >> $GITHUB_OUTPUT - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: recipe_list path: recipe_list.txt @@ -71,11 +71,11 @@ jobs: os: [ubuntu-latest, macos-latest] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: - python-version: '3.11' - - uses: actions/download-artifact@v3 + python-version: '3.12' + - uses: actions/download-artifact@v4 with: name: recipe_list path: ../workflow_artifacts/ @@ -86,9 +86,9 @@ jobs: while read -r folder; do python3 wheel_builder.py "$folder"; done < ../workflow_artifacts/recipe_list.txt - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: - name: wheelhouse + name: wheelhouse-${{ matrix.os }} path: wheelhouse/ deploy: @@ -97,13 +97,14 @@ jobs: if: ${{ github.ref == 'refs/heads/main' && github.event_name == 'push' && github.repository_owner == 'galaxyproject' }} runs-on: ubuntu-latest steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: - name: wheelhouse + merge-multiple: true + name: wheelhouse-* path: wheelhouse/ - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: - python-version: '3.11' + python-version: '3.12' - name: Setup deploy environment run: python3 -m pip install s3pypi - name: Deploy wheels diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 43de796..3145c20 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -19,10 +19,10 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.8', '3.11'] + python-version: ['3.8', '3.12'] steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install tox @@ -30,4 +30,4 @@ jobs: - name: Run tox run: tox - uses: psf/black@stable - - uses: isort/isort-action@master + - uses: isort/isort-action@v1 diff --git a/pyproject.toml b/pyproject.toml index a6603ce..2124f3c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,8 +7,10 @@ include = '\.pyi?$' isort = true [tool.ruff] -select = ["E", "F", "B", "UP"] target-version = "py38" + +[tool.ruff.lint] +select = ["E", "F", "B", "UP"] # Exceptions: # B9 flake8-bugbear opinionated warnings # E501 is line length (delegated to black) diff --git a/tox.ini b/tox.ini index 24fe86f..b1c95af 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ skipsdist = True [testenv] commands = - lint: ruff . + lint: ruff check . lint: flake8 . mypy: mypy . deps = From 047643d2f329bdc93016f812dfb95f116e3148a0 Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Fri, 28 Jun 2024 13:32:51 +0100 Subject: [PATCH 3/4] Add recipe for lxml for Python 3.13 wheels --- recipes/lxml/env.sh | 2 ++ recipes/lxml/meta.yaml | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 recipes/lxml/env.sh create mode 100644 recipes/lxml/meta.yaml diff --git a/recipes/lxml/env.sh b/recipes/lxml/env.sh new file mode 100644 index 0000000..5b45f89 --- /dev/null +++ b/recipes/lxml/env.sh @@ -0,0 +1,2 @@ +export CIBW_BUILD='cp313-*' +export CIBW_PRERELEASE_PYTHONS=True diff --git a/recipes/lxml/meta.yaml b/recipes/lxml/meta.yaml new file mode 100644 index 0000000..fbde8f7 --- /dev/null +++ b/recipes/lxml/meta.yaml @@ -0,0 +1,3 @@ +--- +name: lxml +version: "5.2.2" From 8dc97ecc66f00d4e0fcc0af8362626a57ab95fba Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Sat, 29 Jun 2024 00:45:43 +0100 Subject: [PATCH 4/4] Set up QEMU to build non-native architectures --- .github/workflows/ci.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3bc5923..f32f4a5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -81,6 +81,9 @@ jobs: path: ../workflow_artifacts/ - name: Install required Python packages run: python -m pip install build cibuildwheel PyYAML requests + - name: Set up QEMU to build non-native architectures + if: runner.os == 'Linux' + uses: docker/setup-qemu-action@v3 - name: Build wheels run: | while read -r folder; do