Skip to content

Commit de121e6

Browse files
authored
Merge branch 'main' into chore/use-prek
2 parents bd99ea9 + 68359bc commit de121e6

File tree

7 files changed

+16
-9
lines changed

7 files changed

+16
-9
lines changed

.github/workflows/check_changelogs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
12+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
1313

1414
- name: Install uv
1515
uses: astral-sh/setup-uv@61cb8a9741eeb8a550a1b8544337180c0fc8476b # v7.2.0

.github/workflows/codspeed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
name: Run benchmarks
1818
runs-on: codspeed-macro
1919
steps:
20-
- uses: actions/checkout@v5
20+
- uses: actions/checkout@v6
2121
with:
2222
fetch-depth: 0 # grab all branches and tags
2323
- name: Set up Python

changes/3656.misc.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Removed *rich* and *mypy* from the `[test]` dependencies, and added a new `[dev]` dependency group that can be used to install all the development dependencies.

docs/contributing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ Zarr strives to maintain 100% test coverage under the latest Python stable relea
167167
hatch env run --env test.py3.12-2.2-optional run-coverage
168168
```
169169

170-
will automatically run the test suite with coverage and produce a XML coverage report. This should be 100% before code can be accepted into the main code base.
170+
will automatically run the test suite with coverage and produce an XML coverage report. This should be 100% before code can be accepted into the main code base.
171171

172172
You can also generate an HTML coverage report by running:
173173

@@ -297,4 +297,4 @@ performance benchmarks as part of our test suite. The benchmarks can be are foun
297297
By default pytest is configured to run these benchmarks as plain tests (i.e., no benchmarking). To run
298298
a benchmark with timing measurements, use the `--benchmark-enable` when invoking `pytest`.
299299

300-
The benchmarks are run as part of the continuous integration suite through [codspeed](https://codspeed.io/zarr-developers/zarr-python).
300+
The benchmarks are run as part of the continuous integration suite through [codspeed](https://codspeed.io/zarr-developers/zarr-python).

docs/user-guide/storage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ print(group)
138138
```
139139

140140
The type of filesystem (e.g. S3, https, etc..) is inferred from the scheme of the url (e.g. s3 for "**s3**://noaa-nwm-retro-v2-zarr-pds").
141-
In case a specific filesystem is needed, one can explicitly create it. For example to create a S3 filesystem:
141+
In case a specific filesystem is needed, one can explicitly create it. For example to create an S3 filesystem:
142142

143143
```python exec="true" session="storage" source="above" result="ansi"
144144
# Note: requires s3fs to be installed

pyproject.toml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,13 @@ gpu = [
7070
"cupy-cuda12x",
7171
]
7272
cli = ["typer"]
73-
# Development extras
73+
# Testing extras
7474
test = [
7575
"coverage>=7.10",
7676
"pytest",
7777
"pytest-asyncio",
7878
"pytest-cov",
7979
"pytest-accept",
80-
"rich",
81-
"mypy",
8280
'numpydoc',
8381
"hypothesis",
8482
"pytest-xdist",
@@ -116,6 +114,14 @@ docs = [
116114
'astroid<4',
117115
'pytest'
118116
]
117+
# All development extras
118+
dev = [
119+
"zarr[optional]",
120+
"zarr[test]",
121+
"zarr[remote_tests]",
122+
"zarr[docs]",
123+
"mypy",
124+
]
119125

120126
[project.scripts]
121127
zarr = "zarr._cli.cli:app"

src/zarr/core/dtype/wrapper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ def to_json(self, zarr_format: ZarrFormat) -> DTypeSpec_V2 | DTypeSpec_V3:
191191
@abstractmethod
192192
def _check_scalar(self, data: object) -> bool:
193193
"""
194-
Check that an python object is a valid scalar value for the wrapped data type.
194+
Check that a python object is a valid scalar value for the wrapped data type.
195195
196196
Parameters
197197
----------

0 commit comments

Comments
 (0)