Skip to content

Commit ec76569

Browse files
kgrytekgryte
authored
Merge branch 'main' into astype_device
2 parents caca863 + 39dd9ac commit ec76569

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1023
-380
lines changed

‎.all-contributorsrc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -616,6 +616,16 @@
616616
"contributions": [
617617
"ideas"
618618
]
619+
},
620+
{
621+
"login": "lucascolley",
622+
"name": "Lucas Colley",
623+
"avatar_url": "https://avatars.githubusercontent.com/u/51488791?v=4",
624+
"profile": "https://github.com/lucascolley",
625+
"contributions": [
626+
"maintenance",
627+
"bug"
628+
]
619629
}
620630
],
621631
"contributorsPerLine": 7

‎.git-blame-ignore-revs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# Migrate code style to Black
22
162034b12711dad54589c5dc9e75942695a7957f
3+
678f9eab5a593005e7bb80a46156c27b210cfcea
34

45
# Move special cases to notes sections
56
816fba3b75c38cbb1bb6fe5b1342adc5eab694f3
67
0a2fa71a32b924cc92718db29910a6cbbc5e9341
7-
931144e7d7d5c8b23393aa730ef28962a35b113b
8+
931144e7d7d5c8b23393aa730ef28962a35b113b

‎.github/workflows/ci.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
#/
2+
# @license MIT
3+
#
4+
# Copyright (c) 2022 Python Data APIs Consortium.
5+
#
6+
# Permission is hereby granted, free of charge, to any person obtaining a copy
7+
# of this software and associated documentation files (the "Software"), to deal
8+
# in the Software without restriction, including without limitation the rights
9+
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
# copies of the Software, and to permit persons to whom the Software is
11+
# furnished to do so, subject to the following conditions:
12+
#
13+
# The above copyright notice and this permission notice shall be included in all
14+
# copies or substantial portions of the Software.
15+
#
16+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
# SOFTWARE.
23+
#/
24+
25+
# Workflow name:
26+
name: ci
27+
28+
# Workflow triggers:
29+
on:
30+
pull_request:
31+
push:
32+
branches: [main,]
33+
34+
# Workflow jobs:
35+
jobs:
36+
37+
main:
38+
runs-on: ubuntu-latest
39+
steps:
40+
- uses: actions/checkout@v3
41+
- uses: actions/setup-python@v4
42+
with:
43+
python-version: 3.8
44+
- uses: pre-commit/action@v3.0.0
45+
- uses: pre-commit-ci/lite-action@v1.0.1
46+
if: always()

‎.github/workflows/pages.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ jobs:
4545

4646
# Avoid running this workflow for forks and allow skipping CI:
4747
if: "github.repository == 'data-apis/array-api' && !contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[skip github]')"
48-
48+
4949
# Define a sequence of job steps...
5050
steps:
51-
51+
5252
# Checkout the repository:
5353
- name: 'Checkout repository'
5454
uses: actions/checkout@v2

‎.pre-commit-config.yaml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
repos:
2+
- repo: https://github.com/pre-commit/pre-commit-hooks
3+
rev: v4.4.0
4+
hooks:
5+
- id: check-added-large-files
6+
# Prevent giant files from being committed.
7+
- id: check-ast
8+
# Simply check whether files parse as valid python.
9+
- id: check-case-conflict
10+
# Check for files with names that would conflict on a case-insensitive
11+
# filesystem like MacOS HFS+ or Windows FAT.
12+
- id: check-json
13+
# Attempts to load all json files to verify syntax.
14+
- id: check-merge-conflict
15+
# Check for files that contain merge conflict strings.
16+
- id: check-symlinks
17+
# Checks for symlinks which do not point to anything.
18+
- id: check-toml
19+
# Attempts to load all TOML files to verify syntax.
20+
- id: check-xml
21+
# Attempts to load all xml files to verify syntax.
22+
- id: check-yaml
23+
# Attempts to load all yaml files to verify syntax.
24+
exclude: ".*(.github.*)$"
25+
- id: debug-statements
26+
# Check for debugger imports and py37+ breakpoint() calls in python
27+
# source.
28+
- id: detect-private-key
29+
# Checks for the existence of private keys.
30+
- id: end-of-file-fixer
31+
# Makes sure files end in a newline and only a newline.
32+
- id: trailing-whitespace
33+
# Trims trailing whitespace.
34+
exclude_types: [python]
35+
36+
- repo: https://github.com/pre-commit/pygrep-hooks
37+
rev: v1.10.0
38+
hooks:
39+
- id: python-check-mock-methods
40+
# Prevent common mistakes of assert mck.not_called(), assert
41+
# mck.called_once_with(...) and mck.assert_called.
42+
- id: text-unicode-replacement-char
43+
# Forbid files which have a UTF-8 Unicode replacement character.
44+
- id: python-check-blanket-noqa
45+
# Enforce that all noqa annotations always occur with specific codes.
46+
47+
- repo: https://github.com/psf/black-pre-commit-mirror
48+
rev: 23.7.0
49+
hooks:
50+
- id: black

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,4 +196,4 @@ The following is a list of fixes and points of clarification with regard to the
196196
- `linspace`: conversion of `start` and `stop` should follow type promotion rules ([gh-568](https://github.com/data-apis/array-api/pull/568))
197197
- `nonzero`: clarify that, for arrays having a boolean data type, non-zero elements are those elements which equal `True` ([gh-441](https://github.com/data-apis/array-api/pull/441))
198198
- `trunc`: fix description ([gh-511](https://github.com/data-apis/array-api/pull/511))
199-
- `vecdot`: clarify broadcasting behavior ([gh-417](https://github.com/data-apis/array-api/pull/417) and [gh-473](https://github.com/data-apis/array-api/pull/473))
199+
- `vecdot`: clarify broadcasting behavior ([gh-417](https://github.com/data-apis/array-api/pull/417) and [gh-473](https://github.com/data-apis/array-api/pull/473))

‎CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Please note that the Consortium for Python Data API Standards has a Code of
22
Conduct that we ask everyone to respect, see:
3-
https://github.com/data-apis/.github/blob/master/CODE_OF_CONDUCT.md
3+
https://github.com/data-apis/.github/blob/master/CODE_OF_CONDUCT.md

‎README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Array API standard
22
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
3-
[![All Contributors](https://img.shields.io/badge/all_contributors-63-orange.svg?style=flat-square)](#contributors-)
3+
[![All Contributors](https://img.shields.io/badge/all_contributors-64-orange.svg?style=flat-square)](#contributors-)
44
<!-- ALL-CONTRIBUTORS-BADGE:END -->
55

66
This repository contains documents, tooling and other content related to the
@@ -233,6 +233,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
233233
<td align="center" valign="top" width="14.28%"><a href="https://github.com/fcharras"><img src="https://avatars.githubusercontent.com/u/29153872?v=4?s=100" width="100px;" alt="Franck Charras"/><br /><sub><b>Franck Charras</b></sub></a><br /><a href="#ideas-fcharras" title="Ideas, Planning, & Feedback">🤔</a></td>
234234
<td align="center" valign="top" width="14.28%"><a href="https://github.com/kkraus14"><img src="https://avatars.githubusercontent.com/u/3665167?v=4?s=100" width="100px;" alt="Keith Kraus"/><br /><sub><b>Keith Kraus</b></sub></a><br /><a href="#ideas-kkraus14" title="Ideas, Planning, & Feedback">🤔</a></td>
235235
</tr>
236+
<tr>
237+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/lucascolley"><img src="https://avatars.githubusercontent.com/u/51488791?v=4?s=100" width="100px;" alt="Lucas Colley"/><br /><sub><b>Lucas Colley</b></sub></a><br /><a href="#maintenance-lucascolley" title="Maintenance">🚧</a> <a href="https://github.com/data-apis/array-api/issues?q=author%3Alucascolley" title="Bug reports">🐛</a></td>
238+
</tr>
236239
</tbody>
237240
</table>
238241

@@ -241,4 +244,4 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
241244

242245
<!-- ALL-CONTRIBUTORS-LIST:END -->
243246

244-
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
247+
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

‎pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,6 @@ doc = [
2929
[build-system]
3030
requires = ["setuptools"]
3131
build-backend = "setuptools.build_meta"
32+
33+
[tool.black]
34+
line-length = 88

‎spec/2021.12/benchmark_suite.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Benchmark suite
22

3-
Adding a benchmark suite is planned in the future.
3+
Adding a benchmark suite is planned in the future.

0 commit comments

Comments
 (0)