Skip to content

Commit 2d2e822

Browse files
authored
Merge pull request #4 from joshmoore/update-release
Update release
2 parents bd91fc1 + 7cb176d commit 2d2e822

File tree

9 files changed

+717
-39
lines changed

9 files changed

+717
-39
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_rdf/_version.py export-subst

.isort.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[settings]
2-
known_third_party = entrypoints,omero,omero_marshal,omero_rdf,rdflib,setuptools,wikidataintegrator
2+
known_third_party = entrypoints,omero,omero_marshal,omero_rdf,rdflib,setuptools,versioneer,wikidataintegrator

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ repos:
1313
args: ["--profile", "black"]
1414

1515
- repo: https://github.com/psf/black
16-
rev: 21.11b1
16+
rev: 22.12.0
1717
hooks:
1818
- id: black
19-
args: [--target-version=py36]
19+
args: [--target-version=py38]
2020

2121
- repo: https://github.com/asottile/pyupgrade
2222
rev: v2.29.1

README.rst

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,9 @@ Install the command-line tool using `pip <https://pip.pypa.io/en/stable/>`_:
3131
Release process
3232
---------------
3333

34-
This repository uses `bump2version <https://pypi.org/project/bump2version/>`_
35-
to manage version numbers. To tag a release run::
36-
37-
$ bumpversion release
38-
39-
This will remove the ``.dev0`` suffix from the current version, commit, and tag the release.
40-
41-
To switch back to a development version run::
42-
43-
$ bumpversion --no-tag [major|minor|patch]
44-
45-
specifying ``major``, ``minor`` or ``patch`` depending on whether the
46-
development branch will be a `major, minor or patch release
47-
<https://semver.org/>`_. This will also add the ``.dev0`` suffix.
34+
This repository uses `versioneer <https://pypi.org/project/versioneer/>`_
35+
to manage version numbers. A tag prefixed with `v` will be detected by
36+
the library and used as the current version at runtime.
4837

4938
Remember to ``git push`` all commits and tags.
5039

setup.cfg

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,15 @@ disallow_untyped_defs = false
1313

1414
[mypy-test_rdf]
1515
disallow_untyped_defs = false
16+
17+
# See the docstring in versioneer.py for instructions. Note that you must
18+
# re-run 'versioneer.py setup' after changing this section, and commit the
19+
# resulting files.
20+
21+
[versioneer]
22+
VCS = git
23+
style = pep440
24+
versionfile_source = src/omero_rdf/_version.py
25+
versionfile_build =
26+
tag_prefix = v
27+
parentdir_prefix = src/omero_rdf/

setup.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#
1919
import os
2020

21+
import versioneer
2122
from setuptools import setup
2223

2324

@@ -29,11 +30,12 @@ def read(fname):
2930
return open(os.path.join(os.path.dirname(__file__), fname)).read()
3031

3132

32-
version = "0.1.2"
33+
version = version = versioneer.get_version()
3334
url = "https://github.com/german-bioimaging/omero-rdf"
3435

3536
setup(
3637
version=version,
38+
cmdclass=versioneer.get_cmdclass(),
3739
packages=["omero_rdf", "omero.plugins"],
3840
package_dir={"": "src"},
3941
name="omero-rdf",
@@ -57,7 +59,15 @@ def read(fname):
5759
url="%s" % url,
5860
zip_safe=False,
5961
download_url=f"{url}/v{version}.tar.gz",
60-
install_requires=["omero-py>=5.8", "entrypoints", "future", "rdflib"],
62+
install_requires=[
63+
"omero-py>=5.8",
64+
"entrypoints",
65+
"future",
66+
"rdflib",
67+
"versioneer",
68+
"omero-marshal",
69+
"wikidataintegrator",
70+
],
6171
python_requires=">=3",
6272
keywords=["OMERO.CLI", "plugin"],
6373
tests_require=["pytest", "restview", "mox3"],

src/omero_rdf/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,3 +344,6 @@ def _lookup(
344344
if not obj:
345345
self.ctx.die(110, f"No such {_type}: {oid}")
346346
return obj
347+
348+
from . import _version
349+
__version__ = _version.get_versions()['version']

0 commit comments

Comments
 (0)