Skip to content

Commit a90a0e3

Browse files
committed
Merge branch 'main' into searchsorted
2 parents 3870f10 + 763ea1a commit a90a0e3

19 files changed

Lines changed: 6421 additions & 5769 deletions

File tree

.gitattributes

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,15 @@
1+
# Excluding files from an sdist generated by meson-python
2+
#########################################################
3+
4+
# Note: when adding to this list, be aware that you need to commit your changes
5+
# before they take effect (can be confusing during testing)
6+
7+
.github/* export-ignore
8+
.git* export-ignore
9+
codecov.yml export-ignore
10+
pixi.lock export-ignore
11+
RELEASING.md export-ignore
12+
renovate.json export-ignore
13+
114
# GitHub syntax highlighting
215
pixi.lock linguist-language=YAML linguist-generated=true

.github/workflows/cd.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
dist:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
20+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2121
with:
2222
fetch-depth: 0
2323

@@ -34,13 +34,13 @@ jobs:
3434
if: github.event_name == 'release' && github.event.action == 'published'
3535

3636
steps:
37-
- uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
37+
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
3838
with:
3939
name: Packages
4040
path: dist
4141

4242
- name: Generate artifact attestation for sdist and wheel
43-
uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3.0.0
43+
uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f # v3.2.0
4444
with:
4545
subject-path: "dist/*"
4646

.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ jobs:
2424
name: Lint
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
27+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2828
with:
2929
fetch-depth: 0
3030

31-
- uses: prefix-dev/setup-pixi@28eb668aafebd9dede9d97c4ba1cd9989a4d0004 # v0.9.2
31+
- uses: prefix-dev/setup-pixi@a0af7a228712d6121d37aba47adf55c1332c9c2e # v0.9.4
3232
with:
33-
pixi-version: v0.58.0
33+
pixi-version: v0.62.2
3434
cache: true
3535
environments: lint
3636

@@ -44,22 +44,22 @@ jobs:
4444
fail-fast: false
4545
matrix:
4646
environment:
47-
- tests-py310
48-
- tests-py313
47+
- tests-py311
48+
- tests-py314
4949
- tests-numpy1
5050
- tests-backends
51-
- tests-backends-py310
51+
- tests-backends-py311
5252
- tests-nogil
5353
runs-on: [ubuntu-latest]
5454

5555
steps:
56-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
56+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5757
with:
5858
fetch-depth: 0
5959

60-
- uses: prefix-dev/setup-pixi@28eb668aafebd9dede9d97c4ba1cd9989a4d0004 # v0.9.2
60+
- uses: prefix-dev/setup-pixi@a0af7a228712d6121d37aba47adf55c1332c9c2e # v0.9.4
6161
with:
62-
pixi-version: v0.58.0
62+
pixi-version: v0.62.2
6363
cache: true
6464
environments: ${{ matrix.environment }}
6565

@@ -74,6 +74,6 @@ jobs:
7474

7575
- name: Upload coverage report
7676
if: ${{ matrix.environment != 'tests-nogil' }}
77-
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
77+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
7878
with:
7979
token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/docs-build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ jobs:
99
docs-build:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
12+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1313

14-
- uses: prefix-dev/setup-pixi@28eb668aafebd9dede9d97c4ba1cd9989a4d0004 # v0.9.2
14+
- uses: prefix-dev/setup-pixi@a0af7a228712d6121d37aba47adf55c1332c9c2e # v0.9.4
1515
with:
16-
pixi-version: v0.58.0
16+
pixi-version: v0.62.0
1717
cache: true
1818
environments: docs
1919

2020
- name: Build Docs
2121
run: pixi run -e docs docs
2222

2323
- name: Upload Artifact
24-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
24+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
2525
with:
2626
name: docs-build
2727
path: docs/build/

.github/workflows/docs-deploy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
environment:
1818
name: docs-deploy
1919
steps:
20-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
20+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2121

2222
- name: Download Artifact
23-
uses: dawidd6/action-download-artifact@ac66b43f0e6a346234dd65d4d0c8fbb31cb316e5 # v11
23+
uses: dawidd6/action-download-artifact@5c98f0b039f36ef966fdb7dfa9779262785ecb05 # v14
2424
with:
2525
workflow: docs-build.yml
2626
name: docs-build
@@ -30,7 +30,7 @@ jobs:
3030
# See
3131
# https://github.com/JamesIves/github-pages-deploy-action/tree/dev#using-an-ssh-deploy-key-
3232
- name: Deploy
33-
uses: JamesIves/github-pages-deploy-action@6c2d9db40f9296374acc17b90404b6e8864128c8 # v4.7.3
33+
uses: JamesIves/github-pages-deploy-action@d92aa235d04922e8f08b40ce78cc5442fcfbfa2f # v4.8.0
3434
with:
3535
folder: docs/build/
3636
ssh-key: ${{ secrets.DEPLOY_KEY }}

RELEASING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
1. Update the version in `src/array_api_extra/__init__.py`
1+
1. Update the version in `pyproject.toml`, `meson.build`, and `src/array_api_extra/__init__.py`
22
2. Update the lockfile with `pixi update; pixi install`
33
3. Push your changes
44
4. Cut a release via the GitHub GUI
5-
5. Update the version to `{next micro version}.dev0`
5+
5. Update the version to `{next micro version}.dev0` in `pyproject.toml`, `meson.build`, and `src/array_api_extra/__init__.py`
66
6. `pixi clean cache --pypi; pixi update; pixi install`
77
7. Push your changes
88
8. Merge the automated PR to conda-forge/array-api-extra-feedstock

meson.build

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
project(
2+
'array-api-extra',
3+
version: '0.10.0.dev0'
4+
)
5+
6+
py = import('python').find_installation()
7+
8+
# NOTE: downstream projects may rely on this variable name when vendoring,
9+
# do not change it without consulting with downstream projects
10+
sources = {
11+
'array_api_extra': files(
12+
'src/array_api_extra/__init__.py',
13+
'src/array_api_extra/_delegation.py',
14+
'src/array_api_extra/testing.py',
15+
),
16+
'array_api_extra/_lib': files(
17+
'src/array_api_extra/_lib/__init__.py',
18+
'src/array_api_extra/_lib/_at.py',
19+
'src/array_api_extra/_lib/_backends.py',
20+
'src/array_api_extra/_lib/_funcs.py',
21+
'src/array_api_extra/_lib/_lazy.py',
22+
'src/array_api_extra/_lib/_testing.py',
23+
),
24+
'array_api_extra/_lib/_utils': files(
25+
'src/array_api_extra/_lib/_utils/__init__.py',
26+
'src/array_api_extra/_lib/_utils/_compat.py',
27+
'src/array_api_extra/_lib/_utils/_compat.pyi',
28+
'src/array_api_extra/_lib/_utils/_helpers.py',
29+
'src/array_api_extra/_lib/_utils/_typing.py',
30+
'src/array_api_extra/_lib/_utils/_typing.pyi',
31+
),
32+
}
33+
34+
foreach subdir, files : sources
35+
py.install_sources(files, subdir: subdir)
36+
endforeach
37+
38+
subdir('tests')
39+
subdir('vendor_tests')

0 commit comments

Comments
 (0)