Skip to content

Console Output

Skipping 224 KB.. Full Log
2025-04-21 00:40:32,421 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:40:32,421 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:40:32,423 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-21 00:40:32,462 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-21 00:40:32,469 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fb9b41656d0> has no local changes
2025-04-21 00:40:32,469 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-iviewer
Excluded PRs:
  - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
  - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
  - PR 420 will-moore 'Add release process to README' (exclude comment)
  - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
  - PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.

Merged PRs:
  - PR 460 will-moore 'Channel min spinner fix'
  - PR 465 will-moore 'Save as Figure'
  - PR 471 will-moore 'Z projection disabled tooltip'
  - PR 499 dependabot[bot] 'Bump nanoid and mocha'
  - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'

Conflicting PRs (not included):
  - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'

Generated by OMERO-plugins-push#394 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/)'
2025-04-21 00:40:32,476 [     scc.git] DEBUG [detached HEAD 476081e] merge master -Dorg -Ssuccess-only
2025-04-21 00:40:32,477 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:40:32,477 [    scc.repo] DEBUG ## PRs found:
2025-04-21 00:40:32,633 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:32,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-04-21 00:40:33,156 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:33,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-04-21 00:40:33,621 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:33,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-21 00:40:34,136 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:34,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-21 00:40:34,615 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:34,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-21 00:40:35,150 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:35,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-04-21 00:40:35,322 [    scc.repo] DEBUG   - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-21 00:40:35,573 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:35,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-04-21 00:40:36,051 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:36,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-04-21 00:40:36,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:36,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-21 00:40:37,091 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:37,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-21 00:40:37,550 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:37,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-21 00:40:38,077 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:38,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-04-21 00:40:38,262 [    scc.repo] DEBUG   - PR 74 will-moore 'mapr extension of webclient'
2025-04-21 00:40:38,263 [    scc.repo] DEBUG ## Branches found:
2025-04-21 00:40:38,263 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-21 00:40:38,263 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:40:38,263 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:40:38,266 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-21 00:40:38,268 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-21 00:40:38,268 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-21 00:40:38,271 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-21 00:40:38,274 [     scc.git] DEBUG Already up to date.

2025-04-21 00:40:38,274 [     scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-04-21 00:40:38,567 [     scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-21 00:40:38,567 [     scc.git] DEBUG  * branch            refs/pull/74/head -> FETCH_HEAD
2025-04-21 00:40:38,571 [     scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-04-21 00:40:38,846 [     scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-21 00:40:38,846 [     scc.git] DEBUG  * branch            refs/pull/94/head -> FETCH_HEAD
2025-04-21 00:40:38,851 [     scc.git] DEBUG ## Unique users: []
2025-04-21 00:40:38,851 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:40:38,851 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:40:38,853 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-21 00:40:38,857 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:40:38,859 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-21 00:40:38,868 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-21 00:40:38,872 [     scc.git] DEBUG  .../templates/webclient/base/base_container.html   | 182 +++++++++++++
2025-04-21 00:40:38,872 [     scc.git] DEBUG  .../data/includes/right_plugin.general.js.html     | 290 ---------------------
2025-04-21 00:40:38,872 [     scc.git] DEBUG  requirements.txt                                   |   2 +-
2025-04-21 00:40:38,872 [     scc.git] DEBUG  3 files changed, 183 insertions(+), 291 deletions(-)
2025-04-21 00:40:38,872 [     scc.git] DEBUG  create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-04-21 00:40:38,872 [     scc.git] DEBUG  delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-04-21 00:40:38,873 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:39,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:40:39,042 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-21 00:40:39,047 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:40:39,049 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 94 (Use the release/v1 branch for the PyPA action publishing to PyPI) 1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-21 00:40:39,059 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-21 00:40:39,062 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 2 +-
2025-04-21 00:40:39,062 [     scc.git] DEBUG  1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-21 00:40:39,293 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:39,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:40:39,448 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-21 00:40:39,487 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:40:39,487 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:40:39,489 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-21 00:40:39,526 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-21 00:40:39,530 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fb9b4009b90> has no local changes
2025-04-21 00:40:39,530 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-mapr
Excluded PRs:
  - PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.

Merged PRs:
  - PR 74 will-moore 'mapr extension of webclient'
  - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'

Generated by OMERO-plugins-push#394 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/)'
2025-04-21 00:40:39,537 [     scc.git] DEBUG [detached HEAD dfa8bee] merge master -Dorg -Ssuccess-only
2025-04-21 00:40:39,537 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:40:39,537 [    scc.repo] DEBUG ## PRs found:
2025-04-21 00:40:39,699 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:39,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-04-21 00:40:40,231 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:40,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-04-21 00:40:40,718 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:40,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-04-21 00:40:41,244 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:41,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-21 00:40:41,806 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:42,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-21 00:40:42,280 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:42,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-21 00:40:42,803 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:42,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-04-21 00:40:42,977 [    scc.repo] DEBUG   - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-21 00:40:43,228 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:43,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-04-21 00:40:43,715 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:43,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-04-21 00:40:44,208 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:44,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-21 00:40:44,782 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:45,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-21 00:40:45,275 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:45,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-21 00:40:45,747 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:45,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-04-21 00:40:45,932 [    scc.repo] DEBUG   - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-21 00:40:45,932 [    scc.repo] DEBUG ## Branches found:
2025-04-21 00:40:45,932 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-21 00:40:45,932 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:40:45,932 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:40:45,935 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-21 00:40:45,937 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-21 00:40:45,937 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-21 00:40:45,940 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-21 00:40:45,948 [     scc.git] DEBUG Updating 3cd120c..55060a2

2025-04-21 00:40:46,183 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:46,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-04-21 00:40:46,548 [     scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-04-21 00:40:46,827 [     scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-21 00:40:46,827 [     scc.git] DEBUG  * branch            refs/pull/55/head -> FETCH_HEAD
2025-04-21 00:40:46,831 [     scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-04-21 00:40:47,122 [     scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-21 00:40:47,122 [     scc.git] DEBUG  * branch            refs/pull/64/head -> FETCH_HEAD
2025-04-21 00:40:47,127 [     scc.git] DEBUG ## Unique users: []
2025-04-21 00:40:47,127 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:40:47,127 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:40:47,129 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-21 00:40:47,134 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:40:47,136 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-21 00:40:47,149 [     scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-04-21 00:40:47,149 [     scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-04-21 00:40:47,149 [     scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-21 00:40:47,149 [     scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-21 00:40:47,150 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-21 00:40:47,150 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-21 00:40:47,153 [     scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-21 00:40:47,157 [     scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-21 00:40:47,158 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:47,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:40:47,325 [     scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-21 00:40:47,329 [     scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-21 00:40:47,332 [     scc.git] INFO    - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#394](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - src/omero_metadata/cli.py
    - src/omero_metadata/populate.py

--conflicts

2025-04-21 00:40:47,335 [  scc.config] DEBUG Found github.token
2025-04-21 00:40:47,335 [     scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-04-21 00:40:47,335 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-21 00:40:47,339 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:40:47,341 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-21 00:40:47,356 [     scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-21 00:40:47,356 [     scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-21 00:40:47,356 [     scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-04-21 00:40:47,357 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-21 00:40:47,357 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-21 00:40:47,360 [     scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-21 00:40:47,365 [     scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-21 00:40:47,576 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:47,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:40:47,749 [     scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-21 00:40:47,753 [     scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-21 00:40:47,756 [     scc.git] INFO    - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#394](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/consoleText) for more details.
Possible conflicts:
  - PR #55 kkoz 'Prevent users from creating columns with python keyword names'
    - src/omero_metadata/populate.py
  - Upstream changes
    - src/omero_metadata/populate.py

--conflicts

2025-04-21 00:40:47,758 [  scc.config] DEBUG Found github.token
2025-04-21 00:40:47,758 [     scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-04-21 00:40:47,758 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-21 00:40:47,797 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:40:47,797 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:40:47,799 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-21 00:40:47,837 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-21 00:40:47,841 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fb9b3f30ed0> has no local changes
2025-04-21 00:40:47,841 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
  - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'

Conflicting PRs (not included):
  - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
  - PR 64 will-moore 'Support images_by_name for Screen and Plate'

Generated by OMERO-plugins-push#394 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/)'
2025-04-21 00:40:47,849 [     scc.git] DEBUG [detached HEAD 8df1851] merge master -Dorg -Ssuccess-only
2025-04-21 00:40:47,849 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:40:47,849 [    scc.repo] DEBUG ## PRs found:
2025-04-21 00:40:48,000 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:48,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-04-21 00:40:48,587 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:48,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-04-21 00:40:49,052 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:49,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-21 00:40:49,563 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:49,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-21 00:40:50,082 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:50,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-21 00:40:50,582 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:50,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-21 00:40:51,031 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:51,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-04-21 00:40:51,210 [    scc.repo] DEBUG   - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-21 00:40:51,461 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:51,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-04-21 00:40:51,686 [    scc.repo] DEBUG   # ... Include label: dependencies
2025-04-21 00:40:51,937 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:52,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-21 00:40:52,520 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:52,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-21 00:40:53,047 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:53,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-21 00:40:53,578 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:53,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-21 00:40:54,158 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:54,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-04-21 00:40:54,393 [    scc.repo] DEBUG   - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-21 00:40:54,644 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:54,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-04-21 00:40:54,888 [    scc.repo] DEBUG   # ... Include label: dependencies
2025-04-21 00:40:55,138 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:55,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-21 00:40:55,665 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:55,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-21 00:40:56,203 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:56,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-21 00:40:56,766 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:57,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-21 00:40:57,321 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:57,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-04-21 00:40:57,509 [    scc.repo] DEBUG   - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-21 00:40:57,760 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:57,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-04-21 00:40:58,238 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:58,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-04-21 00:40:58,724 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:58,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-04-21 00:40:59,205 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:59,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-04-21 00:40:59,687 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:40:59,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-04-21 00:41:00,215 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:00,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-04-21 00:41:00,700 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:00,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-04-21 00:41:00,998 [    scc.repo] DEBUG ## Branches found:
2025-04-21 00:41:00,998 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-21 00:41:00,998 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:00,998 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:01,001 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-21 00:41:01,003 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-21 00:41:01,004 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-21 00:41:01,007 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-21 00:41:01,010 [     scc.git] DEBUG Already up to date.

2025-04-21 00:41:01,010 [     scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-04-21 00:41:01,290 [     scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-21 00:41:01,290 [     scc.git] DEBUG  * branch            refs/pull/140/head -> FETCH_HEAD
2025-04-21 00:41:01,294 [     scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-04-21 00:41:01,565 [     scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-21 00:41:01,565 [     scc.git] DEBUG  * branch            refs/pull/141/head -> FETCH_HEAD
2025-04-21 00:41:01,569 [     scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-04-21 00:41:01,824 [     scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-21 00:41:01,824 [     scc.git] DEBUG  * branch            refs/pull/142/head -> FETCH_HEAD
2025-04-21 00:41:01,829 [     scc.git] DEBUG ## Unique users: []
2025-04-21 00:41:01,829 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:01,829 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:01,831 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-21 00:41:01,834 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:01,836 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 140 (Bump vite from 4.2.3 to 4.5.9) 6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-21 00:41:01,844 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-21 00:41:01,847 [     scc.git] DEBUG  package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-04-21 00:41:01,847 [     scc.git] DEBUG  package.json      |   2 +-
2025-04-21 00:41:01,848 [     scc.git] DEBUG  2 files changed, 138 insertions(+), 153 deletions(-)
2025-04-21 00:41:01,849 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:02,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:02,036 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-04-21 00:41:02,039 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:02,041 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 141 (Bump axios from 1.6.0 to 1.8.2) de7db17cd62b498179713df276cff151a1f36d80'
2025-04-21 00:41:02,051 [     scc.git] DEBUG Auto-merging package-lock.json
2025-04-21 00:41:02,051 [     scc.git] DEBUG Auto-merging package.json
2025-04-21 00:41:02,052 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-21 00:41:02,055 [     scc.git] DEBUG  package-lock.json | 18 ++++++++++--------
2025-04-21 00:41:02,055 [     scc.git] DEBUG  package.json      |  2 +-
2025-04-21 00:41:02,055 [     scc.git] DEBUG  2 files changed, 11 insertions(+), 9 deletions(-)
2025-04-21 00:41:02,287 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:02,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:02,461 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-21 00:41:02,464 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:02,466 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 142 (Use the release/v1 branch for the PyPA action publishing to PyPI) 16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-21 00:41:02,475 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-21 00:41:02,478 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 2 +-
2025-04-21 00:41:02,478 [     scc.git] DEBUG  1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-21 00:41:02,712 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:02,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:02,884 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-21 00:41:02,922 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:02,922 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:02,924 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-21 00:41:02,961 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-21 00:41:02,965 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fb9b0d30090> has no local changes
2025-04-21 00:41:02,965 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-parade
Excluded PRs:
  - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
  - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
  - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
  - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.

Merged PRs:
  - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
  - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
  - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'

Generated by OMERO-plugins-push#394 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/)'
2025-04-21 00:41:02,972 [     scc.git] DEBUG [detached HEAD 7d69c45] merge master -Dorg -Ssuccess-only
2025-04-21 00:41:02,972 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:02,972 [    scc.repo] DEBUG ## PRs found:
2025-04-21 00:41:03,135 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:03,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-04-21 00:41:03,312 [    scc.repo] DEBUG ## Branches found:
2025-04-21 00:41:03,312 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-21 00:41:03,312 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:03,312 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:03,314 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-21 00:41:03,317 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-21 00:41:03,317 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-21 00:41:03,319 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-21 00:41:03,322 [     scc.git] DEBUG Already up to date.

2025-04-21 00:41:03,322 [     scc.git] DEBUG ## Unique users: []
2025-04-21 00:41:03,322 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:03,322 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:03,325 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-21 00:41:03,362 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:03,362 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:03,364 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-21 00:41:03,403 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-21 00:41:03,406 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fb9b3f1f950> has no local changes
2025-04-21 00:41:03,407 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-prometheus-tools
Already up to date.


Generated by OMERO-plugins-push#394 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/)'
2025-04-21 00:41:03,413 [     scc.git] DEBUG [detached HEAD 5a0c72e] merge master -Dorg -Ssuccess-only
2025-04-21 00:41:03,413 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:03,413 [    scc.repo] DEBUG ## PRs found:
2025-04-21 00:41:03,563 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:03,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-04-21 00:41:04,106 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:04,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-04-21 00:41:04,597 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:04,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-04-21 00:41:05,075 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:05,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-04-21 00:41:05,324 [    scc.repo] DEBUG ## Branches found:
2025-04-21 00:41:05,325 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-21 00:41:05,325 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:05,325 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:05,328 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-21 00:41:05,330 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-21 00:41:05,330 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-21 00:41:05,333 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-21 00:41:05,336 [     scc.git] DEBUG Already up to date.

2025-04-21 00:41:05,336 [     scc.git] DEBUG ## Unique users: []
2025-04-21 00:41:05,336 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:05,336 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:05,338 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-21 00:41:05,377 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:05,377 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:05,379 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-21 00:41:05,418 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-21 00:41:05,422 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fb9b65d4d90> has no local changes
2025-04-21 00:41:05,422 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-rois
Excluded PRs:
  - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
  - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.


Generated by OMERO-plugins-push#394 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/)'
2025-04-21 00:41:05,428 [     scc.git] DEBUG [detached HEAD 0dcea20] merge master -Dorg -Ssuccess-only
2025-04-21 00:41:05,428 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:05,428 [    scc.repo] DEBUG ## PRs found:
2025-04-21 00:41:05,575 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:05,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-04-21 00:41:06,075 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:06,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-04-21 00:41:06,540 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:06,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-04-21 00:41:07,016 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:07,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-21 00:41:07,555 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:07,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-21 00:41:08,005 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:08,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-21 00:41:08,594 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:08,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-04-21 00:41:08,773 [    scc.repo] DEBUG   - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-21 00:41:08,773 [    scc.repo] DEBUG ## Branches found:
2025-04-21 00:41:08,773 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-21 00:41:08,773 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:08,773 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:08,776 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-21 00:41:08,778 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-21 00:41:08,778 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-21 00:41:08,781 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-21 00:41:08,784 [     scc.git] DEBUG Already up to date.

2025-04-21 00:41:08,784 [     scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-04-21 00:41:09,113 [     scc.git] DEBUG From https://github.com/ome/omero-signup
2025-04-21 00:41:09,113 [     scc.git] DEBUG  * branch            refs/pull/14/head -> FETCH_HEAD
2025-04-21 00:41:09,117 [     scc.git] DEBUG ## Unique users: []
2025-04-21 00:41:09,117 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:09,117 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:09,119 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-21 00:41:09,123 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:09,125 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-21 00:41:09,133 [     scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-04-21 00:41:09,133 [     scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-04-21 00:41:09,134 [     scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-04-21 00:41:09,134 [     scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-04-21 00:41:09,134 [     scc.git] DEBUG Auto-merging omero_signup/views.py
2025-04-21 00:41:09,134 [     scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-04-21 00:41:09,134 [     scc.git] DEBUG Auto-merging setup.py
2025-04-21 00:41:09,134 [     scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-04-21 00:41:09,134 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-21 00:41:09,134 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-21 00:41:09,137 [     scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-21 00:41:09,141 [     scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-04-21 00:41:09,142 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:09,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:09,305 [     scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-21 00:41:09,308 [     scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-21 00:41:09,311 [     scc.git] INFO    - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#394](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - omero_signup/urls.py
    - omero_signup/signup_settings.py
    - omero_signup/views.py
    - setup.py

--conflicts

2025-04-21 00:41:09,314 [  scc.config] DEBUG Found github.token
2025-04-21 00:41:09,314 [     scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-04-21 00:41:09,314 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-21 00:41:09,353 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:09,353 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:09,355 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-21 00:41:09,392 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-21 00:41:09,396 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fb9b648fb10> has no local changes
2025-04-21 00:41:09,396 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-signup
Already up to date.

Conflicting PRs (not included):
  - PR 14 manics 'Add pre-commit (black, flake8)'

Generated by OMERO-plugins-push#394 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/)'
2025-04-21 00:41:09,402 [     scc.git] DEBUG [detached HEAD 11d6eef] merge master -Dorg -Ssuccess-only
2025-04-21 00:41:09,403 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:09,403 [    scc.repo] DEBUG ## PRs found:
2025-04-21 00:41:09,556 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:09,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-04-21 00:41:10,167 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:10,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-04-21 00:41:10,629 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:10,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-04-21 00:41:11,203 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:11,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-21 00:41:11,737 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:11,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-21 00:41:12,205 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:12,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-04-21 00:41:12,693 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:12,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6?per_page=1 HTTP/1.1" 200 2
2025-04-21 00:41:12,890 [    scc.repo] DEBUG   - PR 76 will-moore 'Run cli deps'
2025-04-21 00:41:13,141 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:13,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-04-21 00:41:13,621 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:13,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-04-21 00:41:14,098 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:14,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-04-21 00:41:14,627 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:14,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-21 00:41:15,128 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:15,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-21 00:41:15,593 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:15,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-04-21 00:41:16,096 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:16,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-04-21 00:41:16,567 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:16,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-04-21 00:41:17,046 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:17,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-04-21 00:41:17,538 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:17,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-21 00:41:18,034 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:18,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-21 00:41:18,506 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:18,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-21 00:41:19,057 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:19,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2025-04-21 00:41:19,228 [    scc.repo] DEBUG   - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-21 00:41:19,228 [    scc.repo] DEBUG ## Branches found:
2025-04-21 00:41:19,228 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-21 00:41:19,229 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:19,229 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:19,232 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-21 00:41:19,234 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-21 00:41:19,234 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-21 00:41:19,237 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-21 00:41:19,240 [     scc.git] DEBUG Already up to date.

2025-04-21 00:41:19,240 [     scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-04-21 00:41:19,522 [     scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-21 00:41:19,522 [     scc.git] DEBUG  * branch            refs/pull/12/head -> FETCH_HEAD
2025-04-21 00:41:19,526 [     scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-04-21 00:41:19,802 [     scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-21 00:41:19,802 [     scc.git] DEBUG  * branch            refs/pull/76/head -> FETCH_HEAD
2025-04-21 00:41:19,806 [     scc.git] DEBUG ## Unique users: []
2025-04-21 00:41:19,806 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:19,806 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:19,808 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-04-21 00:41:19,813 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:19,815 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2025-04-21 00:41:19,827 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-21 00:41:19,831 [     scc.git] DEBUG  idr-compose.yml                            |  66 ++++++++++++++
2025-04-21 00:41:19,831 [     scc.git] DEBUG  idr-haproxy.yml                            |  58 +++++++++++++
2025-04-21 00:41:19,831 [     scc.git] DEBUG  idr/40-ansible.sh                          |   7 ++
2025-04-21 00:41:19,831 [     scc.git] DEBUG  idr/70-reset-password.sh                   |   1 +
2025-04-21 00:41:19,831 [     scc.git] DEBUG  idr/nginx/conf.d/default.conf              |   1 +
2025-04-21 00:41:19,831 [     scc.git] DEBUG  idr/nginx/conf.d/example_ssl.conf          |   1 +
2025-04-21 00:41:19,832 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-cache.conf          |  53 +++++++++++
2025-04-21 00:41:19,832 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:19,832 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-cachebuster.conf    | 114 ++++++++++++++++++++++++
2025-04-21 00:41:19,833 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-default.conf        | 135 +++++++++++++++++++++++++++++
2025-04-21 00:41:19,833 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-04-21 00:41:19,833 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-redirect.conf       |  15 ++++
2025-04-21 00:41:19,833 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-upstream.conf       |  13 +++
2025-04-21 00:41:19,833 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-v0.conf             |  26 ++++++
2025-04-21 00:41:19,833 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-v1.conf             |  30 +++++++
2025-04-21 00:41:19,833 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-v2.conf             |  30 +++++++
2025-04-21 00:41:19,833 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-websockets.conf     |   6 ++
2025-04-21 00:41:19,833 [     scc.git] DEBUG  idr/nginx/nginx.conf                       |  53 +++++++++++
2025-04-21 00:41:19,833 [     scc.git] DEBUG  idr/omero/Dockerfile                       |   3 +
2025-04-21 00:41:19,833 [     scc.git] DEBUG  idr/omero/playbook.yml                     |  41 +++++++++
2025-04-21 00:41:19,833 [     scc.git] DEBUG  idr/redirect/Dockerfile                    |   6 ++
2025-04-21 00:41:19,833 [     scc.git] DEBUG  idr/web/Dockerfile                         |   5 ++
2025-04-21 00:41:19,833 [     scc.git] DEBUG  idr/web/playbook.yml                       |  45 ++++++++++
2025-04-21 00:41:19,833 [     scc.git] DEBUG  22 files changed, 824 insertions(+)
2025-04-21 00:41:19,833 [     scc.git] DEBUG  create mode 100644 idr-compose.yml
2025-04-21 00:41:19,833 [     scc.git] DEBUG  create mode 100644 idr-haproxy.yml
2025-04-21 00:41:19,833 [     scc.git] DEBUG  create mode 100755 idr/40-ansible.sh
2025-04-21 00:41:19,833 [     scc.git] DEBUG  create mode 100755 idr/70-reset-password.sh
2025-04-21 00:41:19,833 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/default.conf
2025-04-21 00:41:19,833 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-04-21 00:41:19,833 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-04-21 00:41:19,833 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-04-21 00:41:19,833 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-04-21 00:41:19,833 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-04-21 00:41:19,833 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-04-21 00:41:19,833 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-04-21 00:41:19,833 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-04-21 00:41:19,833 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-04-21 00:41:19,833 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-04-21 00:41:19,833 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-04-21 00:41:19,833 [     scc.git] DEBUG  create mode 100644 idr/nginx/nginx.conf
2025-04-21 00:41:19,833 [     scc.git] DEBUG  create mode 100644 idr/omero/Dockerfile
2025-04-21 00:41:19,833 [     scc.git] DEBUG  create mode 100644 idr/omero/playbook.yml
2025-04-21 00:41:19,834 [     scc.git] DEBUG  create mode 100644 idr/redirect/Dockerfile
2025-04-21 00:41:19,834 [     scc.git] DEBUG  create mode 100644 idr/web/Dockerfile
2025-04-21 00:41:19,834 [     scc.git] DEBUG  create mode 100644 idr/web/playbook.yml
2025-04-21 00:41:20,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:20,008 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-04-21 00:41:20,013 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:20,015 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-04-21 00:41:20,025 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-21 00:41:20,028 [     scc.git] DEBUG  docker | 1 +
2025-04-21 00:41:20,028 [     scc.git] DEBUG  1 file changed, 1 insertion(+)
2025-04-21 00:41:20,259 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:20,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:20,417 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-21 00:41:20,455 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:20,455 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:20,457 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-21 00:41:20,496 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-21 00:41:20,500 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fb9b3e49f10> has no local changes
2025-04-21 00:41:20,500 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: openmicroscopy/omero-test-infra
Excluded PRs:
  - PR 75 marimeireles 'Microservices' (user: marimeireles)
  - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
  - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.

Merged PRs:
  - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
  - PR 76 will-moore 'Run cli deps'

Generated by OMERO-plugins-push#394 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/)'
2025-04-21 00:41:20,506 [     scc.git] DEBUG [detached HEAD 3f6530b] merge master -Dorg -Ssuccess-only
2025-04-21 00:41:20,506 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:20,506 [    scc.repo] DEBUG ## PRs found:
2025-04-21 00:41:20,668 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:20,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-04-21 00:41:20,868 [    scc.repo] DEBUG ## Branches found:
2025-04-21 00:41:20,868 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-21 00:41:20,868 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:20,868 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:20,870 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-21 00:41:20,873 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-21 00:41:20,873 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-21 00:41:20,875 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-21 00:41:20,878 [     scc.git] DEBUG Already up to date.

2025-04-21 00:41:20,878 [     scc.git] DEBUG ## Unique users: []
2025-04-21 00:41:20,878 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:20,878 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:20,881 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-21 00:41:20,918 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:20,918 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:20,920 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-21 00:41:20,956 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-21 00:41:20,959 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fb9b0d5e990> has no local changes
2025-04-21 00:41:20,959 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-upload
Already up to date.


Generated by OMERO-plugins-push#394 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/)'
2025-04-21 00:41:20,965 [     scc.git] DEBUG [detached HEAD 2def92c] merge master -Dorg -Ssuccess-only
2025-04-21 00:41:20,966 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:20,966 [    scc.repo] DEBUG ## PRs found:
2025-04-21 00:41:21,119 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:21,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-04-21 00:41:21,624 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:21,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-04-21 00:41:22,094 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:22,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-04-21 00:41:22,569 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:22,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-21 00:41:23,098 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:23,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-21 00:41:23,591 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:23,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-21 00:41:24,068 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:24,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-21 00:41:24,603 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:24,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-04-21 00:41:24,791 [    scc.repo] DEBUG   - PR 20 jburel 'Build'
2025-04-21 00:41:24,791 [    scc.repo] DEBUG ## Branches found:
2025-04-21 00:41:24,791 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-21 00:41:24,791 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:24,791 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:24,794 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-21 00:41:24,796 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-21 00:41:24,796 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-21 00:41:24,799 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-21 00:41:24,803 [     scc.git] DEBUG Already up to date.

2025-04-21 00:41:24,803 [     scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-04-21 00:41:25,076 [     scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-04-21 00:41:25,076 [     scc.git] DEBUG  * branch            refs/pull/20/head -> FETCH_HEAD
2025-04-21 00:41:25,081 [     scc.git] DEBUG ## Unique users: []
2025-04-21 00:41:25,081 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:25,081 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:25,083 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-04-21 00:41:25,086 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:25,088 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-04-21 00:41:25,096 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-21 00:41:25,099 [     scc.git] DEBUG  .github/workflows/omero_plugin.yml |  2 +-
2025-04-21 00:41:25,099 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-04-21 00:41:25,099 [     scc.git] DEBUG  .omeroci/app-build                 | 19 +++++++++++++++++++
2025-04-21 00:41:25,099 [     scc.git] DEBUG  3 files changed, 27 insertions(+), 6 deletions(-)
2025-04-21 00:41:25,099 [     scc.git] DEBUG  create mode 100755 .omeroci/app-build
2025-04-21 00:41:25,100 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:25,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:25,302 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-21 00:41:25,340 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:25,340 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:25,343 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-21 00:41:25,380 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-21 00:41:25,383 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fb9b3f1fad0> has no local changes
2025-04-21 00:41:25,383 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-virtual-microscope
Already up to date.

Merged PRs:
  - PR 20 jburel 'Build'

Generated by OMERO-plugins-push#394 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/)'
2025-04-21 00:41:25,390 [     scc.git] DEBUG [detached HEAD 8b8e97c] merge master -Dorg -Ssuccess-only
2025-04-21 00:41:25,390 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:25,390 [     scc.git] INFO  Overriding base-branch from master to main
2025-04-21 00:41:25,390 [    scc.repo] DEBUG ## PRs found:
2025-04-21 00:41:25,553 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:25,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-04-21 00:41:26,093 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:26,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-04-21 00:41:26,572 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:26,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-04-21 00:41:27,062 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:27,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-04-21 00:41:27,602 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:27,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-21 00:41:28,088 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:28,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-21 00:41:28,552 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:28,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-04-21 00:41:29,047 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:29,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-04-21 00:41:29,507 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:29,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-04-21 00:41:29,990 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:30,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-21 00:41:30,510 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:30,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-21 00:41:30,968 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:31,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-21 00:41:31,495 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:31,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-04-21 00:41:31,674 [    scc.repo] DEBUG   - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-21 00:41:31,674 [    scc.repo] DEBUG ## Branches found:
2025-04-21 00:41:31,674 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-21 00:41:31,674 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:31,674 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:31,677 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-04-21 00:41:31,680 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-21 00:41:31,680 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-04-21 00:41:31,683 [     scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-04-21 00:41:31,686 [     scc.git] DEBUG Already up to date.

2025-04-21 00:41:31,686 [     scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-04-21 00:41:31,973 [     scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-04-21 00:41:31,973 [     scc.git] DEBUG  * branch            refs/pull/10/head -> FETCH_HEAD
2025-04-21 00:41:31,977 [     scc.git] DEBUG ## Unique users: []
2025-04-21 00:41:31,977 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:31,978 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:31,980 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-21 00:41:31,983 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:31,985 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-21 00:41:31,994 [     scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-04-21 00:41:31,994 [     scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-04-21 00:41:31,994 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-21 00:41:31,994 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-21 00:41:31,997 [     scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-21 00:41:32,001 [     scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-04-21 00:41:32,002 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:32,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:32,167 [     scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-21 00:41:32,170 [     scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-21 00:41:32,173 [     scc.git] INFO    - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#394](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - omero_web_zarr/urls.py

--conflicts

2025-04-21 00:41:32,175 [  scc.config] DEBUG Found github.token
2025-04-21 00:41:32,175 [     scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-04-21 00:41:32,175 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-21 00:41:32,213 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:32,213 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:32,216 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-21 00:41:32,252 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-21 00:41:32,255 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fb9b0d29190> has no local changes
2025-04-21 00:41:32,255 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-web-zarr
Excluded PRs:
  - PR 18 will-moore 'Build' (status: failure)
  - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.

Conflicting PRs (not included):
  - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'

Generated by OMERO-plugins-push#394 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/)'
2025-04-21 00:41:32,261 [     scc.git] DEBUG [detached HEAD a38392f] merge master -Dorg -Ssuccess-only
2025-04-21 00:41:32,262 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:32,262 [    scc.repo] DEBUG ## PRs found:
2025-04-21 00:41:32,418 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:32,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-04-21 00:41:32,598 [    scc.repo] DEBUG ## Branches found:
2025-04-21 00:41:32,598 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-21 00:41:32,598 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:32,598 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:32,600 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-21 00:41:32,603 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-21 00:41:32,603 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-21 00:41:32,606 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-21 00:41:32,609 [     scc.git] DEBUG Already up to date.

2025-04-21 00:41:32,609 [     scc.git] DEBUG ## Unique users: []
2025-04-21 00:41:32,609 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:32,610 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:32,612 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-21 00:41:32,649 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:32,649 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:32,651 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-21 00:41:32,687 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-21 00:41:32,690 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fb9b0da5890> has no local changes
2025-04-21 00:41:32,690 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: openmicroscopy/omero-weberror
Already up to date.


Generated by OMERO-plugins-push#394 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/)'
2025-04-21 00:41:32,696 [     scc.git] DEBUG [detached HEAD cb9bbdf] merge master -Dorg -Ssuccess-only
2025-04-21 00:41:32,696 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:32,696 [    scc.repo] DEBUG ## PRs found:
2025-04-21 00:41:32,849 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:33,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-04-21 00:41:33,043 [    scc.repo] DEBUG ## Branches found:
2025-04-21 00:41:33,043 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-21 00:41:33,043 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:33,043 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:33,046 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-21 00:41:33,048 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-21 00:41:33,048 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-21 00:41:33,051 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-21 00:41:33,054 [     scc.git] DEBUG Already up to date.

2025-04-21 00:41:33,054 [     scc.git] DEBUG ## Unique users: []
2025-04-21 00:41:33,054 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:33,054 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:33,056 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-21 00:41:33,094 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:33,094 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:33,096 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-21 00:41:33,133 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-21 00:41:33,136 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fb9b0d894d0> has no local changes
2025-04-21 00:41:33,136 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: openmicroscopy/omero-webtest
Already up to date.


Generated by OMERO-plugins-push#394 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/)'
2025-04-21 00:41:33,142 [     scc.git] DEBUG [detached HEAD 818943f] merge master -Dorg -Ssuccess-only
2025-04-21 00:41:33,143 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:33,143 [    scc.repo] DEBUG ## PRs found:
2025-04-21 00:41:33,294 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:33,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-04-21 00:41:33,795 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:34,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-04-21 00:41:34,261 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:34,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-04-21 00:41:34,706 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:34,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-21 00:41:35,214 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:35,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-21 00:41:35,722 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:35,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-21 00:41:36,161 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:36,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-04-21 00:41:36,347 [    scc.repo] DEBUG   - PR 100 dominikl 'Run tests properly'
2025-04-21 00:41:36,347 [    scc.repo] DEBUG ## Branches found:
2025-04-21 00:41:36,348 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-21 00:41:36,348 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:36,348 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:36,351 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-21 00:41:36,353 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-21 00:41:36,353 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-21 00:41:36,356 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-21 00:41:36,359 [     scc.git] DEBUG Already up to date.

2025-04-21 00:41:36,359 [     scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-04-21 00:41:36,667 [     scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-04-21 00:41:36,667 [     scc.git] DEBUG  * branch            refs/pull/100/head -> FETCH_HEAD
2025-04-21 00:41:36,670 [     scc.git] DEBUG ## Unique users: []
2025-04-21 00:41:36,670 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:36,670 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:36,673 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-21 00:41:36,676 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:36,678 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-21 00:41:36,687 [     scc.git] DEBUG Auto-merging Dockerfile
2025-04-21 00:41:36,687 [     scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-04-21 00:41:36,687 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-21 00:41:36,687 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-21 00:41:36,690 [     scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-21 00:41:36,695 [     scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-04-21 00:41:36,696 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:36,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:36,859 [     scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-21 00:41:36,862 [     scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-21 00:41:36,864 [     scc.git] INFO    - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#394](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - Dockerfile

--conflicts

2025-04-21 00:41:36,867 [  scc.config] DEBUG Found github.token
2025-04-21 00:41:36,867 [     scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-04-21 00:41:36,867 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-21 00:41:36,904 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:36,905 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:36,907 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-21 00:41:36,943 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-21 00:41:36,947 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fb9b0d1ac90> has no local changes
2025-04-21 00:41:36,947 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/rOMERO-gateway
Already up to date.

Conflicting PRs (not included):
  - PR 100 dominikl 'Run tests properly'

Generated by OMERO-plugins-push#394 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/)'
2025-04-21 00:41:36,954 [     scc.git] DEBUG [detached HEAD 2558707] merge master -Dorg -Ssuccess-only
2025-04-21 00:41:36,954 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:36,954 [     scc.git] INFO  Overriding base-branch from master to develop
2025-04-21 00:41:36,954 [    scc.repo] DEBUG ## PRs found:
2025-04-21 00:41:37,110 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:37,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-04-21 00:41:37,684 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:37,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-04-21 00:41:38,213 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:38,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-04-21 00:41:38,697 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:38,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-21 00:41:39,134 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:39,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-21 00:41:39,618 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:39,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-21 00:41:40,110 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:40,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-21 00:41:40,546 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:40,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-04-21 00:41:40,716 [    scc.repo] DEBUG   - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-21 00:41:40,967 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:41,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-04-21 00:41:41,454 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:41,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-04-21 00:41:41,948 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:42,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-21 00:41:42,391 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:42,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-21 00:41:42,864 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:43,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-21 00:41:43,309 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:43,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-04-21 00:41:43,498 [    scc.repo] DEBUG   - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-21 00:41:43,749 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:43,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-04-21 00:41:44,249 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:44,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-04-21 00:41:44,779 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:44,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-04-21 00:41:45,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:45,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-04-21 00:41:45,494 [    scc.repo] DEBUG ## Branches found:
2025-04-21 00:41:45,494 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-21 00:41:45,495 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:45,495 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:45,497 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-04-21 00:41:45,500 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-21 00:41:45,500 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-04-21 00:41:45,503 [     scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-04-21 00:41:45,511 [     scc.git] DEBUG Updating 4b4c755..950b28b

2025-04-21 00:41:45,745 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:46,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-04-21 00:41:46,119 [     scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-04-21 00:41:46,469 [     scc.git] DEBUG From https://github.com/ome/scripts
2025-04-21 00:41:46,469 [     scc.git] DEBUG  * branch            refs/pull/202/head -> FETCH_HEAD
2025-04-21 00:41:46,474 [     scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-04-21 00:41:46,763 [     scc.git] DEBUG From https://github.com/ome/scripts
2025-04-21 00:41:46,763 [     scc.git] DEBUG  * branch            refs/pull/223/head -> FETCH_HEAD
2025-04-21 00:41:46,767 [     scc.git] DEBUG ## Unique users: []
2025-04-21 00:41:46,767 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:46,767 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:46,770 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-21 00:41:46,775 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:46,778 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-21 00:41:46,788 [     scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19.  Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-04-21 00:41:46,789 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-21 00:41:46,789 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-21 00:41:46,791 [     scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-21 00:41:46,795 [     scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-04-21 00:41:46,797 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:46,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:46,957 [     scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-21 00:41:46,963 [     scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-21 00:41:46,967 [     scc.git] INFO    - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#394](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - omero/annotation_scripts/KeyVal_to_csv.py

--conflicts

2025-04-21 00:41:46,969 [  scc.config] DEBUG Found github.token
2025-04-21 00:41:46,969 [     scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-04-21 00:41:46,969 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-21 00:41:46,974 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:46,976 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-21 00:41:46,985 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-21 00:41:46,988 [     scc.git] DEBUG  omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-04-21 00:41:46,988 [     scc.git] DEBUG  1 file changed, 8 insertions(+), 1 deletion(-)
2025-04-21 00:41:47,208 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:47,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:47,370 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-21 00:41:47,408 [     scc.git] DEBUG Get sha1 of %s
2025-04-21 00:41:47,408 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-21 00:41:47,411 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-21 00:41:47,448 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-21 00:41:47,452 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fb9b0df2810> has no local changes
2025-04-21 00:41:47,452 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/scripts
Excluded PRs:
  - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
  - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..950b28b
Previously merged:
  - PR 225 will-moore 'Fix param names and assertion texts in tests'

Merged PRs:
  - PR 223 will-moore 'don't attempt ROI stats on big images'

Conflicting PRs (not included):
  - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'

Generated by OMERO-plugins-push#394 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/)'
2025-04-21 00:41:47,458 [     scc.git] DEBUG [detached HEAD 223cf12] merge master -Dorg -Ssuccess-only
2025-04-21 00:41:47,458 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:47,458 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-21 00:41:47,533 [  scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-04-21 00:41:47,621 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:47,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:47,789 [  scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-04-21 00:41:47,791 [  scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-04-21 00:41:48,035 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:48,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:48,203 [  scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-04-21 00:41:48,205 [  scc.config] DEBUG Found submodule.omero-cli-render.url
2025-04-21 00:41:48,449 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:48,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:48,694 [  scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-04-21 00:41:48,696 [  scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-04-21 00:41:48,941 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:49,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:49,110 [  scc.config] DEBUG Found submodule.omero-figure.url
2025-04-21 00:41:49,354 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:49,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:49,531 [  scc.config] DEBUG Found submodule.omero-figure.branch
2025-04-21 00:41:49,533 [  scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-04-21 00:41:49,777 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:49,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:49,937 [  scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-04-21 00:41:49,939 [  scc.config] DEBUG Found submodule.omero-gallery.url
2025-04-21 00:41:50,183 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:50,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:50,359 [  scc.config] DEBUG Found submodule.omero-gallery.branch
2025-04-21 00:41:50,361 [  scc.config] DEBUG Found submodule.omero-iviewer.url
2025-04-21 00:41:50,605 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:50,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:50,779 [  scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-04-21 00:41:50,781 [  scc.config] DEBUG Found submodule.omero-mapr.url
2025-04-21 00:41:51,026 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:51,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:51,191 [  scc.config] DEBUG Found submodule.omero-mapr.branch
2025-04-21 00:41:51,193 [  scc.config] DEBUG Found submodule.omero-metadata.url
2025-04-21 00:41:51,437 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:51,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:51,599 [  scc.config] DEBUG Found submodule.omero-metadata.branch
2025-04-21 00:41:51,601 [  scc.config] DEBUG Found submodule.omero-parade.url
2025-04-21 00:41:51,845 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:52,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:52,050 [  scc.config] DEBUG Found submodule.omero-parade.branch
2025-04-21 00:41:52,052 [  scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-04-21 00:41:52,296 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:52,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:52,462 [  scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-04-21 00:41:52,464 [  scc.config] DEBUG Found submodule.omero-rois.url
2025-04-21 00:41:52,708 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:52,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:52,882 [  scc.config] DEBUG Found submodule.omero-signup.url
2025-04-21 00:41:53,126 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:53,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:53,293 [  scc.config] DEBUG Found submodule.omero-test-infra.url
2025-04-21 00:41:53,537 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:53,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:53,708 [  scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-04-21 00:41:53,710 [  scc.config] DEBUG Found submodule.omero-upload.url
2025-04-21 00:41:53,955 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:54,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:54,127 [  scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-04-21 00:41:54,372 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:54,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:54,554 [  scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-04-21 00:41:54,799 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:54,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:54,998 [  scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-04-21 00:41:55,000 [  scc.config] DEBUG Found submodule.omero-weberror.url
2025-04-21 00:41:55,244 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:55,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:55,408 [  scc.config] DEBUG Found submodule.omero-weberror.branch
2025-04-21 00:41:55,410 [  scc.config] DEBUG Found submodule.omero-webtest.url
2025-04-21 00:41:55,655 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:55,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:55,840 [  scc.config] DEBUG Found submodule.omero-webtest.branch
2025-04-21 00:41:55,842 [  scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-04-21 00:41:56,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:56,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:56,283 [  scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-04-21 00:41:56,285 [  scc.config] DEBUG Found submodule.scripts.url
2025-04-21 00:41:56,529 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-21 00:41:56,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-21 00:41:56,704 [  scc.config] DEBUG Found submodule.scripts.branch
2025-04-21 00:41:56,704 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-21 00:41:56,794 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fb9b6583350> has local changes
2025-04-21 00:41:56,794 [     scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-plugins
Already up to date.

Merged PRs:
  - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
  - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
  - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'

Repository: ome/minimal-omero-client
Already up to date.


Repository: ome/omero-cli-duplicate
Excluded PRs:
  - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.


Repository: ome/omero-cli-render
Excluded PRs:
  - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
  - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.

Merged PRs:
  - PR 59 will-moore 'Apply settings to Plate'
  - PR 69 dominikl 'Fix help text for impo/export commands'

Repository: ome/omero-cli-zarr
Excluded PRs:
  - PR 171 will-moore 'Initial addition of integration tests' (status: failure)
  - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
  - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
  - PR 166 will-moore 'Downsample scale option' (stage: draft)
  - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
  - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
Updating 11d3587..7a2c812
Previously merged:
  - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'

Merged PRs:
  - PR 147 will-moore 'Name option'

Conflicting PRs (not included):
  - PR 167 dominikl 'Add extinfo command'

Repository: ome/omero-figure
Excluded PRs:
  - PR 619 will-moore 'OME-Zarr support' (stage: draft)
  - PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..4f0362e2
Previously merged:
  - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'

Merged PRs:
  - PR 600 Rdornier 'Label on rois'
  - PR 605 Tom-TBT 'Colorbar feature'
  - PR 610 will-moore 'Add docs/contributing.rst'
  - PR 612 will-moore 'Script version'
  - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
  - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
  - PR 635 dependabot[bot] 'Bump esbuild and vite'

Conflicting PRs (not included):
  - PR 616 Rdornier 'Fix labels around border'
  - PR 630 will-moore 'Fix color and position for ALL new panel insets'

Repository: ome/omero-fpbioimage
Already up to date.

Merged PRs:
  - PR 18 jburel 'default  size z value'

Repository: ome/omero-gallery
Already up to date.

Merged PRs:
  - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
  - PR 114 dependabot[bot] 'Bump tar and fsevents'
  - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
  - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'

Conflicting PRs (not included):
  - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
  - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
  - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'

Repository: ome/omero-iviewer
Excluded PRs:
  - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
  - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
  - PR 420 will-moore 'Add release process to README' (exclude comment)
  - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
  - PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.

Merged PRs:
  - PR 460 will-moore 'Channel min spinner fix'
  - PR 465 will-moore 'Save as Figure'
  - PR 471 will-moore 'Z projection disabled tooltip'
  - PR 499 dependabot[bot] 'Bump nanoid and mocha'
  - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'

Conflicting PRs (not included):
  - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'

Repository: ome/omero-mapr
Excluded PRs:
  - PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.

Merged PRs:
  - PR 74 will-moore 'mapr extension of webclient'
  - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'

Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
  - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'

Conflicting PRs (not included):
  - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
  - PR 64 will-moore 'Support images_by_name for Screen and Plate'

Repository: ome/omero-parade
Excluded PRs:
  - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
  - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
  - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
  - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.

Merged PRs:
  - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
  - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
  - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'

Repository: ome/omero-prometheus-tools
Already up to date.


Repository: ome/omero-rois
Excluded PRs:
  - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
  - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.


Repository: ome/omero-signup
Already up to date.

Conflicting PRs (not included):
  - PR 14 manics 'Add pre-commit (black, flake8)'

Repository: openmicroscopy/omero-test-infra
Excluded PRs:
  - PR 75 marimeireles 'Microservices' (user: marimeireles)
  - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
  - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.

Merged PRs:
  - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
  - PR 76 will-moore 'Run cli deps'

Repository: ome/omero-upload
Already up to date.


Repository: ome/omero-virtual-microscope
Already up to date.

Merged PRs:
  - PR 20 jburel 'Build'

Repository: ome/omero-web-zarr
Excluded PRs:
  - PR 18 will-moore 'Build' (status: failure)
  - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.

Conflicting PRs (not included):
  - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'

Repository: openmicroscopy/omero-weberror
Already up to date.


Repository: openmicroscopy/omero-webtest
Already up to date.


Repository: ome/rOMERO-gateway
Already up to date.

Conflicting PRs (not included):
  - PR 100 dominikl 'Run tests properly'

Repository: ome/scripts
Excluded PRs:
  - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
  - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..950b28b
Previously merged:
  - PR 225 will-moore 'Fix param names and assertion texts in tests'

Merged PRs:
  - PR 223 will-moore 'don't attempt ROI stats on big images'

Conflicting PRs (not included):
  - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'

Generated by OMERO-plugins-push#394 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/394/)'
2025-04-21 00:41:56,808 [     scc.git] DEBUG [detached HEAD afe1cd9] merge master -Dorg -Ssuccess-only
2025-04-21 00:41:56,808 [     scc.git] DEBUG  23 files changed, 44 insertions(+), 44 deletions(-)
2025-04-21 00:41:56,809 [   scc.merge] INFO  Repository: ome/omero-plugins
2025-04-21 00:41:56,809 [   scc.merge] INFO  Already up to date.
2025-04-21 00:41:56,809 [   scc.merge] INFO  
2025-04-21 00:41:56,809 [   scc.merge] INFO  Merged PRs:
2025-04-21 00:41:56,809 [   scc.merge] INFO    - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-04-21 00:41:56,809 [   scc.merge] INFO    - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-04-21 00:41:56,809 [   scc.merge] INFO    - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-04-21 00:41:56,809 [   scc.merge] INFO  
2025-04-21 00:41:56,809 [   scc.merge] INFO  Repository: ome/minimal-omero-client
2025-04-21 00:41:56,809 [   scc.merge] INFO  Already up to date.
2025-04-21 00:41:56,809 [   scc.merge] INFO  
2025-04-21 00:41:56,809 [   scc.merge] INFO  
2025-04-21 00:41:56,809 [   scc.merge] INFO  Repository: ome/omero-cli-duplicate
2025-04-21 00:41:56,809 [   scc.merge] INFO  Excluded PRs:
2025-04-21 00:41:56,809 [   scc.merge] INFO    - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-04-21 00:41:56,809 [   scc.merge] INFO  Already up to date.
2025-04-21 00:41:56,809 [   scc.merge] INFO  
2025-04-21 00:41:56,809 [   scc.merge] INFO  
2025-04-21 00:41:56,809 [   scc.merge] INFO  Repository: ome/omero-cli-render
2025-04-21 00:41:56,809 [   scc.merge] INFO  Excluded PRs:
2025-04-21 00:41:56,809 [   scc.merge] INFO    - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-04-21 00:41:56,809 [   scc.merge] INFO    - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-04-21 00:41:56,809 [   scc.merge] INFO  Already up to date.
2025-04-21 00:41:56,809 [   scc.merge] INFO  
2025-04-21 00:41:56,809 [   scc.merge] INFO  Merged PRs:
2025-04-21 00:41:56,809 [   scc.merge] INFO    - PR 59 will-moore 'Apply settings to Plate'
2025-04-21 00:41:56,810 [   scc.merge] INFO    - PR 69 dominikl 'Fix help text for impo/export commands'
2025-04-21 00:41:56,810 [   scc.merge] INFO  
2025-04-21 00:41:56,810 [   scc.merge] INFO  Repository: ome/omero-cli-zarr
2025-04-21 00:41:56,810 [   scc.merge] INFO  Excluded PRs:
2025-04-21 00:41:56,810 [   scc.merge] INFO    - PR 171 will-moore 'Initial addition of integration tests' (status: failure)
2025-04-21 00:41:56,810 [   scc.merge] INFO    - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-04-21 00:41:56,810 [   scc.merge] INFO    - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-04-21 00:41:56,810 [   scc.merge] INFO    - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-04-21 00:41:56,810 [   scc.merge] INFO    - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-21 00:41:56,810 [   scc.merge] INFO    - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-04-21 00:41:56,810 [   scc.merge] INFO  Updating 11d3587..7a2c812
2025-04-21 00:41:56,810 [   scc.merge] INFO  Previously merged:
2025-04-21 00:41:56,810 [   scc.merge] INFO    - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-21 00:41:56,810 [   scc.merge] INFO  
2025-04-21 00:41:56,810 [   scc.merge] INFO  Merged PRs:
2025-04-21 00:41:56,810 [   scc.merge] INFO    - PR 147 will-moore 'Name option'
2025-04-21 00:41:56,810 [   scc.merge] INFO  
2025-04-21 00:41:56,810 [   scc.merge] INFO  Conflicting PRs (not included):
2025-04-21 00:41:56,810 [   scc.merge] INFO    - PR 167 dominikl 'Add extinfo command'
2025-04-21 00:41:56,810 [   scc.merge] INFO  
2025-04-21 00:41:56,810 [   scc.merge] INFO  Repository: ome/omero-figure
2025-04-21 00:41:56,810 [   scc.merge] INFO  Excluded PRs:
2025-04-21 00:41:56,810 [   scc.merge] INFO    - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-04-21 00:41:56,810 [   scc.merge] INFO    - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-04-21 00:41:56,810 [   scc.merge] INFO  Updating 9cc36cde..4f0362e2
2025-04-21 00:41:56,810 [   scc.merge] INFO  Previously merged:
2025-04-21 00:41:56,810 [   scc.merge] INFO    - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-21 00:41:56,810 [   scc.merge] INFO  
2025-04-21 00:41:56,810 [   scc.merge] INFO  Merged PRs:
2025-04-21 00:41:56,810 [   scc.merge] INFO    - PR 600 Rdornier 'Label on rois'
2025-04-21 00:41:56,810 [   scc.merge] INFO    - PR 605 Tom-TBT 'Colorbar feature'
2025-04-21 00:41:56,810 [   scc.merge] INFO    - PR 610 will-moore 'Add docs/contributing.rst'
2025-04-21 00:41:56,810 [   scc.merge] INFO    - PR 612 will-moore 'Script version'
2025-04-21 00:41:56,811 [   scc.merge] INFO    - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-04-21 00:41:56,811 [   scc.merge] INFO    - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-04-21 00:41:56,811 [   scc.merge] INFO    - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-04-21 00:41:56,811 [   scc.merge] INFO  
2025-04-21 00:41:56,811 [   scc.merge] INFO  Conflicting PRs (not included):
2025-04-21 00:41:56,811 [   scc.merge] INFO    - PR 616 Rdornier 'Fix labels around border'
2025-04-21 00:41:56,811 [   scc.merge] INFO    - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-04-21 00:41:56,811 [   scc.merge] INFO  
2025-04-21 00:41:56,811 [   scc.merge] INFO  Repository: ome/omero-fpbioimage
2025-04-21 00:41:56,811 [   scc.merge] INFO  Already up to date.
2025-04-21 00:41:56,811 [   scc.merge] INFO  
2025-04-21 00:41:56,811 [   scc.merge] INFO  Merged PRs:
2025-04-21 00:41:56,811 [   scc.merge] INFO    - PR 18 jburel 'default  size z value'
2025-04-21 00:41:56,811 [   scc.merge] INFO  
2025-04-21 00:41:56,811 [   scc.merge] INFO  Repository: ome/omero-gallery
2025-04-21 00:41:56,811 [   scc.merge] INFO  Already up to date.
2025-04-21 00:41:56,811 [   scc.merge] INFO  
2025-04-21 00:41:56,811 [   scc.merge] INFO  Merged PRs:
2025-04-21 00:41:56,811 [   scc.merge] INFO    - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-04-21 00:41:56,811 [   scc.merge] INFO    - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-04-21 00:41:56,811 [   scc.merge] INFO    - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-04-21 00:41:56,811 [   scc.merge] INFO    - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-04-21 00:41:56,811 [   scc.merge] INFO  
2025-04-21 00:41:56,811 [   scc.merge] INFO  Conflicting PRs (not included):
2025-04-21 00:41:56,811 [   scc.merge] INFO    - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-04-21 00:41:56,811 [   scc.merge] INFO    - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-04-21 00:41:56,811 [   scc.merge] INFO    - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-04-21 00:41:56,811 [   scc.merge] INFO  
2025-04-21 00:41:56,811 [   scc.merge] INFO  Repository: ome/omero-iviewer
2025-04-21 00:41:56,811 [   scc.merge] INFO  Excluded PRs:
2025-04-21 00:41:56,811 [   scc.merge] INFO    - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-04-21 00:41:56,811 [   scc.merge] INFO    - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-04-21 00:41:56,811 [   scc.merge] INFO    - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-04-21 00:41:56,812 [   scc.merge] INFO    - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-04-21 00:41:56,812 [   scc.merge] INFO    - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-04-21 00:41:56,812 [   scc.merge] INFO  Already up to date.
2025-04-21 00:41:56,812 [   scc.merge] INFO  
2025-04-21 00:41:56,812 [   scc.merge] INFO  Merged PRs:
2025-04-21 00:41:56,812 [   scc.merge] INFO    - PR 460 will-moore 'Channel min spinner fix'
2025-04-21 00:41:56,812 [   scc.merge] INFO    - PR 465 will-moore 'Save as Figure'
2025-04-21 00:41:56,812 [   scc.merge] INFO    - PR 471 will-moore 'Z projection disabled tooltip'
2025-04-21 00:41:56,812 [   scc.merge] INFO    - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-04-21 00:41:56,812 [   scc.merge] INFO    - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-21 00:41:56,812 [   scc.merge] INFO  
2025-04-21 00:41:56,812 [   scc.merge] INFO  Conflicting PRs (not included):
2025-04-21 00:41:56,812 [   scc.merge] INFO    - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-04-21 00:41:56,812 [   scc.merge] INFO  
2025-04-21 00:41:56,812 [   scc.merge] INFO  Repository: ome/omero-mapr
2025-04-21 00:41:56,812 [   scc.merge] INFO  Excluded PRs:
2025-04-21 00:41:56,812 [   scc.merge] INFO    - PR 79 will-moore 'Right panel title' (exclude comment)
2025-04-21 00:41:56,812 [   scc.merge] INFO  Already up to date.
2025-04-21 00:41:56,812 [   scc.merge] INFO  
2025-04-21 00:41:56,812 [   scc.merge] INFO  Merged PRs:
2025-04-21 00:41:56,812 [   scc.merge] INFO    - PR 74 will-moore 'mapr extension of webclient'
2025-04-21 00:41:56,812 [   scc.merge] INFO    - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-21 00:41:56,812 [   scc.merge] INFO  
2025-04-21 00:41:56,812 [   scc.merge] INFO  Repository: ome/omero-metadata
2025-04-21 00:41:56,812 [   scc.merge] INFO  Updating 3cd120c..55060a2
2025-04-21 00:41:56,812 [   scc.merge] INFO  Previously merged:
2025-04-21 00:41:56,812 [   scc.merge] INFO    - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-21 00:41:56,812 [   scc.merge] INFO  
2025-04-21 00:41:56,812 [   scc.merge] INFO  Conflicting PRs (not included):
2025-04-21 00:41:56,812 [   scc.merge] INFO    - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-21 00:41:56,812 [   scc.merge] INFO    - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-21 00:41:56,812 [   scc.merge] INFO  
2025-04-21 00:41:56,812 [   scc.merge] INFO  Repository: ome/omero-parade
2025-04-21 00:41:56,813 [   scc.merge] INFO  Excluded PRs:
2025-04-21 00:41:56,813 [   scc.merge] INFO    - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-04-21 00:41:56,813 [   scc.merge] INFO    - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-04-21 00:41:56,813 [   scc.merge] INFO    - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-04-21 00:41:56,813 [   scc.merge] INFO    - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-04-21 00:41:56,813 [   scc.merge] INFO  Already up to date.
2025-04-21 00:41:56,813 [   scc.merge] INFO  
2025-04-21 00:41:56,813 [   scc.merge] INFO  Merged PRs:
2025-04-21 00:41:56,813 [   scc.merge] INFO    - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-21 00:41:56,813 [   scc.merge] INFO    - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-21 00:41:56,813 [   scc.merge] INFO    - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-21 00:41:56,813 [   scc.merge] INFO  
2025-04-21 00:41:56,813 [   scc.merge] INFO  Repository: ome/omero-prometheus-tools
2025-04-21 00:41:56,813 [   scc.merge] INFO  Already up to date.
2025-04-21 00:41:56,813 [   scc.merge] INFO  
2025-04-21 00:41:56,813 [   scc.merge] INFO  
2025-04-21 00:41:56,813 [   scc.merge] INFO  Repository: ome/omero-rois
2025-04-21 00:41:56,813 [   scc.merge] INFO  Excluded PRs:
2025-04-21 00:41:56,813 [   scc.merge] INFO    - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-04-21 00:41:56,813 [   scc.merge] INFO    - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-21 00:41:56,813 [   scc.merge] INFO  Already up to date.
2025-04-21 00:41:56,813 [   scc.merge] INFO  
2025-04-21 00:41:56,813 [   scc.merge] INFO  
2025-04-21 00:41:56,813 [   scc.merge] INFO  Repository: ome/omero-signup
2025-04-21 00:41:56,813 [   scc.merge] INFO  Already up to date.
2025-04-21 00:41:56,813 [   scc.merge] INFO  
2025-04-21 00:41:56,813 [   scc.merge] INFO  Conflicting PRs (not included):
2025-04-21 00:41:56,813 [   scc.merge] INFO    - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-21 00:41:56,813 [   scc.merge] INFO  
2025-04-21 00:41:56,813 [   scc.merge] INFO  Repository: openmicroscopy/omero-test-infra
2025-04-21 00:41:56,813 [   scc.merge] INFO  Excluded PRs:
2025-04-21 00:41:56,813 [   scc.merge] INFO    - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-04-21 00:41:56,813 [   scc.merge] INFO    - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-04-21 00:41:56,813 [   scc.merge] INFO    - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-04-21 00:41:56,814 [   scc.merge] INFO  Already up to date.
2025-04-21 00:41:56,814 [   scc.merge] INFO  
2025-04-21 00:41:56,814 [   scc.merge] INFO  Merged PRs:
2025-04-21 00:41:56,814 [   scc.merge] INFO    - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-21 00:41:56,814 [   scc.merge] INFO    - PR 76 will-moore 'Run cli deps'
2025-04-21 00:41:56,814 [   scc.merge] INFO  
2025-04-21 00:41:56,814 [   scc.merge] INFO  Repository: ome/omero-upload
2025-04-21 00:41:56,814 [   scc.merge] INFO  Already up to date.
2025-04-21 00:41:56,814 [   scc.merge] INFO  
2025-04-21 00:41:56,814 [   scc.merge] INFO  
2025-04-21 00:41:56,814 [   scc.merge] INFO  Repository: ome/omero-virtual-microscope
2025-04-21 00:41:56,814 [   scc.merge] INFO  Already up to date.
2025-04-21 00:41:56,814 [   scc.merge] INFO  
2025-04-21 00:41:56,814 [   scc.merge] INFO  Merged PRs:
2025-04-21 00:41:56,814 [   scc.merge] INFO    - PR 20 jburel 'Build'
2025-04-21 00:41:56,814 [   scc.merge] INFO  
2025-04-21 00:41:56,814 [   scc.merge] INFO  Repository: ome/omero-web-zarr
2025-04-21 00:41:56,814 [   scc.merge] INFO  Excluded PRs:
2025-04-21 00:41:56,814 [   scc.merge] INFO    - PR 18 will-moore 'Build' (status: failure)
2025-04-21 00:41:56,814 [   scc.merge] INFO    - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-04-21 00:41:56,814 [   scc.merge] INFO  Already up to date.
2025-04-21 00:41:56,814 [   scc.merge] INFO  
2025-04-21 00:41:56,814 [   scc.merge] INFO  Conflicting PRs (not included):
2025-04-21 00:41:56,814 [   scc.merge] INFO    - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-21 00:41:56,814 [   scc.merge] INFO  
2025-04-21 00:41:56,814 [   scc.merge] INFO  Repository: openmicroscopy/omero-weberror
2025-04-21 00:41:56,814 [   scc.merge] INFO  Already up to date.
2025-04-21 00:41:56,814 [   scc.merge] INFO  
2025-04-21 00:41:56,814 [   scc.merge] INFO  
2025-04-21 00:41:56,814 [   scc.merge] INFO  Repository: openmicroscopy/omero-webtest
2025-04-21 00:41:56,814 [   scc.merge] INFO  Already up to date.
2025-04-21 00:41:56,814 [   scc.merge] INFO  
2025-04-21 00:41:56,814 [   scc.merge] INFO  
2025-04-21 00:41:56,814 [   scc.merge] INFO  Repository: ome/rOMERO-gateway
2025-04-21 00:41:56,814 [   scc.merge] INFO  Already up to date.
2025-04-21 00:41:56,814 [   scc.merge] INFO  
2025-04-21 00:41:56,814 [   scc.merge] INFO  Conflicting PRs (not included):
2025-04-21 00:41:56,815 [   scc.merge] INFO    - PR 100 dominikl 'Run tests properly'
2025-04-21 00:41:56,815 [   scc.merge] INFO  
2025-04-21 00:41:56,815 [   scc.merge] INFO  Repository: ome/scripts
2025-04-21 00:41:56,815 [   scc.merge] INFO  Excluded PRs:
2025-04-21 00:41:56,815 [   scc.merge] INFO    - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-04-21 00:41:56,815 [   scc.merge] INFO    - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-04-21 00:41:56,815 [   scc.merge] INFO  Updating 4b4c755..950b28b
2025-04-21 00:41:56,815 [   scc.merge] INFO  Previously merged:
2025-04-21 00:41:56,815 [   scc.merge] INFO    - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-04-21 00:41:56,815 [   scc.merge] INFO  
2025-04-21 00:41:56,815 [   scc.merge] INFO  Merged PRs:
2025-04-21 00:41:56,815 [   scc.merge] INFO    - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-21 00:41:56,815 [   scc.merge] INFO  
2025-04-21 00:41:56,815 [   scc.merge] INFO  Conflicting PRs (not included):
2025-04-21 00:41:56,815 [   scc.merge] INFO    - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-21 00:41:56,815 [   scc.merge] INFO  
2025-04-21 00:41:56,815 [   scc.merge] DEBUG Cleaning remote branches created for merging
2025-04-21 00:41:56,815 [     scc.git] DEBUG Calling 'git remote'
2025-04-21 00:41:56,817 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-04-21 00:41:56,817 [     scc.git] DEBUG Calling 'git remote'
2025-04-21 00:41:56,819 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:56,820 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-04-21 00:41:56,820 [     scc.git] DEBUG Calling 'git remote'
2025-04-21 00:41:56,822 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:56,822 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-04-21 00:41:56,822 [     scc.git] DEBUG Calling 'git remote'
2025-04-21 00:41:56,824 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:56,824 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-04-21 00:41:56,824 [     scc.git] DEBUG Calling 'git remote'
2025-04-21 00:41:56,826 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:56,826 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-04-21 00:41:56,826 [     scc.git] DEBUG Calling 'git remote'
2025-04-21 00:41:56,828 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:56,828 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-04-21 00:41:56,828 [     scc.git] DEBUG Calling 'git remote'
2025-04-21 00:41:56,830 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:56,830 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-04-21 00:41:56,831 [     scc.git] DEBUG Calling 'git remote'
2025-04-21 00:41:56,833 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:56,833 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-04-21 00:41:56,833 [     scc.git] DEBUG Calling 'git remote'
2025-04-21 00:41:56,835 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:56,835 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-21 00:41:56,835 [     scc.git] DEBUG Calling 'git remote'
2025-04-21 00:41:56,837 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:56,837 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-21 00:41:56,837 [     scc.git] DEBUG Calling 'git remote'
2025-04-21 00:41:56,839 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:56,839 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-21 00:41:56,839 [     scc.git] DEBUG Calling 'git remote'
2025-04-21 00:41:56,841 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:56,842 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-21 00:41:56,842 [     scc.git] DEBUG Calling 'git remote'
2025-04-21 00:41:56,844 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:56,844 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-21 00:41:56,844 [     scc.git] DEBUG Calling 'git remote'
2025-04-21 00:41:56,846 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:56,846 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-21 00:41:56,846 [     scc.git] DEBUG Calling 'git remote'
2025-04-21 00:41:56,848 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:56,848 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-21 00:41:56,848 [     scc.git] DEBUG Calling 'git remote'
2025-04-21 00:41:56,850 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:56,850 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-21 00:41:56,850 [     scc.git] DEBUG Calling 'git remote'
2025-04-21 00:41:56,852 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:56,852 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-21 00:41:56,852 [     scc.git] DEBUG Calling 'git remote'
2025-04-21 00:41:56,855 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:56,855 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-21 00:41:56,855 [     scc.git] DEBUG Calling 'git remote'
2025-04-21 00:41:56,857 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:56,857 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-21 00:41:56,857 [     scc.git] DEBUG Calling 'git remote'
2025-04-21 00:41:56,859 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:56,859 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-21 00:41:56,859 [     scc.git] DEBUG Calling 'git remote'
2025-04-21 00:41:56,861 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:56,861 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-21 00:41:56,861 [     scc.git] DEBUG Calling 'git remote'
2025-04-21 00:41:56,863 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-21 00:41:56,863 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-21 00:41:56,863 [     scc.git] DEBUG Calling 'git remote'
2025-04-21 00:41:56,865 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
  warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
  warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
  warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
  warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
  warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
  warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
  warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
  warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
  warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
  warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
  warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
  warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
  warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
  warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
  warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
  warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
  warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
  warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
  warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
  warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.10.0 to 5.10.3-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
grep: build.gradle: No such file or directory
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Up-to-date: 
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD a54d707] Update component versions
 1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 4777ef8
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from ce6e13c
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 11d3587
Untracked files:
  (use "git add <file>..." to include in what will be committed)
	.eggs/

nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from 9cc36cde
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from 3b6c05a
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 2a621da
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 7a798ce
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 0a557da
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from 3cd120c
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from fb5ae86
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from eb47378
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from bdfeb5e
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from be76813
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from 100f6ae
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 8f3c313
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from 70b01ed
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 5bfef29
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 4b4c755
nothing to commit, working tree clean
[detached HEAD 9db10b2] Update component versions
 1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-04-21 00:42:43,920 [github.Reque] INFO  Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2025-04-21 00:42:53,418 [github.Reque] INFO  Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2025-04-21 00:42:55,873 [github.Reque] INFO  Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-21 00:43:00,614 [github.Reque] INFO  Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-21 00:43:39,990 [    scc.push] INFO  Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS