Skip to content

Commit

Permalink
Merge pull request #4 from joshmoore/update-release
Browse files Browse the repository at this point in the history
Update release
  • Loading branch information
joshmoore authored Dec 6, 2023
2 parents bd91fc1 + 7cb176d commit 2d2e822
Show file tree
Hide file tree
Showing 9 changed files with 717 additions and 39 deletions.
20 changes: 0 additions & 20 deletions .bumpversion.cfg

This file was deleted.

1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src/omero_rdf/_version.py export-subst
2 changes: 1 addition & 1 deletion .isort.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[settings]
known_third_party = entrypoints,omero,omero_marshal,omero_rdf,rdflib,setuptools,wikidataintegrator
known_third_party = entrypoints,omero,omero_marshal,omero_rdf,rdflib,setuptools,versioneer,wikidataintegrator
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ repos:
args: ["--profile", "black"]

- repo: https://github.com/psf/black
rev: 21.11b1
rev: 22.12.0
hooks:
- id: black
args: [--target-version=py36]
args: [--target-version=py38]

- repo: https://github.com/asottile/pyupgrade
rev: v2.29.1
Expand Down
17 changes: 3 additions & 14 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,9 @@ Install the command-line tool using `pip <https://pip.pypa.io/en/stable/>`_:
Release process
---------------

This repository uses `bump2version <https://pypi.org/project/bump2version/>`_
to manage version numbers. To tag a release run::

$ bumpversion release

This will remove the ``.dev0`` suffix from the current version, commit, and tag the release.

To switch back to a development version run::

$ bumpversion --no-tag [major|minor|patch]

specifying ``major``, ``minor`` or ``patch`` depending on whether the
development branch will be a `major, minor or patch release
<https://semver.org/>`_. This will also add the ``.dev0`` suffix.
This repository uses `versioneer <https://pypi.org/project/versioneer/>`_
to manage version numbers. A tag prefixed with `v` will be detected by
the library and used as the current version at runtime.

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

Expand Down
12 changes: 12 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,15 @@ disallow_untyped_defs = false

[mypy-test_rdf]
disallow_untyped_defs = false

# See the docstring in versioneer.py for instructions. Note that you must
# re-run 'versioneer.py setup' after changing this section, and commit the
# resulting files.

[versioneer]
VCS = git
style = pep440
versionfile_source = src/omero_rdf/_version.py
versionfile_build =
tag_prefix = v
parentdir_prefix = src/omero_rdf/
14 changes: 12 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#
import os

import versioneer
from setuptools import setup


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


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

setup(
version=version,
cmdclass=versioneer.get_cmdclass(),
packages=["omero_rdf", "omero.plugins"],
package_dir={"": "src"},
name="omero-rdf",
Expand All @@ -57,7 +59,15 @@ def read(fname):
url="%s" % url,
zip_safe=False,
download_url=f"{url}/v{version}.tar.gz",
install_requires=["omero-py>=5.8", "entrypoints", "future", "rdflib"],
install_requires=[
"omero-py>=5.8",
"entrypoints",
"future",
"rdflib",
"versioneer",
"omero-marshal",
"wikidataintegrator",
],
python_requires=">=3",
keywords=["OMERO.CLI", "plugin"],
tests_require=["pytest", "restview", "mox3"],
Expand Down
3 changes: 3 additions & 0 deletions src/omero_rdf/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -344,3 +344,6 @@ def _lookup(
if not obj:
self.ctx.die(110, f"No such {_type}: {oid}")
return obj

from . import _version
__version__ = _version.get_versions()['version']
Loading

0 comments on commit 2d2e822

Please sign in to comment.