Skip to content

Commit

Permalink
Merge remote-tracking branch 'gh/zarr_v3' into zarr_v3
Browse files Browse the repository at this point in the history
  • Loading branch information
will-moore committed Jan 14, 2025
2 parents 0a8d0b4 + e021c13 commit c953723
Show file tree
Hide file tree
Showing 8 changed files with 74 additions and 87 deletions.
20 changes: 0 additions & 20 deletions .bumpversion.cfg

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/publish_pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.9'
python-version: '3.11'
- name: Build a binary wheel and a source tarball
run: |
python -mpip install build
Expand Down
2 changes: 1 addition & 1 deletion .isort.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[settings]
known_third_party = dask,numcodecs,numpy,pytest,scipy,setuptools,skimage,zarr
known_third_party = dask,numcodecs,numpy,pytest,scipy,skimage,zarr
multi_line_output = 3
include_trailing_comma = True
force_grid_wrap = 0
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
# Unreleased
# 0.10.2 (November 2024)

- Drop support for Python 3.8.
- Document parameters and return value of `parse_url`.
* Write metadata using delayed that depends on writing array(s)
* Document return values of sample data
* Simplify Python tutorial
* pin zarr at < 3
* Update version of pyupgrade

# 0.9.0 (May 2024)

Expand Down
8 changes: 1 addition & 7 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ome-zarr-py

Tools for multi-resolution images stored in Zarr filesets, according to the `OME NGFF spec`_.

See `Documentation <https://ome-zarr.readthedocs.io/>`_ for usage information.
See `Readthedocs <https://ome-zarr.readthedocs.io/>`_ for usage information.

Documentation
-------------
Expand Down Expand Up @@ -56,13 +56,7 @@ Distributed under the terms of the `BSD`_ license,
"ome-zarr-py" is free and open source software

.. _`OME NGFF spec`: https://github.com/ome/ngff
.. _`@napari`: https://github.com/napari
.. _`BSD`: https://opensource.org/licenses/BSD-2-Clause
.. _`Apache Software License 2.0`: http://www.apache.org/licenses/LICENSE-2.0
.. _`Mozilla Public License 2.0`: https://www.mozilla.org/media/MPL/2.0/index.txt
.. _`napari`: https://github.com/napari/napari
.. _`napari-ome-zarr`: https://github.com/ome/napari-ome-zarr
.. _`ome-zarr`: https://pypi.org/project/ome-zarr/

.. |pypi| image:: https://badge.fury.io/py/ome-zarr.svg
:alt: PyPI project
Expand Down
64 changes: 64 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
[build-system]
requires = [
"setuptools>=64",
"setuptools-scm>=8.0",
]
build-backend = "setuptools.build_meta"

[tools.setuptools.dynamic]
version = {attr = "ome_zarr.__version__"}

[project]
name = "ome-zarr"
readme = "README.rst"
dynamic = ["version"]
description="Implementation of images in Zarr files."

requires-python = ">3.10"

dependencies = [
"numpy",
"dask",
"distributed",
"zarr==v3.0.0-beta.3",
"fsspec[s3]>=0.8,!=2021.07.0",
# See https://github.com/fsspec/filesystem_spec/issues/819
"aiohttp<4",
"requests",
"scikit-image",
"toolz",
]
classifiers = [
"Development Status :: 4 - Beta",
"Intended Audience :: Developers",
"Intended Audience :: Science/Research",
"Topic :: Software Development :: Libraries :: Python Modules",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Operating System :: OS Independent",
"License :: OSI Approved :: BSD License",
]

authors = [
{name = "The Open Microscopy Team"},
]

[project.entry-points."console_scripts"]
ome_zarr = "ome_zarr.cli:main"

[project.optional-dependencies]
tests = [
"pytest",
]

[project.urls]
Documentation = "https://ome-zarr.readthedocs.io"
Repository = "https://github.com/ome/ome-zarr-py"
Changelog = "https://github.com/ome/ome-zarr-py/blob/master/CHANGELOG.md"

[tool.setuptools]
packages = ["ome_zarr"]
py-modules = ["ome_zarr"]

[tool.setuptools_scm]
version_file = "ome_zarr/_version.py"
54 changes: 0 additions & 54 deletions setup.py

This file was deleted.

4 changes: 1 addition & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
[tox]
envlist = py{39,310,311,312}
envlist = py{311,312}


[gh-actions]
python =
3.9: py39
3.10: py310
3.11: py311
3.12: py312

Expand Down

0 comments on commit c953723

Please sign in to comment.