diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 2624ee46..529951de 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 6.1.1.dev0 +current_version = 6.2.1.dev0 commit = True tag = True sign_tags = True diff --git a/.mailmap b/.mailmap new file mode 100644 index 00000000..f0adeef4 --- /dev/null +++ b/.mailmap @@ -0,0 +1,13 @@ +Aleksandra Tarkowska +Aleksandra Tarkowska Ola Tarkowska +Andreas Knab +David Pinto Carnë Draug +Helen Flynn +Jean-Marie Burel jean-marie burel +Josh Moore +Josh Moore +Julian Hniopek <53080416+JulianHn@users.noreply.github.com> +Sébastien Besson +Tom Boissonnet Tom-TBT +Will Moore William Moore +Will Moore diff --git a/.omeroci/app-deps b/.omeroci/app-deps index e0564a19..ac8bdb8a 100755 --- a/.omeroci/app-deps +++ b/.omeroci/app-deps @@ -2,6 +2,6 @@ set -e set -u -curl -fsSL https://rpm.nodesource.com/setup_16.x | sudo bash - -sudo yum install -y nodejs +curl -fsSL https://rpm.nodesource.com/setup_20.x | sudo bash - +sudo dnf install -y nodejs npm install -g grunt diff --git a/CHANGELOG.md b/CHANGELOG.md index 636a5ebd..4030fb05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,13 @@ +6.2.0 (February 2024) +--------------------- + +- Labels from Key-Value pairs and Tags on parent objects (Thanks to Tom Boissonnet) ([#525](https://github.com/ome/omero-figure/pull/525)) +- Fix enable Save after updating Image IDs (Thanks to Rémy Dornier) ([#544](https://github.com/ome/omero-figure/pull/544)) +- Fix cropping of horizontal page layout ([#541](https://github.com/ome/omero-figure/pull/541)) +- Integration tests call pytest directly ([#542](https://github.com/ome/omero-figure/pull/542)) + + 6.1.0 (January 2024) -------------------- diff --git a/omero_figure/utils.py b/omero_figure/utils.py index 0e69ab78..af2ca6ec 100644 --- a/omero_figure/utils.py +++ b/omero_figure/utils.py @@ -19,7 +19,7 @@ import json import os -__version__ = "6.1.1.dev0" +__version__ = "6.2.1.dev0" def read_file(fname, content_type=None): diff --git a/setup.py b/setup.py index a95ad387..07c20665 100644 --- a/setup.py +++ b/setup.py @@ -21,13 +21,11 @@ # Version: 1.0 import os -import sys from setuptools.command.build_py import build_py from setuptools.command.install import install from setuptools.command.sdist import sdist from setuptools.command.develop import develop from setuptools import setup, find_packages -from setuptools.command.test import test as test_command import omero_figure.utils as utils VERSION = utils.__version__ @@ -38,73 +36,6 @@ HOMEPAGE = "https://github.com/ome/omero-figure" -class PyTest(test_command): - user_options = [ - ('test-path=', 't', "base dir for test collection"), - ('test-ice-config=', 'i', - "use specified 'ice config' file instead of default"), - ('test-pythonpath=', 'p', "prepend 'pythonpath' to PYTHONPATH"), - ('test-marker=', 'm', "only run tests including 'marker'"), - ('test-no-capture', 's', "don't suppress test output"), - ('test-failfast', 'x', "Exit on first error"), - ('test-verbose', 'v', "more verbose output"), - ('test-string=', 'k', "filter tests by string"), - ('test-quiet', 'q', "less verbose output"), - ('junitxml=', None, "create junit-xml style report file at 'path'"), - ('pdb', None, "fallback to pdb on error"), - ] - - def initialize_options(self): - test_command.initialize_options(self) - self.test_pythonpath = None - self.test_string = None - self.test_marker = None - self.test_path = 'test' - self.test_failfast = False - self.test_quiet = False - self.test_verbose = False - self.test_no_capture = False - self.junitxml = None - self.pdb = False - self.test_ice_config = None - - def finalize_options(self): - test_command.finalize_options(self) - self.test_args = [self.test_path] - if self.test_string is not None: - self.test_args.extend(['-k', self.test_string]) - if self.test_marker is not None: - self.test_args.extend(['-m', self.test_marker]) - if self.test_failfast: - self.test_args.extend(['-x']) - if self.test_verbose: - self.test_args.extend(['-v']) - if self.test_quiet: - self.test_args.extend(['-q']) - if self.junitxml is not None: - self.test_args.extend(['--junitxml', self.junitxml]) - if self.pdb: - self.test_args.extend(['--pdb']) - self.test_suite = True - if 'ICE_CONFIG' not in os.environ: - os.environ['ICE_CONFIG'] = self.test_ice_config - - def run_tests(self): - if self.test_pythonpath is not None: - sys.path.insert(0, self.test_pythonpath) - - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "omeroweb.settings") - - # import here, cause outside the eggs aren't loaded - import pytest - errno = pytest.main(self.test_args) - sys.exit(errno) - - import django - if django.VERSION > (1, 7): - django.setup() - - def require_npm(command, strict=False): """ Decorator to run NPM prerequisites @@ -158,7 +89,6 @@ def run(self): 'install': require_npm(install), 'sdist': require_npm(sdist, True), 'develop': require_npm(develop), - 'test': PyTest }, tests_require=['pytest', 'numpy'], )