Skip to content

Commit b08917c

Browse files
authored
Merge branch 'main' into tom/fix/cm-nested-getitem
2 parents 488d57f + 818746c commit b08917c

File tree

21 files changed

+775
-482
lines changed

21 files changed

+775
-482
lines changed

.github/workflows/gpu_test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
22
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
33

4-
name: GPU Test V3
4+
name: GPU Test
55

66
on:
77
push:
8-
branches: [ v3 ]
8+
branches: [ main ]
99
pull_request:
10-
branches: [ v3 ]
10+
branches: [ main ]
1111
workflow_dispatch:
1212

1313
env:

.github/workflows/hypothesis.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@ on:
33
push:
44
branches:
55
- "main"
6-
- "v3"
76
pull_request:
87
branches:
98
- "main"
10-
- "v3"
119
types: [opened, reopened, synchronize, labeled]
1210
schedule:
1311
- cron: "0 0 * * *" # Daily “At 00:00” UTC

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
22
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
33

4-
name: Test V3
4+
name: Test
55

66
on:
77
push:
8-
branches: [ v3 ]
8+
branches: [ main ]
99
pull_request:
10-
branches: [ v3 ]
10+
branches: [ main ]
1111
workflow_dispatch:
1212

1313
concurrency:

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ci:
22
autoupdate_commit_msg: "chore: update pre-commit hooks"
33
autofix_commit_msg: "style: pre-commit fixes"
44
autofix_prs: false
5-
default_stages: [commit, push]
5+
default_stages: [pre-commit, pre-push]
66
default_language_version:
77
python: python3
88
repos:

docs/_static/custom.css

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
@import url('https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,400;0,700;0,900;1,400;1,700;1,900&family=Open+Sans:ital,wght@0,400;0,600;1,400;1,600&display=swap');
22

3-
.navbar-brand img {
4-
height: 75px;
5-
}
6-
.navbar-brand {
7-
height: 75px;
8-
}
9-
103
body {
114
font-family: 'Open Sans', sans-serif;
125
}

docs/conf.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
from importlib.metadata import version as get_version
2323

24-
import zarr
2524
import sphinx
2625

2726
# If extensions (or modules to document with autodoc) are in another directory,

docs/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Zarr-Python
1616
release
1717
license
1818
contributing
19+
roadmap
1920

2021
**Version**: |version|
2122

0 commit comments

Comments
 (0)