From b41b5debf4259efe3856992ce8f627e16e40ba5c Mon Sep 17 00:00:00 2001
From: Snoopy Crime Cop <snoopycrimecop@gmail.com>
Date: Wed, 23 Mar 2022 23:46:32 +0000
Subject: [PATCH] merge master -Dnone -Ihotfix -Ssuccess-only

Repository: ome/omero-py
Excluded PRs:
  - PR 299 joshmoore 'Add parents and children to omero obj' (user: joshmoore)
  - PR 290 glyg 'Assert connection decorator, see #289' (user: glyg)
  - 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.

Generated by OMERO-python-superbuild-push#868 (https://latest-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/868/)