Skip to content

Commit 282ac31

Browse files
committed
Merge remote-tracking branch 'josh/versioneer' into name_option
2 parents ecf5a3e + b243a8d commit 282ac31

File tree

11 files changed

+3078
-31
lines changed

11 files changed

+3078
-31
lines changed

.bumpversion.cfg

Lines changed: 0 additions & 20 deletions
This file was deleted.

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
src/omero_zarr/_version.py export-subst

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ venv/
55
build/
66
dist/
77
__pycache__
8-
src/omero_zarr/_version.py

.pre-commit-config.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ repos:
2929
rev: v4.5.0
3030
hooks:
3131
- id: trailing-whitespace
32-
exclude: .bumpversion.cfg
3332
- id: end-of-file-fixer
3433
- id: check-json
3534
files: \.(json)$
@@ -48,6 +47,7 @@ repos:
4847
rev: 6.1.0
4948
hooks:
5049
- id: flake8
50+
exclude: versioneer.py
5151
additional_dependencies: [
5252
flake8-blind-except,
5353
flake8-builtins,
@@ -66,18 +66,19 @@ repos:
6666
rev: v1.6.1
6767
hooks:
6868
- id: mypy
69+
exclude: "(setup.py|versioneer.py|tests/)"
6970
# This is for checking tests/* (everything else has a stricter check
7071
# below), but since there's no include it's run on everything
7172

7273
- repo: https://github.com/pre-commit/mirrors-mypy
7374
rev: v1.6.1
7475
hooks:
7576
- id: mypy
77+
exclude: "(setup.py|versioneer.py)"
7678
args: [
77-
--disallow-untyped-defs,
78-
--ignore-missing-imports,
79+
"--disallow-untyped-defs",
80+
"--ignore-missing-imports"
7981
]
80-
exclude: tests/
8182

8283
- repo: https://github.com/adrienverge/yamllint.git
8384
rev: v1.32.0

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11

2+
# 0.5.4 (November 2023)
3+
4+
- Fix path/to/image when exporting Plate images ([#146](https://github.com/ome/omero-cli-zarr/pull/146))
5+
6+
27
# 0.5.3 (May 2023)
38

49
- Fix dimension separator in downsampled data ([#144](https://github.com/ome/omero-cli-zarr/pull/144))

setup.cfg

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[versioneer]
2+
VCS = git
3+
style = pep440
4+
versionfile_source = src/omero_zarr/_version.py
5+
versionfile_build =
6+
tag_prefix = v
7+
parentdir_prefix = src/omero_zarr/

setup.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020

2121
from setuptools import setup
2222

23+
import versioneer
24+
2325

2426
def get_long_description() -> str:
2527
here = os.path.abspath(os.path.dirname(__file__))
@@ -29,10 +31,12 @@ def get_long_description() -> str:
2931

3032

3133
long_description = get_long_description()
34+
version = versioneer.get_version()
3235

3336
setup(
3437
name="omero-cli-zarr",
35-
version="0.5.4.dev0",
38+
version=version,
39+
cmdclass=versioneer.get_cmdclass(),
3640
packages=["omero_zarr", "omero.plugins"],
3741
package_dir={"": "src"},
3842
description="Plugin for exporting images in zarr format.",
@@ -55,6 +59,4 @@ def get_long_description() -> str:
5559
long_description=long_description,
5660
keywords=["OMERO.CLI", "plugin"],
5761
url="https://github.com/ome/omero-cli-zarr/",
58-
setup_requires=["setuptools_scm"],
59-
use_scm_version={"write_to": "src/omero_zarr/_version.py"},
6062
)

src/omero_zarr/__init__.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,13 @@
1818

1919
from ome_zarr.format import CurrentFormat
2020

21-
from ._version import version as __version__
21+
from . import _version
2222

2323
ngff_version = CurrentFormat().version
2424

2525
__all__ = [
2626
"__version__",
2727
]
28+
29+
30+
__version__ = _version.get_versions()["version"]

0 commit comments

Comments
 (0)