Skip to content

Commit 4492a6f

Browse files
committed
Merge branch 'main' into add_union1d
2 parents 1c5da0c + a9dadb9 commit 4492a6f

File tree

16 files changed

+4767
-4592
lines changed

16 files changed

+4767
-4592
lines changed

.all-contributorsrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,8 @@
283283
"profile": "https://github.com/Enderdead",
284284
"contributions": [
285285
"code",
286-
"test"
286+
"test",
287+
"bug"
287288
]
288289
},
289290
{

.github/workflows/cd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
if: github.event_name == 'release' && github.event.action == 'published'
3535

3636
steps:
37-
- uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
37+
- uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
3838
with:
3939
name: Packages
4040
path: dist

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ jobs:
2828
with:
2929
fetch-depth: 0
3030

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

@@ -57,9 +57,9 @@ jobs:
5757
with:
5858
fetch-depth: 0
5959

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

.github/workflows/docs-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ jobs:
1111
steps:
1212
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1313

14-
- uses: prefix-dev/setup-pixi@194d461b21b6c5717c722ffc597fa91ed2ff29fa # v0.9.1
14+
- uses: prefix-dev/setup-pixi@28eb668aafebd9dede9d97c4ba1cd9989a4d0004 # v0.9.2
1515
with:
16-
pixi-version: v0.50.2
16+
pixi-version: v0.58.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@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
24+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
2525
with:
2626
name: docs-build
2727
path: docs/build/

CONTRIBUTORS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ This project exists thanks to the following contributors
4040
<td align="center" valign="top" width="14.28%"><a href="https://github.com/pearu"><img src="https://avatars.githubusercontent.com/u/402156?v=4?s=100" width="100px;" alt="Pearu Peterson"/><br /><sub><b>Pearu Peterson</b></sub></a><br /><a href="https://github.com/data-apis/array-api-extra/pulls?q=is%3Apr+reviewed-by%3Apearu" title="Reviewed Pull Requests">👀</a></td>
4141
<td align="center" valign="top" width="14.28%"><a href="https://paddyroddy.github.io/"><img src="https://avatars.githubusercontent.com/u/15052188?v=4?s=100" width="100px;" alt="Patrick J. Roddy"/><br /><sub><b>Patrick J. Roddy</b></sub></a><br /><a href="https://github.com/data-apis/array-api-extra/commits?author=paddyroddy" title="Code">💻</a> <a href="https://github.com/data-apis/array-api-extra/commits?author=paddyroddy" title="Documentation">📖</a> <a href="#example-paddyroddy" title="Examples">💡</a> <a href="https://github.com/data-apis/array-api-extra/commits?author=paddyroddy" title="Tests">⚠️</a></td>
4242
<td align="center" valign="top" width="14.28%"><a href="https://amacati.github.io/"><img src="https://avatars.githubusercontent.com/u/57562633?v=4?s=100" width="100px;" alt="Martin Schuck"/><br /><sub><b>Martin Schuck</b></sub></a><br /><a href="#ideas-amacati" title="Ideas, Planning, & Feedback">🤔</a></td>
43-
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Enderdead"><img src="https://avatars.githubusercontent.com/u/22777836?v=4?s=100" width="100px;" alt="Gauthier-Clerc François"/><br /><sub><b>Gauthier-Clerc François</b></sub></a><br /><a href="https://github.com/data-apis/array-api-extra/commits?author=Enderdead" title="Code">💻</a> <a href="https://github.com/data-apis/array-api-extra/commits?author=Enderdead" title="Tests">⚠️</a></td>
43+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Enderdead"><img src="https://avatars.githubusercontent.com/u/22777836?v=4?s=100" width="100px;" alt="Gauthier-Clerc François"/><br /><sub><b>Gauthier-Clerc François</b></sub></a><br /><a href="https://github.com/data-apis/array-api-extra/commits?author=Enderdead" title="Code">💻</a> <a href="https://github.com/data-apis/array-api-extra/commits?author=Enderdead" title="Tests">⚠️</a> <a href="https://github.com/data-apis/array-api-extra/issues?q=author%3AEnderdead" title="Bug reports">🐛</a></td>
4444
<td align="center" valign="top" width="14.28%"><a href="https://github.com/adriagarp"><img src="https://avatars.githubusercontent.com/u/96059447?v=4?s=100" width="100px;" alt="Adrián García Pitarch"/><br /><sub><b>Adrián García Pitarch</b></sub></a><br /><a href="https://github.com/data-apis/array-api-extra/commits?author=adriagarp" title="Code">💻</a> <a href="https://github.com/data-apis/array-api-extra/commits?author=adriagarp" title="Tests">⚠️</a></td>
4545
<td align="center" valign="top" width="14.28%"><a href="https://github.com/cakedev0"><img src="https://avatars.githubusercontent.com/u/25986961?v=4?s=100" width="100px;" alt="Arthur Lacote"/><br /><sub><b>Arthur Lacote</b></sub></a><br /><a href="https://github.com/data-apis/array-api-extra/commits?author=cakedev0" title="Code">💻</a> <a href="https://github.com/data-apis/array-api-extra/commits?author=cakedev0" title="Documentation">📖</a> <a href="#ideas-cakedev0" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/data-apis/array-api-extra/commits?author=cakedev0" title="Tests">⚠️</a></td>
4646
</tr>

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ This project exists thanks to the following contributors
9595
<td align="center" valign="top" width="14.28%"><a href="https://github.com/pearu"><img src="https://avatars.githubusercontent.com/u/402156?v=4?s=100" width="100px;" alt="Pearu Peterson"/><br /><sub><b>Pearu Peterson</b></sub></a><br /><a href="https://github.com/data-apis/array-api-extra/pulls?q=is%3Apr+reviewed-by%3Apearu" title="Reviewed Pull Requests">👀</a></td>
9696
<td align="center" valign="top" width="14.28%"><a href="https://paddyroddy.github.io/"><img src="https://avatars.githubusercontent.com/u/15052188?v=4?s=100" width="100px;" alt="Patrick J. Roddy"/><br /><sub><b>Patrick J. Roddy</b></sub></a><br /><a href="https://github.com/data-apis/array-api-extra/commits?author=paddyroddy" title="Code">💻</a> <a href="https://github.com/data-apis/array-api-extra/commits?author=paddyroddy" title="Documentation">📖</a> <a href="#example-paddyroddy" title="Examples">💡</a> <a href="https://github.com/data-apis/array-api-extra/commits?author=paddyroddy" title="Tests">⚠️</a></td>
9797
<td align="center" valign="top" width="14.28%"><a href="https://amacati.github.io/"><img src="https://avatars.githubusercontent.com/u/57562633?v=4?s=100" width="100px;" alt="Martin Schuck"/><br /><sub><b>Martin Schuck</b></sub></a><br /><a href="#ideas-amacati" title="Ideas, Planning, & Feedback">🤔</a></td>
98-
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Enderdead"><img src="https://avatars.githubusercontent.com/u/22777836?v=4?s=100" width="100px;" alt="Gauthier-Clerc François"/><br /><sub><b>Gauthier-Clerc François</b></sub></a><br /><a href="https://github.com/data-apis/array-api-extra/commits?author=Enderdead" title="Code">💻</a> <a href="https://github.com/data-apis/array-api-extra/commits?author=Enderdead" title="Tests">⚠️</a></td>
98+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Enderdead"><img src="https://avatars.githubusercontent.com/u/22777836?v=4?s=100" width="100px;" alt="Gauthier-Clerc François"/><br /><sub><b>Gauthier-Clerc François</b></sub></a><br /><a href="https://github.com/data-apis/array-api-extra/commits?author=Enderdead" title="Code">💻</a> <a href="https://github.com/data-apis/array-api-extra/commits?author=Enderdead" title="Tests">⚠️</a> <a href="https://github.com/data-apis/array-api-extra/issues?q=author%3AEnderdead" title="Bug reports">🐛</a></td>
9999
<td align="center" valign="top" width="14.28%"><a href="https://github.com/adriagarp"><img src="https://avatars.githubusercontent.com/u/96059447?v=4?s=100" width="100px;" alt="Adrián García Pitarch"/><br /><sub><b>Adrián García Pitarch</b></sub></a><br /><a href="https://github.com/data-apis/array-api-extra/commits?author=adriagarp" title="Code">💻</a> <a href="https://github.com/data-apis/array-api-extra/commits?author=adriagarp" title="Tests">⚠️</a></td>
100100
<td align="center" valign="top" width="14.28%"><a href="https://github.com/cakedev0"><img src="https://avatars.githubusercontent.com/u/25986961?v=4?s=100" width="100px;" alt="Arthur Lacote"/><br /><sub><b>Arthur Lacote</b></sub></a><br /><a href="https://github.com/data-apis/array-api-extra/commits?author=cakedev0" title="Code">💻</a> <a href="https://github.com/data-apis/array-api-extra/commits?author=cakedev0" title="Documentation">📖</a> <a href="#ideas-cakedev0" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/data-apis/array-api-extra/commits?author=cakedev0" title="Tests">⚠️</a></td>
101101
</tr>

docs/api-reference.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
:toctree: generated
88
99
apply_where
10+
argpartition
1011
at
1112
atleast_nd
1213
broadcast_shapes
@@ -15,11 +16,13 @@
1516
default_dtype
1617
expand_dims
1718
isclose
19+
isin
1820
kron
1921
nan_to_num
2022
nunique
2123
one_hot
2224
pad
25+
partition
2326
setdiff1d
2427
sinc
2528
```

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"array-api": ("https://data-apis.org/array-api/draft", None),
5959
"dask": ("https://docs.dask.org/en/stable", None),
6060
"numpy": ("https://numpy.org/doc/stable", None),
61-
"jax": ("https://jax.readthedocs.io/en/latest", None),
61+
"jax": ("https://docs.jax.dev/en/latest", None),
6262
}
6363

6464
nitpick_ignore = [

lefthook.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
lefthook: pixi run --no-progress --environment=lint lefthook
1+
lefthook: pixi run --no-progress --environment=lint --frozen lefthook
22

33
templates:
4-
run: run --quiet --no-progress --environment=lint
4+
run: run --quiet --no-progress --environment=lint --frozen
55

66
colors: true
77

0 commit comments

Comments
 (0)