From 9e0d8702834e6a9bf48c564458de8d8c774c1c19 Mon Sep 17 00:00:00 2001 From: jmoore Date: Fri, 10 Jan 2020 17:55:26 +0100 Subject: [PATCH] Bump to 5.6.0 --- CHANGELOG.md | 34 ++++++++++++++++++---------------- README.rst | 2 +- omeroweb/version.py | 4 ++-- setup.py | 6 +++--- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 907db29adb..93f9f43e38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,24 +1,26 @@ # 5.6.0 (January 2020) -- Use BytesIO for default Thumbnail (#104) -- omero-web requires OMERODIR (#100) -- Ignore OMERO_HOME in settings.py (#98) -- Better exception handling of custom settings (#94) -- Add support for extra NGINX server configuration (#90) -- Fix ROI maks and thumbnails (#92) -- Fix script result failures (#87) -- Fix download of multiple images in a zip (#76) -- Fix race condition while closing tables (#25) -- Fix `omero_ext.path` import (#77) -- Add `omero.web.nginx_server_extra_config` property (#80) -- Use cached config.xml in `omero.webgateway.getClientSettings` (#83) -- Fix dialogs for thumbnail figure and split-view figure scripts (#73) -- Loosen version checks to support 5.5 with 5.6 (#32) +- Remove support for Python 2 ([#103](https://github.com/ome/omero-py/pull/103)) +- Remove requirement files ([#107](https://github.com/ome/omero-py/pull/107)) +- Use BytesIO for default Thumbnail ([#104](https://github.com/ome/omero-py/pull/104)) +- omero-web requires OMERODIR ([#100](https://github.com/ome/omero-py/pull/100)) +- Ignore OMERO_HOME in settings.py ([#98](https://github.com/ome/omero-py/pull/98)) +- Better exception handling of custom settings ([#94](https://github.com/ome/omero-py/pull/94)) +- Add support for extra NGINX server configuration ([#90](https://github.com/ome/omero-py/pull/90)) +- Fix ROI maks and thumbnails ([#92](https://github.com/ome/omero-py/pull/92)) +- Fix script result failures ([#87](https://github.com/ome/omero-py/pull/87)) +- Fix download of multiple images in a zip ([#76](https://github.com/ome/omero-py/pull/76)) +- Fix race condition while closing tables ([#25](https://github.com/ome/omero-py/pull/25)) +- Fix `omero_ext.path` import ([#77](https://github.com/ome/omero-py/pull/77)) +- Add `omero.web.nginx_server_extra_config` property ([#80](https://github.com/ome/omero-py/pull/80)) +- Use cached config.xml in `omero.webgateway.getClientSettings` ([#83](https://github.com/ome/omero-py/pull/83)) +- Fix dialogs for thumbnail figure and split-view figure scripts ([#73](https://github.com/ome/omero-py/pull/73)) +- Loosen version checks to support 5.5 with 5.6 ([#32](https://github.com/ome/omero-py/pull/32)) ## API changes -- OMERO.web now fails to start when `.urls` fails to import (#79) +- OMERO.web now fails to start when `.urls` fails to import ([#79](https://github.com/ome/omero-py/pull/79)) - OMERO.web uses Django 1.11, upgraded from Django 1.8. - omeroweb.http renamed to omeroweb.httprsp to avoid import name clashes with Django http. @@ -35,4 +37,4 @@ - Move templates to omeroweb/ - Bump to omero-py 5.5.1.dev1 - Extract code from ome/openmicroscopy -- Make minimal changes for a functioning `python setup.py` (#1) +- Make minimal changes for a functioning `python setup.py` ([#1](https://github.com/ome/omero-py/pull/1)) diff --git a/README.rst b/README.rst index 6a8c407ca9..1268d98efb 100644 --- a/README.rst +++ b/README.rst @@ -74,7 +74,7 @@ OMERO.web is released under the AGPL. Copyright --------- -2009-2019, The Open Microscopy Environment, Glencoe Software, Inc. +2009-2020, The Open Microscopy Environment, Glencoe Software, Inc. .. _OMERO: https://www.openmicroscopy.org/omero .. _OMERO.py: https://pypi.python.org/pypi/omero-py diff --git a/omeroweb/version.py b/omeroweb/version.py index 1854941b9a..09c8c33aa9 100644 --- a/omeroweb/version.py +++ b/omeroweb/version.py @@ -7,5 +7,5 @@ omero_buildyear = "unknown" -omeroweb_version = "5.6.dev8" -omeroweb_buildyear = "2019" +omeroweb_version = "5.6.0" +omeroweb_buildyear = "2020" diff --git a/setup.py b/setup.py index a20ed723c8..820e3aff8d 100755 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- """ - Copyright 2008-2019 The Open Microscopy Environment, Glencoe Software, Inc. + Copyright 2008-2020 The Open Microscopy Environment, Glencoe Software, Inc. All rights reserved. Use is subject to license terms supplied in LICENSE.txt @@ -51,12 +51,12 @@ def read(fname): python_requires='>=3', install_requires=[ # requires Ice (use wheel for faster installs) - 'omero-py>=5.6.dev10', + 'omero-py', # minimum requirements for `omero web start` 'Django>=1.11,<2.0', 'django-pipeline==1.6.14', 'gunicorn>=19.3', - 'omero-marshal>=0.7.dev1', + 'omero-marshal>=0.7.0', 'Pillow', ], include_package_data=True,