Skip to content

Commit

Permalink
Merge pull request #2340 from jhamman/v3-main-sync-merge
Browse files Browse the repository at this point in the history
V3 main sync merge
  • Loading branch information
jhamman authored Oct 11, 2024
2 parents 124640a + 437234a commit 3b787a4
Show file tree
Hide file tree
Showing 15 changed files with 549 additions and 851 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ body:
attributes:
label: Python Version
description: Version of Python interpreter
placeholder: 3.8.5, 3.9, 3.10, etc.
placeholder: 3.10, 3.11, 3.12 etc.
validations:
required: true
- type: input
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
submodules: true
fetch-depth: 0

- uses: actions/setup-python@v5
- uses: actions/setup-python@v5.2.0
name: Install Python
with:
python-version: '3.11'
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015-2023 Zarr Developers <https://github.com/zarr-developers>
Copyright (c) 2015-2024 Zarr Developers <https://github.com/zarr-developers>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@
</td>
</tr>
<tr>
<td>Gitter</td>
<td>Zulip</td>
<td>
<a href="https://gitter.im/zarr-developers/community">
<img src="https://badges.gitter.im/zarr-developers/community.svg" />
<a href="https://ossci.zulipchat.com/">
<img src="https://img.shields.io/badge/zulip-join_chat-brightgreen.svg" />
</a>
</td>
</tr>
Expand Down
29 changes: 29 additions & 0 deletions TEAM.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
## Active core-developers
- @joshmoore (Josh Moore)
- @jni (Juan Nunez-Iglesias)
- @rabernat (Ryan Abernathey)
- @jhamman (Joe Hamman)
- @d-v-b (Davis Bennett)
- @jakirkham (jakirkham)
- @martindurant (Martin Durant)
- @normanrz (Norman Rzepka)
- @dstansby (David Stansby)
- @dcherian (Deepak Cherian)
- @TomAugspurger (Tom Augspurger)

## Emeritus core-developers
- @alimanfoo (Alistair Miles)
- @shoyer (Stephan Hoyer)
- @ryan-williams (Ryan Williams)
- @jrbourbeau (James Bourbeau)
- @mzjp2 (Zain Patel)
- @grlee77 (Gregory Lee)

## Former core-developers
- @jeromekelleher (Jerome Kelleher)
- @tjcrone (Tim Crone)
- @funkey (Jan Funke)
- @shikharsg
- @Carreau (Matthias Bussonnier)
- @dazzag24
- @WardF (Ward Fisher)
16 changes: 6 additions & 10 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,8 @@

import sphinx.application

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
from importlib.metadata import version as get_version

import zarr
import sphinx

Expand Down Expand Up @@ -79,12 +76,11 @@

# General information about the project.
project = "zarr"
copyright = "2023, Zarr Developers"
copyright = "2024, Zarr Developers"
author = "Zarr Developers"

version = zarr.__version__
# The full version, including alpha/beta/rc tags.
release = zarr.__version__
version = get_version("zarr")
release = get_version("zarr")

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down Expand Up @@ -205,7 +201,7 @@ def setup(app: sphinx.application.Sphinx) -> None:
# html_use_smartypants = True

# Custom sidebar templates, maps document names to template names.
# html_sidebars = {}
html_sidebars = {"tutorial": []}

# Additional templates that should be rendered to pages, maps page names to
# template names.
Expand Down
4 changes: 2 additions & 2 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ Zarr-Python

**Version**: |version|

**Download documentation**: `PDF/Zipped HTML/EPUB <https://readthedocs.org/projects/zarr/downloads/>`_
**Download documentation**: `PDF/Zipped HTML <https://readthedocs.org/projects/zarr/downloads/>`_

**Useful links**:
`Installation <installation.html>`_ |
`Source Repository <https://github.com/zarr-developers/zarr-python>`_ |
`Issue Tracker <https://github.com/zarr-developers/zarr-python/issues>`_ |
`Gitter <https://gitter.im/zarr-developers/community>`_
`Zulip Chat <https://ossci.zulipchat.com/>`_

Zarr is a file storage format for chunked, compressed, N-dimensional arrays based on an open-source specification.

Expand Down
5 changes: 5 additions & 0 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ Zarr depends on NumPy. It is generally best to `install NumPy
appropriate for your operating system and Python distribution. Other dependencies should be
installed automatically if using one of the installation methods below.

Note: Zarr has endorsed `Scientific-Python SPEC 0 <https://scientific-python.org/specs/spec-0000/>`_ and now follows the version support window as outlined below:

- Python: 36 months after initial release
- Core package dependencies (e.g. NumPy): 24 months after initial release

Install Zarr from PyPI::

$ pip install zarr
Expand Down
33 changes: 33 additions & 0 deletions docs/release.rst
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,39 @@ Documentation
* doc: update release notes for 3.0.0.alpha.
By :user:`Joe Hamman <jhamman>` :issue:`1959`.

.. _release_2.18.3:

2.18.3
------

Enhancements
~~~~~~~~~~~~
* Added support for creating a copy of data when converting a `zarr.Array`
to a numpy array.
By :user:`David Stansby <dstansby>` (:issue:`2106`) and
:user:`Joe Hamman <jhamman>` (:issue:`2123`).

Maintenance
~~~~~~~~~~~
* Removed support for Python 3.9.
By :user:`David Stansby <dstansby>` (:issue:`2074`).

* Fix a regression when using orthogonal indexing with a scalar.
By :user:`Deepak Cherian <dcherian>` :issue:`1931`

* Added compatibility with NumPy 2.1.
By :user:`David Stansby <dstansby>`

* Bump minimum NumPy version to 1.24.
:user:`Joe Hamman <jhamman>` (:issue:`2127`).

Deprecations
~~~~~~~~~~~~

* Deprecate :class:`zarr.n5.N5Store` and :class:`zarr.n5.N5FSStore`. These
stores are slated to be removed in Zarr Python 3.0.
By :user:`Joe Hamman <jhamman>` :issue:`2085`.

.. _release_2.18.2:

2.18.2
Expand Down
Loading

0 comments on commit 3b787a4

Please sign in to comment.