Merge branch 'main' into tom/fix/cm-nested-getitem

TomAugspurger · Oct 15, 2024 · b08917c · b08917c
2 parents 488d57f + 818746c
commit b08917c
Show file tree

Hide file tree

Showing 21 changed files with 775 additions and 482 deletions.
diff --git a/.github/workflows/gpu_test.yml b/.github/workflows/gpu_test.yml
@@ -1,13 +1,13 @@
 # This workflow will install Python dependencies, run tests and lint with a variety of Python versions
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-name: GPU Test V3
+name: GPU Test
 
 on:
   push:
-    branches: [ v3 ]
+    branches: [ main ]
   pull_request:
-    branches: [ v3 ]
+    branches: [ main ]
   workflow_dispatch:
 
 env:

diff --git a/.github/workflows/hypothesis.yaml b/.github/workflows/hypothesis.yaml
@@ -3,11 +3,9 @@ on:
   push:
     branches:
       - "main"
-      - "v3"
   pull_request:
     branches:
       - "main"
-      - "v3"
     types: [opened, reopened, synchronize, labeled]
   schedule:
     - cron: "0 0 * * *" # Daily “At 00:00” UTC

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,13 +1,13 @@
 # This workflow will install Python dependencies, run tests and lint with a variety of Python versions
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-name: Test V3
+name: Test
 
 on:
   push:
-    branches: [ v3 ]
+    branches: [ main ]
   pull_request:
-    branches: [ v3 ]
+    branches: [ main ]
   workflow_dispatch:
 
 concurrency:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@ ci:
   autoupdate_commit_msg: "chore: update pre-commit hooks"
   autofix_commit_msg: "style: pre-commit fixes"
   autofix_prs: false
-default_stages: [commit, push]
+default_stages: [pre-commit, pre-push]
 default_language_version:
   python: python3
 repos:

diff --git a/docs/_static/custom.css b/docs/_static/custom.css
@@ -1,12 +1,5 @@
 @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');
 
-.navbar-brand img {
-   height: 75px;
-}
-.navbar-brand {
-   height: 75px;
-}
-
 body {
   font-family: 'Open Sans', sans-serif;
 }

diff --git a/docs/conf.py b/docs/conf.py
@@ -21,7 +21,6 @@
 
 from importlib.metadata import version as get_version
 
-import zarr
 import sphinx
 
 # If extensions (or modules to document with autodoc) are in another directory,

diff --git a/docs/index.rst b/docs/index.rst
@@ -16,6 +16,7 @@ Zarr-Python
     release
     license
     contributing
+    roadmap
 
 **Version**: |version|