Skip to content

Commit

Permalink
Update GitHub action versions
Browse files Browse the repository at this point in the history
Also:
- Use Python 3.12 in GitHub workflows
- Use `check` subcommand of ruff
- Update ruff settings for 0.2.0 deprecations
  • Loading branch information
nsoranzo committed Jun 28, 2024
1 parent 8136f6c commit c4e083b
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 18 deletions.
25 changes: 13 additions & 12 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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/
Expand All @@ -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:
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ 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
run: pip install tox
- name: Run tox
run: tox
- uses: psf/black@stable
- uses: isort/isort-action@master
- uses: isort/isort-action@v1
4 changes: 3 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ skipsdist = True

[testenv]
commands =
lint: ruff .
lint: ruff check .
lint: flake8 .
mypy: mypy .
deps =
Expand Down

0 comments on commit c4e083b

Please sign in to comment.