From f810c5a8b8c926d99ce7d71b85dd5ff80cfd8680 Mon Sep 17 00:00:00 2001 From: Snoopy Crime Cop Date: Sat, 16 Oct 2021 23:42:57 +0000 Subject: [PATCH] merge master -Dnone -Ihotfix -Ssuccess-only Repository: ome/omero-python-superbuild Already up-to-date. Repository: ome/omero-dropbox Excluded PRs: - PR 16 joshmoore 'Review all instances of whitelist/blacklist' (user: joshmoore) Already up-to-date. Repository: ome/omero-marshal Excluded PRs: - PR 69 will-moore 'Roi encoder allows Shape None' (user: will-moore) - PR 34 chris-allan 'Initial support for Event' (user: chris-allan) - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (user: chris-allan) - PR 29 chris-allan 'Initial support for FileAnnotation and OriginalFile' (user: chris-allan) Already up-to-date. Repository: ome/omero-py Excluded PRs: - PR 305 chris-allan 'Ensure we are using pyopenssl (See ome/omero-py#240)' (user: chris-allan) - PR 304 jburel 'Trigger pr' (user: jburel) - PR 303 joshmoore 'import --fetch-jars: allow direct link' (user: joshmoore) - PR 299 joshmoore 'Add parents and children to omero obj' (user: joshmoore) - PR 290 glyg 'Assert connection decorator, see #289' (user: glyg) - PR 287 sbesson 'Add logic to search OMERO.tables on non Pythonic named columns' (user: sbesson) - PR 266 joshmoore 'errors: use raise_error from cli plugins' (user: joshmoore) - PR 207 manics 'BlitzGateway.connect raise on error' (user: manics) - PR 199 joshmoore 'user: allow setting default group' (user: joshmoore) - PR 194 manics 'Support Python 3 asyncio concurrency' (user: manics) - PR 184 manics 'Auto-format code with black' (user: manics) - PR 160 manics 'prefs.py: config throw if OMERODIR not set' (user: manics) - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (user: dominikl) - PR 115 manics 'Remove omero_ext.argparse' (user: manics) Already up-to-date. Repository: ome/omero-scripts Excluded PRs: - PR 187 jburel 'Rtd' (user: jburel) - PR 173 will-moore 'ROI export with Well ID' (user: will-moore) - PR 103 joshmoore 'Script for calculating min/max' (user: joshmoore) Already up-to-date. Repository: ome/omero-web Excluded PRs: - PR 323 will-moore 'Filtering handles ampersands in image names' (user: will-moore) - PR 313 emilroz 'Add option to hide "Forgot Password"' (user: emilroz) - PR 308 kkoz 'Obj id bitmask endpoint' (user: kkoz) - PR 226 manics 'WIP: Prettier autoformat (js, css, md)' (user: manics) - PR 225 will-moore 'Query string ids' (user: will-moore) - PR 224 manics 'WIP: Rewrite Dockerfile' (user: manics) - PR 200 bramalingam 'WIP:Django upgrade to 2.2' (user: bramalingam) - PR 196 manics 'OMERO.web default log can be changed, e.g. to stdout' (user: manics) - PR 168 stick 'Changes to nginx @maintenance handler' (user: stick) - PR 142 manics 'omero.web.secure defaults to true' (user: manics) - PR 64 manics 'Remove omero_ext.argparse' (user: manics) - PR 63 manics 'Web templating with Jinja 2' (user: manics) Already up-to-date. Generated by OMERO-python-superbuild-push#723 (https://latest-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/723/) --- .gitmodules | 10 +++++----- omero-dropbox | 2 +- omero-marshal | 2 +- omero-py | 2 +- omero-scripts | 2 +- omero-web | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index 45f4c3d5..1b5ff831 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,15 @@ [submodule "omero-py"] path = omero-py - url = git://github.com/ome/omero-py + url = git://github.com/snoopycrimecop/omero-py [submodule "omero-web"] path = omero-web - url = git://github.com/ome/omero-web + url = git://github.com/snoopycrimecop/omero-web [submodule "omero-marshal"] path = omero-marshal - url = git://github.com/ome/omero-marshal + url = git://github.com/snoopycrimecop/omero-marshal [submodule "omero-dropbox"] path = omero-dropbox - url = git://github.com/ome/omero-dropbox + url = git://github.com/snoopycrimecop/omero-dropbox [submodule "omero-scripts"] path = omero-scripts - url = git://github.com/ome/omero-scripts + url = git://github.com/snoopycrimecop/omero-scripts diff --git a/omero-dropbox b/omero-dropbox index 530e3440..39ee605e 160000 --- a/omero-dropbox +++ b/omero-dropbox @@ -1 +1 @@ -Subproject commit 530e3440ea7cb40982977c055b2653645b39b1d3 +Subproject commit 39ee605e263feceb179b28107b42745fb0258039 diff --git a/omero-marshal b/omero-marshal index 5f690f93..09bac39f 160000 --- a/omero-marshal +++ b/omero-marshal @@ -1 +1 @@ -Subproject commit 5f690f9379c6655a0719df28555d6511fbb59541 +Subproject commit 09bac39f303c9f875d544fc2606dad1b2fad76bc diff --git a/omero-py b/omero-py index 4fa5ccb9..79d23867 160000 --- a/omero-py +++ b/omero-py @@ -1 +1 @@ -Subproject commit 4fa5ccb938b0d9b2294fec46e3d0d6eaddd78129 +Subproject commit 79d23867a42c01d469333913410dcac358d763d8 diff --git a/omero-scripts b/omero-scripts index b8fd012e..a23054e0 160000 --- a/omero-scripts +++ b/omero-scripts @@ -1 +1 @@ -Subproject commit b8fd012e33ebb7e85b9d78bdae92219d89197aab +Subproject commit a23054e02f6023fefbe59f4cff2a9f62cb05983e diff --git a/omero-web b/omero-web index 4ec8bae5..5f256624 160000 --- a/omero-web +++ b/omero-web @@ -1 +1 @@ -Subproject commit 4ec8bae52f8023eb23449d2b973a07d93070c9e5 +Subproject commit 5f256624824bbb3250f3535260dfa18e9e994770