Skip to content

Commit 7f5d9fb

Browse files
committed
Merge branch 'main' into pa/typing
2 parents 773f231 + 821d36e commit 7f5d9fb

4 files changed

Lines changed: 29 additions & 18 deletions

File tree

.github/workflows/publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
permissions:
1212
id-token: write # to authenticate as Trusted Publisher to pypi.org
1313
steps:
14-
- uses: actions/checkout@v4
15-
- uses: actions/setup-python@v4
14+
- uses: actions/checkout@v5
15+
- uses: actions/setup-python@v6
1616
with:
1717
python-version: "3.x"
18-
cache: "pip"
18+
cache: pip
1919
- run: pip install build
2020
- run: python -m build
2121
- uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/pytest.yml

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,22 @@ on:
88

99
jobs:
1010
test:
11+
strategy:
12+
matrix:
13+
python-version: ["3.9", "3.13"]
1114
runs-on: ubuntu-latest
1215
timeout-minutes: 60
13-
1416
steps:
1517
- name: Checkout
16-
uses: actions/checkout@v4
18+
uses: actions/checkout@v5
1719
with:
1820
filter: blob:none
1921
fetch-depth: 0
2022

2123
- name: Setup Python
22-
uses: actions/setup-python@v5
24+
uses: actions/setup-python@v6
2325
with:
24-
python-version: "3.12"
26+
python-version: ${{ matrix.python-version }}
2527
cache: pip
2628

2729
- name: Install project and dependencies
@@ -30,23 +32,32 @@ jobs:
3032
- name: Run test suite
3133
run: pytest -v --color=yes
3234

33-
check:
35+
build:
3436
runs-on: ubuntu-latest
3537
steps:
36-
- uses: actions/checkout@v4
38+
- uses: actions/checkout@v5
3739
with:
3840
filter: blob:none
3941
fetch-depth: 0
40-
41-
- uses: actions/setup-python@v5
42+
- uses: actions/setup-python@v6
4243
with:
43-
python-version: "3.12"
44-
# cache: pip # TODO: cache tools
45-
44+
python-version: "3.x"
45+
cache: pip
4646
- name: Install tools
4747
run: pip install twine build
48-
4948
- name: Build and check
5049
run: |
5150
python -m build
5251
twine check dist/*.whl
52+
53+
check:
54+
if: always()
55+
needs:
56+
- build
57+
- test
58+
runs-on: ubuntu-latest
59+
steps:
60+
# https://github.com/marketplace/actions/alls-green#why
61+
- uses: re-actors/alls-green@release/v1
62+
with:
63+
jobs: ${{ toJSON(needs) }}

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ default_language_version:
22
python: python3.12
33
repos:
44
- repo: https://github.com/pre-commit/pre-commit-hooks
5-
rev: v5.0.0
5+
rev: v6.0.0
66
hooks:
77
- id: trailing-whitespace
88
- id: end-of-file-fixer
@@ -15,7 +15,7 @@ repos:
1515
- id: no-commit-to-branch
1616
args: ["--branch=main"]
1717
- repo: https://github.com/astral-sh/ruff-pre-commit
18-
rev: v0.9.6
18+
rev: v0.16.1
1919
hooks:
2020
- id: ruff
2121
args: ["--fix"]

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ license = "BSD-3-Clause"
99
urls.Source = "https://github.com/scikit-learn-contrib/sklearn-ann"
1010
urls.Documentation = "https://sklearn-ann.readthedocs.io/"
1111
dynamic = ["version", "readme"]
12-
requires-python = "<3.13,>=3.9" # enforced by scipy
12+
requires-python = ">=3.9"
1313
dependencies = [
1414
"scikit-learn>=1.6.0",
1515
"scipy>=1.11.1,<2.0.0",

0 commit comments

Comments
 (0)