Skip to content

Commit 124640a

Browse files
jhammanjhamman
authored
Revert "V3 main sync w/ merge (#2335)" (#2339)
This reverts commit ce5f53e.
1 parent ce5f53e commit 124640a

15 files changed

+851
-549
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ body:
2727
attributes:
2828
label: Python Version
2929
description: Version of Python interpreter
30-
placeholder: 3.10, 3.11, 3.12 etc.
30+
placeholder: 3.8.5, 3.9, 3.10, etc.
3131
validations:
3232
required: true
3333
- type: input

‎.github/workflows/releases.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
submodules: true
1717
fetch-depth: 0
1818

19-
- uses: actions/setup-python@v5.2.0
19+
- uses: actions/setup-python@v5
2020
name: Install Python
2121
with:
2222
python-version: '3.11'

‎LICENSE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

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

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@
7070
</td>
7171
</tr>
7272
<tr>
73-
<td>Zulip</td>
73+
<td>Gitter</td>
7474
<td>
75-
<a href="https://ossci.zulipchat.com/">
76-
<img src="https://img.shields.io/badge/zulip-join_chat-brightgreen.svg" />
75+
<a href="https://gitter.im/zarr-developers/community">
76+
<img src="https://badges.gitter.im/zarr-developers/community.svg" />
7777
</a>
7878
</td>
7979
</tr>

‎TEAM.md

-29
This file was deleted.

‎docs/conf.py

+10-6
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919

2020
import sphinx.application
2121

22-
from importlib.metadata import version as get_version
23-
22+
# The version info for the project you're documenting, acts as replacement for
23+
# |version| and |release|, also used in various other places throughout the
24+
# built documents.
25+
#
26+
# The short X.Y version.
2427
import zarr
2528
import sphinx
2629

@@ -76,11 +79,12 @@
7679

7780
# General information about the project.
7881
project = "zarr"
79-
copyright = "2024, Zarr Developers"
82+
copyright = "2023, Zarr Developers"
8083
author = "Zarr Developers"
8184

82-
version = get_version("zarr")
83-
release = get_version("zarr")
85+
version = zarr.__version__
86+
# The full version, including alpha/beta/rc tags.
87+
release = zarr.__version__
8488

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

203207
# Custom sidebar templates, maps document names to template names.
204-
html_sidebars = {"tutorial": []}
208+
# html_sidebars = {}
205209

206210
# Additional templates that should be rendered to pages, maps page names to
207211
# template names.

‎docs/index.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ Zarr-Python
1919

2020
**Version**: |version|
2121

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

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

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

‎docs/installation.rst

-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ Zarr depends on NumPy. It is generally best to `install NumPy
66
appropriate for your operating system and Python distribution. Other dependencies should be
77
installed automatically if using one of the installation methods below.
88

9-
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:
10-
11-
- Python: 36 months after initial release
12-
- Core package dependencies (e.g. NumPy): 24 months after initial release
13-
149
Install Zarr from PyPI::
1510

1611
$ pip install zarr

‎docs/release.rst

-33
Original file line numberDiff line numberDiff line change
@@ -303,39 +303,6 @@ Documentation
303303
* doc: update release notes for 3.0.0.alpha.
304304
By :user:`Joe Hamman <jhamman>` :issue:`1959`.
305305

306-
.. _release_2.18.3:
307-
308-
2.18.3
309-
------
310-
311-
Enhancements
312-
~~~~~~~~~~~~
313-
* Added support for creating a copy of data when converting a `zarr.Array`
314-
to a numpy array.
315-
By :user:`David Stansby <dstansby>` (:issue:`2106`) and
316-
:user:`Joe Hamman <jhamman>` (:issue:`2123`).
317-
318-
Maintenance
319-
~~~~~~~~~~~
320-
* Removed support for Python 3.9.
321-
By :user:`David Stansby <dstansby>` (:issue:`2074`).
322-
323-
* Fix a regression when using orthogonal indexing with a scalar.
324-
By :user:`Deepak Cherian <dcherian>` :issue:`1931`
325-
326-
* Added compatibility with NumPy 2.1.
327-
By :user:`David Stansby <dstansby>`
328-
329-
* Bump minimum NumPy version to 1.24.
330-
:user:`Joe Hamman <jhamman>` (:issue:`2127`).
331-
332-
Deprecations
333-
~~~~~~~~~~~~
334-
335-
* Deprecate :class:`zarr.n5.N5Store` and :class:`zarr.n5.N5FSStore`. These
336-
stores are slated to be removed in Zarr Python 3.0.
337-
By :user:`Joe Hamman <jhamman>` :issue:`2085`.
338-
339306
.. _release_2.18.2:
340307

341308
2.18.2

0 commit comments

Comments
 (0)