Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into remove-refine-cell
Browse files Browse the repository at this point in the history
  • Loading branch information
ndevenish committed Jan 16, 2025
2 parents 6aae9f8 + 26d1b1c commit 2a81f23
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 39 deletions.
36 changes: 11 additions & 25 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,6 @@ defaults:
shell: bash -l {0}

jobs:
Lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.11
- name: Lint with Ruff
run: |
pip install ruff
ruff --output-format=github --target-version=py39 .
continue-on-error: true

Build:
runs-on: ubuntu-latest
steps:
Expand All @@ -41,7 +27,7 @@ jobs:
run: |
python -m build
pip install dist/*.whl
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
path: ./dist/*

Expand All @@ -52,19 +38,19 @@ jobs:
python-version: ["3.9", "3.10", "3.11"]
os: [ubuntu-latest, windows-latest, macos-latest]
exclude:
- os: windows-latest
python-version: "3.10"
- os: windows-latest
python-version: "3.11"
- os: macos-latest
python-version: "3.10"
- os: macos-latest
python-version: "3.11"
- os: windows-latest
python-version: "3.10"
- os: windows-latest
python-version: "3.11"
- os: macos-latest
python-version: "3.10"
- os: macos-latest
python-version: "3.11"
runs-on: ${{ matrix.os }}
# runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: artifact
path: dist
Expand Down Expand Up @@ -98,7 +84,7 @@ jobs:
permissions:
id-token: write
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: artifact
path: dist
Expand Down
23 changes: 9 additions & 14 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
repos:
ci:
autoupdate_schedule: quarterly

# Automatic source code formatting
- repo: https://github.com/psf/black
rev: 23.9.1
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.9.2
hooks:
- id: black
args: [--safe, --quiet]
- id: ruff
args: [--fix, --exit-non-zero-on-fix, --show-fixes]
- id: ruff-format

# Syntax check and some basic
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v5.0.0
hooks:
- id: check-ast

- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: v0.0.291
hooks:
- id: ruff
args: ["--fix", "--show-fixes"]

0 comments on commit 2a81f23

Please sign in to comment.