Skip to content

Console Output

Skipping 194 KB.. Full Log
nn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-10-17 00:44:01,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-10-17 00:44:01,877 [    scc.repo] DEBUG   - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-10-17 00:44:02,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-10-17 00:44:02,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-10-17 00:44:03,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-10-17 00:44:03,988 [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-10-17 00:44:04,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-10-17 00:44:04,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-10-17 00:44:04,858 [    scc.repo] DEBUG   - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-10-17 00:44:04,859 [    scc.repo] DEBUG ## Branches found:
2025-10-17 00:44:04,859 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-10-17 00:44:04,859 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:44:04,859 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:04,861 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-17 00:44:04,863 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-17 00:44:04,863 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-17 00:44:04,866 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-17 00:44:04,873 [     scc.git] DEBUG Updating 3cd120c..55060a2

2025-10-17 00:44:05,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-10-17 00:44:05,511 [     scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-10-17 00:44:05,796 [     scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-10-17 00:44:05,796 [     scc.git] DEBUG  * branch            refs/pull/55/head -> FETCH_HEAD
2025-10-17 00:44:05,799 [     scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-10-17 00:44:06,081 [     scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-10-17 00:44:06,081 [     scc.git] DEBUG  * branch            refs/pull/64/head -> FETCH_HEAD
2025-10-17 00:44:06,085 [     scc.git] DEBUG ## Unique users: []
2025-10-17 00:44:06,085 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:44:06,085 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:06,087 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-10-17 00:44:06,091 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:06,093 [     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-10-17 00:44:06,105 [     scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-10-17 00:44:06,106 [     scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-10-17 00:44:06,106 [     scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-10-17 00:44:06,106 [     scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-10-17 00:44:06,106 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-10-17 00:44:06,106 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-10-17 00:44:06,108 [     scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-10-17 00:44:06,112 [     scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-10-17 00:44:06,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:44:06,260 [     scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-10-17 00:44:06,264 [     scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-10-17 00:44:06,266 [     scc.git] INFO    - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#560](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - src/omero_metadata/populate.py
    - src/omero_metadata/cli.py

--conflicts

2025-10-17 00:44:06,268 [  scc.config] DEBUG Found github.token
2025-10-17 00:44:06,268 [     scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-10-17 00:44:06,268 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-10-17 00:44:06,272 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:06,274 [     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-10-17 00:44:06,288 [     scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-10-17 00:44:06,288 [     scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-10-17 00:44:06,288 [     scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-10-17 00:44:06,288 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-10-17 00:44:06,288 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-10-17 00:44:06,291 [     scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-10-17 00:44:06,295 [     scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-10-17 00:44:06,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:44:06,655 [     scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-10-17 00:44:06,659 [     scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-10-17 00:44:06,661 [     scc.git] INFO    - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#560](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/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-10-17 00:44:06,663 [  scc.config] DEBUG Found github.token
2025-10-17 00:44:06,663 [     scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-10-17 00:44:06,663 [     scc.git] DEBUG Calling 'git submodule update'
2025-10-17 00:44:06,700 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:44:06,700 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:06,702 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-17 00:44:06,737 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-10-17 00:44:06,741 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f17e73ea410> has no local changes
2025-10-17 00:44:06,741 [     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#560 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/)'
2025-10-17 00:44:06,747 [     scc.git] DEBUG [detached HEAD 414064e] merge master -Dorg -Ssuccess-only
2025-10-17 00:44:06,748 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:44:06,748 [    scc.repo] DEBUG ## PRs found:
2025-10-17 00:44:07,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-10-17 00:44:07,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-10-17 00:44:08,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-10-17 00:44:08,721 [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-10-17 00:44:09,220 [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-10-17 00:44:09,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-10-17 00:44:10,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-10-17 00:44:10,149 [    scc.repo] DEBUG   - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-10-17 00:44:10,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-10-17 00:44:10,647 [    scc.repo] DEBUG   # ... Include label: dependencies
2025-10-17 00:44:11,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-10-17 00:44:11,725 [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-10-17 00:44:12,263 [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-10-17 00:44:12,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-10-17 00:44:13,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-10-17 00:44:13,255 [    scc.repo] DEBUG   - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-10-17 00:44:13,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-10-17 00:44:13,760 [    scc.repo] DEBUG   # ... Include label: dependencies
2025-10-17 00:44:14,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-10-17 00:44:14,772 [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-10-17 00:44:15,251 [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-10-17 00:44:15,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-10-17 00:44:16,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-10-17 00:44:16,217 [    scc.repo] DEBUG   - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-10-17 00:44:16,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-10-17 00:44:17,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-10-17 00:44:17,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-10-17 00:44:18,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-10-17 00:44:18,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-10-17 00:44:19,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-10-17 00:44:19,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-10-17 00:44:19,547 [    scc.repo] DEBUG ## Branches found:
2025-10-17 00:44:19,547 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-10-17 00:44:19,547 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:44:19,547 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:19,549 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-17 00:44:19,552 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-17 00:44:19,552 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-17 00:44:19,554 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-17 00:44:19,557 [     scc.git] DEBUG Already up to date.

2025-10-17 00:44:19,557 [     scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-10-17 00:44:19,833 [     scc.git] DEBUG From https://github.com/ome/omero-parade
2025-10-17 00:44:19,833 [     scc.git] DEBUG  * branch            refs/pull/140/head -> FETCH_HEAD
2025-10-17 00:44:19,837 [     scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-10-17 00:44:20,123 [     scc.git] DEBUG From https://github.com/ome/omero-parade
2025-10-17 00:44:20,123 [     scc.git] DEBUG  * branch            refs/pull/141/head -> FETCH_HEAD
2025-10-17 00:44:20,127 [     scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-10-17 00:44:20,402 [     scc.git] DEBUG From https://github.com/ome/omero-parade
2025-10-17 00:44:20,402 [     scc.git] DEBUG  * branch            refs/pull/142/head -> FETCH_HEAD
2025-10-17 00:44:20,406 [     scc.git] DEBUG ## Unique users: []
2025-10-17 00:44:20,406 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:44:20,406 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:20,408 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-10-17 00:44:20,411 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:20,413 [     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-10-17 00:44:20,419 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-17 00:44:20,423 [     scc.git] DEBUG  package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-10-17 00:44:20,423 [     scc.git] DEBUG  package.json      |   2 +-
2025-10-17 00:44:20,423 [     scc.git] DEBUG  2 files changed, 138 insertions(+), 153 deletions(-)
2025-10-17 00:44:20,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:44:20,573 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-10-17 00:44:20,576 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:20,578 [     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-10-17 00:44:20,587 [     scc.git] DEBUG Auto-merging package-lock.json
2025-10-17 00:44:20,587 [     scc.git] DEBUG Auto-merging package.json
2025-10-17 00:44:20,587 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-17 00:44:20,590 [     scc.git] DEBUG  package-lock.json | 18 ++++++++++--------
2025-10-17 00:44:20,590 [     scc.git] DEBUG  package.json      |  2 +-
2025-10-17 00:44:20,590 [     scc.git] DEBUG  2 files changed, 11 insertions(+), 9 deletions(-)
2025-10-17 00:44:20,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:44:20,973 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-10-17 00:44:20,976 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:20,978 [     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-10-17 00:44:20,985 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-17 00:44:20,988 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 2 +-
2025-10-17 00:44:20,988 [     scc.git] DEBUG  1 file changed, 1 insertion(+), 1 deletion(-)
2025-10-17 00:44:21,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:44:21,518 [     scc.git] DEBUG Calling 'git submodule update'
2025-10-17 00:44:21,555 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:44:21,556 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:21,558 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-17 00:44:21,595 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-10-17 00:44:21,599 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f17e62fcb90> has no local changes
2025-10-17 00:44:21,599 [     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#560 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/)'
2025-10-17 00:44:21,605 [     scc.git] DEBUG [detached HEAD ab1e5ec] merge master -Dorg -Ssuccess-only
2025-10-17 00:44:21,605 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:44:21,605 [    scc.repo] DEBUG ## PRs found:
2025-10-17 00:44:21,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2025-10-17 00:44:22,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/16 HTTP/1.1" 200 None
2025-10-17 00:44:22,532 [    scc.repo] DEBUG   # ... Include label: dependencies
2025-10-17 00:44:23,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/5381b9f25e1666d81d236039a1317276291e9b2e HTTP/1.1" 200 None
2025-10-17 00:44:23,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/5381b9f25e1666d81d236039a1317276291e9b2e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-17 00:44:24,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/5381b9f25e1666d81d236039a1317276291e9b2e/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-17 00:44:24,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/5381b9f25e1666d81d236039a1317276291e9b2e HTTP/1.1" 200 None
2025-10-17 00:44:25,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/5381b9f25e1666d81d236039a1317276291e9b2e?per_page=1 HTTP/1.1" 200 2
2025-10-17 00:44:25,160 [    scc.repo] DEBUG   - PR 16 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-17 00:44:25,160 [    scc.repo] DEBUG ## Branches found:
2025-10-17 00:44:25,160 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-10-17 00:44:25,160 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:44:25,160 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:25,163 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-17 00:44:25,165 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-17 00:44:25,165 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-17 00:44:25,168 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-17 00:44:25,170 [     scc.git] DEBUG Already up to date.

2025-10-17 00:44:25,170 [     scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2025-10-17 00:44:25,454 [     scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2025-10-17 00:44:25,454 [     scc.git] DEBUG  * branch            refs/pull/16/head -> FETCH_HEAD
2025-10-17 00:44:25,459 [     scc.git] DEBUG ## Unique users: []
2025-10-17 00:44:25,459 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:44:25,460 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:25,462 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...5381b9f25e1666d81d236039a1317276291e9b2e'
2025-10-17 00:44:25,464 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:25,466 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows) 5381b9f25e1666d81d236039a1317276291e9b2e'
2025-10-17 00:44:25,472 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-17 00:44:25,475 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 2 +-
2025-10-17 00:44:25,475 [     scc.git] DEBUG  1 file changed, 1 insertion(+), 1 deletion(-)
2025-10-17 00:44:25,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:44:25,621 [     scc.git] DEBUG Calling 'git submodule update'
2025-10-17 00:44:25,658 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:44:25,658 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:25,660 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-17 00:44:25,697 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-10-17 00:44:25,699 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f17e74d54d0> has no local changes
2025-10-17 00:44:25,700 [     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.

Merged PRs:
  - PR 16 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'

Generated by OMERO-plugins-push#560 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/)'
2025-10-17 00:44:25,705 [     scc.git] DEBUG [detached HEAD de27951] merge master -Dorg -Ssuccess-only
2025-10-17 00:44:25,705 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:44:25,705 [    scc.repo] DEBUG ## PRs found:
2025-10-17 00:44:26,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-10-17 00:44:26,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/34 HTTP/1.1" 200 None
2025-10-17 00:44:26,652 [    scc.repo] DEBUG   # ... Include label: dependencies
2025-10-17 00:44:27,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/149bb248277256d589ea0db597c04739e8134301 HTTP/1.1" 200 None
2025-10-17 00:44:27,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/149bb248277256d589ea0db597c04739e8134301/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-17 00:44:28,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/149bb248277256d589ea0db597c04739e8134301/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-17 00:44:28,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/149bb248277256d589ea0db597c04739e8134301 HTTP/1.1" 200 None
2025-10-17 00:44:29,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/149bb248277256d589ea0db597c04739e8134301?per_page=1 HTTP/1.1" 200 None
2025-10-17 00:44:29,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/149bb248277256d589ea0db597c04739e8134301 HTTP/1.1" 200 None
2025-10-17 00:44:30,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/149bb248277256d589ea0db597c04739e8134301/status HTTP/1.1" 200 None
2025-10-17 00:44:30,209 [    scc.repo] DEBUG   - PR 34 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-17 00:44:30,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-10-17 00:44:31,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-10-17 00:44:31,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3 HTTP/1.1" 200 None
2025-10-17 00:44:32,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-17 00:44:32,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-17 00:44:33,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3 HTTP/1.1" 200 None
2025-10-17 00:44:33,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/1122baea98746effd4eb59deed25870f673ce3d3?per_page=1 HTTP/1.1" 200 None
2025-10-17 00:44:34,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3 HTTP/1.1" 200 None
2025-10-17 00:44:34,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3/status HTTP/1.1" 200 None
2025-10-17 00:44:34,541 [    scc.repo] DEBUG   - PR 33 jo-mueller 'Add roi to array functions'
2025-10-17 00:44:35,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-10-17 00:44:35,038 [    scc.repo] DEBUG ## Branches found:
2025-10-17 00:44:35,038 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-10-17 00:44:35,038 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:44:35,039 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:35,041 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-17 00:44:35,043 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-17 00:44:35,043 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-17 00:44:35,046 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-17 00:44:35,048 [     scc.git] DEBUG Already up to date.

2025-10-17 00:44:35,048 [     scc.git] DEBUG Calling 'git fetch origin pull/33/head'
2025-10-17 00:44:35,330 [     scc.git] DEBUG From https://github.com/ome/omero-rois
2025-10-17 00:44:35,330 [     scc.git] DEBUG  * branch            refs/pull/33/head -> FETCH_HEAD
2025-10-17 00:44:35,334 [     scc.git] DEBUG Calling 'git fetch origin pull/34/head'
2025-10-17 00:44:35,606 [     scc.git] DEBUG From https://github.com/ome/omero-rois
2025-10-17 00:44:35,606 [     scc.git] DEBUG  * branch            refs/pull/34/head -> FETCH_HEAD
2025-10-17 00:44:35,609 [     scc.git] DEBUG ## Unique users: []
2025-10-17 00:44:35,609 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:44:35,609 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:35,612 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...1122baea98746effd4eb59deed25870f673ce3d3'
2025-10-17 00:44:35,614 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:35,616 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 33 (Add roi to array functions) 1122baea98746effd4eb59deed25870f673ce3d3'
2025-10-17 00:44:35,622 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-17 00:44:35,625 [     scc.git] DEBUG  setup.py                   |   4 +-
2025-10-17 00:44:35,625 [     scc.git] DEBUG  src/omero_rois/__init__.py |   4 +
2025-10-17 00:44:35,625 [     scc.git] DEBUG  src/omero_rois/library.py  | 204 +++++++++++++++++++++++++++++++++++++++++++--
2025-10-17 00:44:35,625 [     scc.git] DEBUG  3 files changed, 203 insertions(+), 9 deletions(-)
2025-10-17 00:44:35,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:44:35,766 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...149bb248277256d589ea0db597c04739e8134301'
2025-10-17 00:44:35,768 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:35,770 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 34 (Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows) 149bb248277256d589ea0db597c04739e8134301'
2025-10-17 00:44:35,776 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-17 00:44:35,779 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 2 +-
2025-10-17 00:44:35,779 [     scc.git] DEBUG  1 file changed, 1 insertion(+), 1 deletion(-)
2025-10-17 00:44:36,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:44:36,221 [     scc.git] DEBUG Calling 'git submodule update'
2025-10-17 00:44:36,256 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:44:36,256 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:36,258 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-17 00:44:36,292 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-10-17 00:44:36,295 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f17e74c4550> has no local changes
2025-10-17 00:44:36,295 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-rois
Excluded PRs:
  - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.

Merged PRs:
  - PR 33 jo-mueller 'Add roi to array functions'
  - PR 34 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'

Generated by OMERO-plugins-push#560 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/)'
2025-10-17 00:44:36,300 [     scc.git] DEBUG [detached HEAD 086520c] merge master -Dorg -Ssuccess-only
2025-10-17 00:44:36,300 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:44:36,300 [    scc.repo] DEBUG ## PRs found:
2025-10-17 00:44:36,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-10-17 00:44:37,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/22 HTTP/1.1" 200 None
2025-10-17 00:44:37,229 [    scc.repo] DEBUG   # ... Include label: dependencies
2025-10-17 00:44:37,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/8b27e47a330555e99e9594f0c4b546946f4f98aa HTTP/1.1" 200 None
2025-10-17 00:44:38,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/8b27e47a330555e99e9594f0c4b546946f4f98aa/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-17 00:44:38,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/8b27e47a330555e99e9594f0c4b546946f4f98aa/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-17 00:44:39,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/8b27e47a330555e99e9594f0c4b546946f4f98aa HTTP/1.1" 200 None
2025-10-17 00:44:39,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/8b27e47a330555e99e9594f0c4b546946f4f98aa?per_page=1 HTTP/1.1" 200 2
2025-10-17 00:44:39,704 [    scc.repo] DEBUG   - PR 22 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-17 00:44:40,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-10-17 00:44:40,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-10-17 00:44:41,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-10-17 00:44:41,732 [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-10-17 00:44:42,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-10-17 00:44:42,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-10-17 00:44:42,683 [    scc.repo] DEBUG   - PR 14 manics 'Add pre-commit (black, flake8)'
2025-10-17 00:44:42,683 [    scc.repo] DEBUG ## Branches found:
2025-10-17 00:44:42,684 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-10-17 00:44:42,684 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:44:42,684 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:42,686 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-17 00:44:42,688 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-17 00:44:42,689 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-17 00:44:42,691 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-17 00:44:42,694 [     scc.git] DEBUG Already up to date.

2025-10-17 00:44:42,694 [     scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-10-17 00:44:42,980 [     scc.git] DEBUG From https://github.com/ome/omero-signup
2025-10-17 00:44:42,980 [     scc.git] DEBUG  * branch            refs/pull/14/head -> FETCH_HEAD
2025-10-17 00:44:42,984 [     scc.git] DEBUG Calling 'git fetch origin pull/22/head'
2025-10-17 00:44:43,258 [     scc.git] DEBUG From https://github.com/ome/omero-signup
2025-10-17 00:44:43,258 [     scc.git] DEBUG  * branch            refs/pull/22/head -> FETCH_HEAD
2025-10-17 00:44:43,262 [     scc.git] DEBUG ## Unique users: []
2025-10-17 00:44:43,263 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:44:43,263 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:43,265 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-10-17 00:44:43,268 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:43,270 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-10-17 00:44:43,277 [     scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-10-17 00:44:43,277 [     scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-10-17 00:44:43,277 [     scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-10-17 00:44:43,277 [     scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-10-17 00:44:43,277 [     scc.git] DEBUG Auto-merging omero_signup/views.py
2025-10-17 00:44:43,277 [     scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-10-17 00:44:43,277 [     scc.git] DEBUG Auto-merging setup.py
2025-10-17 00:44:43,277 [     scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-10-17 00:44:43,277 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-10-17 00:44:43,277 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-10-17 00:44:43,280 [     scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-10-17 00:44:43,283 [     scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-10-17 00:44:43,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:44:43,449 [     scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-10-17 00:44:43,451 [     scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-10-17 00:44:43,454 [     scc.git] INFO    - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#560](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - setup.py
    - omero_signup/signup_settings.py
    - omero_signup/views.py
    - omero_signup/urls.py

--conflicts

2025-10-17 00:44:43,456 [  scc.config] DEBUG Found github.token
2025-10-17 00:44:43,456 [     scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-10-17 00:44:43,456 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...8b27e47a330555e99e9594f0c4b546946f4f98aa'
2025-10-17 00:44:43,459 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:43,461 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 22 (Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows) 8b27e47a330555e99e9594f0c4b546946f4f98aa'
2025-10-17 00:44:43,467 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-17 00:44:43,469 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 2 +-
2025-10-17 00:44:43,469 [     scc.git] DEBUG  1 file changed, 1 insertion(+), 1 deletion(-)
2025-10-17 00:44:43,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:44:43,849 [     scc.git] DEBUG Calling 'git submodule update'
2025-10-17 00:44:43,885 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:44:43,885 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:43,887 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-17 00:44:43,920 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-10-17 00:44:43,923 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f17e6345a90> has no local changes
2025-10-17 00:44:43,923 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

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

Merged PRs:
  - PR 22 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'

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

Generated by OMERO-plugins-push#560 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/)'
2025-10-17 00:44:43,929 [     scc.git] DEBUG [detached HEAD b9cea42] merge master -Dorg -Ssuccess-only
2025-10-17 00:44:43,929 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:44:43,929 [    scc.repo] DEBUG ## PRs found:
2025-10-17 00:44:44,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-10-17 00:44:44,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-10-17 00:44:45,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-10-17 00:44:45,927 [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-10-17 00:44:46,434 [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-10-17 00:44:46,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-10-17 00:44:47,337 [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-10-17 00:44:47,338 [    scc.repo] DEBUG   - PR 76 will-moore 'Run cli deps'
2025-10-17 00:44:47,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-10-17 00:44:48,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-10-17 00:44:48,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-10-17 00:44:49,290 [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-10-17 00:44:49,763 [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-10-17 00:44:50,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-10-17 00:44:50,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-10-17 00:44:51,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-10-17 00:44:51,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-10-17 00:44:52,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-10-17 00:44:52,707 [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-10-17 00:44:53,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-10-17 00:44:53,681 [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-10-17 00:44:53,681 [    scc.repo] DEBUG   - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-10-17 00:44:53,681 [    scc.repo] DEBUG ## Branches found:
2025-10-17 00:44:53,681 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-10-17 00:44:53,681 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:44:53,681 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:53,684 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-17 00:44:53,686 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-17 00:44:53,686 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-17 00:44:53,689 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-17 00:44:53,691 [     scc.git] DEBUG Already up to date.

2025-10-17 00:44:53,691 [     scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-10-17 00:44:53,989 [     scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-10-17 00:44:53,989 [     scc.git] DEBUG  * branch            refs/pull/12/head -> FETCH_HEAD
2025-10-17 00:44:53,992 [     scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-10-17 00:44:54,276 [     scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-10-17 00:44:54,276 [     scc.git] DEBUG  * branch            refs/pull/76/head -> FETCH_HEAD
2025-10-17 00:44:54,281 [     scc.git] DEBUG ## Unique users: []
2025-10-17 00:44:54,281 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:44:54,281 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:54,283 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-10-17 00:44:54,287 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:54,289 [     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-10-17 00:44:54,299 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-17 00:44:54,302 [     scc.git] DEBUG  idr-compose.yml                            |  66 ++++++++++++++
2025-10-17 00:44:54,302 [     scc.git] DEBUG  idr-haproxy.yml                            |  58 +++++++++++++
2025-10-17 00:44:54,303 [     scc.git] DEBUG  idr/40-ansible.sh                          |   7 ++
2025-10-17 00:44:54,303 [     scc.git] DEBUG  idr/70-reset-password.sh                   |   1 +
2025-10-17 00:44:54,303 [     scc.git] DEBUG  idr/nginx/conf.d/default.conf              |   1 +
2025-10-17 00:44:54,303 [     scc.git] DEBUG  idr/nginx/conf.d/example_ssl.conf          |   1 +
2025-10-17 00:44:54,303 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-cache.conf          |  53 +++++++++++
2025-10-17 00:44:54,303 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-cachebuster.conf    | 114 ++++++++++++++++++++++++
2025-10-17 00:44:54,303 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-default.conf        | 135 +++++++++++++++++++++++++++++
2025-10-17 00:44:54,303 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-10-17 00:44:54,304 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-redirect.conf       |  15 ++++
2025-10-17 00:44:54,304 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-upstream.conf       |  13 +++
2025-10-17 00:44:54,304 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-v0.conf             |  26 ++++++
2025-10-17 00:44:54,304 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-v1.conf             |  30 +++++++
2025-10-17 00:44:54,304 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-v2.conf             |  30 +++++++
2025-10-17 00:44:54,304 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-websockets.conf     |   6 ++
2025-10-17 00:44:54,304 [     scc.git] DEBUG  idr/nginx/nginx.conf                       |  53 +++++++++++
2025-10-17 00:44:54,304 [     scc.git] DEBUG  idr/omero/Dockerfile                       |   3 +
2025-10-17 00:44:54,304 [     scc.git] DEBUG  idr/omero/playbook.yml                     |  41 +++++++++
2025-10-17 00:44:54,304 [     scc.git] DEBUG  idr/redirect/Dockerfile                    |   6 ++
2025-10-17 00:44:54,304 [     scc.git] DEBUG  idr/web/Dockerfile                         |   5 ++
2025-10-17 00:44:54,304 [     scc.git] DEBUG  idr/web/playbook.yml                       |  45 ++++++++++
2025-10-17 00:44:54,304 [     scc.git] DEBUG  22 files changed, 824 insertions(+)
2025-10-17 00:44:54,304 [     scc.git] DEBUG  create mode 100644 idr-compose.yml
2025-10-17 00:44:54,304 [     scc.git] DEBUG  create mode 100644 idr-haproxy.yml
2025-10-17 00:44:54,304 [     scc.git] DEBUG  create mode 100755 idr/40-ansible.sh
2025-10-17 00:44:54,304 [     scc.git] DEBUG  create mode 100755 idr/70-reset-password.sh
2025-10-17 00:44:54,304 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/default.conf
2025-10-17 00:44:54,304 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-10-17 00:44:54,304 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-10-17 00:44:54,304 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-10-17 00:44:54,304 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-10-17 00:44:54,304 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-10-17 00:44:54,304 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-10-17 00:44:54,304 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-10-17 00:44:54,304 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-10-17 00:44:54,304 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-10-17 00:44:54,304 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-10-17 00:44:54,304 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-10-17 00:44:54,304 [     scc.git] DEBUG  create mode 100644 idr/nginx/nginx.conf
2025-10-17 00:44:54,305 [     scc.git] DEBUG  create mode 100644 idr/omero/Dockerfile
2025-10-17 00:44:54,305 [     scc.git] DEBUG  create mode 100644 idr/omero/playbook.yml
2025-10-17 00:44:54,305 [     scc.git] DEBUG  create mode 100644 idr/redirect/Dockerfile
2025-10-17 00:44:54,305 [     scc.git] DEBUG  create mode 100644 idr/web/Dockerfile
2025-10-17 00:44:54,305 [     scc.git] DEBUG  create mode 100644 idr/web/playbook.yml
2025-10-17 00:44:54,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:44:54,439 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-10-17 00:44:54,443 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:54,445 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-10-17 00:44:54,453 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-17 00:44:54,455 [     scc.git] DEBUG  docker | 1 +
2025-10-17 00:44:54,455 [     scc.git] DEBUG  1 file changed, 1 insertion(+)
2025-10-17 00:44:54,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:44:54,844 [     scc.git] DEBUG Calling 'git submodule update'
2025-10-17 00:44:54,881 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:44:54,881 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:54,883 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-17 00:44:54,918 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-10-17 00:44:54,921 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f17e62be790> has no local changes
2025-10-17 00:44:54,921 [     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#560 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/)'
2025-10-17 00:44:54,927 [     scc.git] DEBUG [detached HEAD 0e82d0c] merge master -Dorg -Ssuccess-only
2025-10-17 00:44:54,928 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:44:54,928 [    scc.repo] DEBUG ## PRs found:
2025-10-17 00:44:55,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 None
2025-10-17 00:44:55,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/issues/14 HTTP/1.1" 200 None
2025-10-17 00:44:55,910 [    scc.repo] DEBUG   # ... Include label: dependencies
2025-10-17 00:44:56,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/commits/1a4dbe9a31854f4f65c509ea929debf3319ba1ea HTTP/1.1" 200 None
2025-10-17 00:44:56,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/commits/1a4dbe9a31854f4f65c509ea929debf3319ba1ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-17 00:44:57,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/commits/1a4dbe9a31854f4f65c509ea929debf3319ba1ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-17 00:44:58,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/commits/1a4dbe9a31854f4f65c509ea929debf3319ba1ea HTTP/1.1" 200 None
2025-10-17 00:44:58,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/statuses/1a4dbe9a31854f4f65c509ea929debf3319ba1ea?per_page=1 HTTP/1.1" 200 2
2025-10-17 00:44:58,427 [    scc.repo] DEBUG   - PR 14 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-17 00:44:58,427 [    scc.repo] DEBUG ## Branches found:
2025-10-17 00:44:58,427 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-10-17 00:44:58,427 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:44:58,427 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:58,430 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-17 00:44:58,432 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-17 00:44:58,432 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-17 00:44:58,434 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-17 00:44:58,437 [     scc.git] DEBUG Already up to date.

2025-10-17 00:44:58,437 [     scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-10-17 00:44:58,717 [     scc.git] DEBUG From https://github.com/ome/omero-upload
2025-10-17 00:44:58,717 [     scc.git] DEBUG  * branch            refs/pull/14/head -> FETCH_HEAD
2025-10-17 00:44:58,721 [     scc.git] DEBUG ## Unique users: []
2025-10-17 00:44:58,721 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:44:58,721 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:58,723 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...1a4dbe9a31854f4f65c509ea929debf3319ba1ea'
2025-10-17 00:44:58,726 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:58,728 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows) 1a4dbe9a31854f4f65c509ea929debf3319ba1ea'
2025-10-17 00:44:58,734 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-17 00:44:58,737 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 2 +-
2025-10-17 00:44:58,737 [     scc.git] DEBUG  1 file changed, 1 insertion(+), 1 deletion(-)
2025-10-17 00:44:58,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:44:58,885 [     scc.git] DEBUG Calling 'git submodule update'
2025-10-17 00:44:58,921 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:44:58,921 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:44:58,923 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-17 00:44:58,958 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-10-17 00:44:58,961 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f17e74f2790> has no local changes
2025-10-17 00:44:58,961 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

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

Merged PRs:
  - PR 14 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'

Generated by OMERO-plugins-push#560 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/)'
2025-10-17 00:44:58,966 [     scc.git] DEBUG [detached HEAD ebb55cb] merge master -Dorg -Ssuccess-only
2025-10-17 00:44:58,966 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:44:58,966 [    scc.repo] DEBUG ## PRs found:
2025-10-17 00:44:59,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-10-17 00:44:59,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/22 HTTP/1.1" 200 None
2025-10-17 00:44:59,933 [    scc.repo] DEBUG   # ... Include label: dependencies
2025-10-17 00:45:00,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/2ee819462af52bf2878fadf06d6ebdbafb8f1902 HTTP/1.1" 200 None
2025-10-17 00:45:00,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/2ee819462af52bf2878fadf06d6ebdbafb8f1902/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-17 00:45:01,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/2ee819462af52bf2878fadf06d6ebdbafb8f1902/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-17 00:45:02,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/2ee819462af52bf2878fadf06d6ebdbafb8f1902 HTTP/1.1" 200 None
2025-10-17 00:45:02,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/2ee819462af52bf2878fadf06d6ebdbafb8f1902?per_page=1 HTTP/1.1" 200 2
2025-10-17 00:45:02,515 [    scc.repo] DEBUG   - PR 22 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-17 00:45:02,515 [    scc.repo] DEBUG ## Branches found:
2025-10-17 00:45:02,515 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-10-17 00:45:02,515 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:45:02,515 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:02,518 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-17 00:45:02,520 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-17 00:45:02,520 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-17 00:45:02,523 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-17 00:45:02,530 [     scc.git] DEBUG Updating deab817..160d894

2025-10-17 00:45:03,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls/20 HTTP/1.1" 200 None
2025-10-17 00:45:03,193 [     scc.git] DEBUG Calling 'git fetch origin pull/22/head'
2025-10-17 00:45:03,473 [     scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-10-17 00:45:03,473 [     scc.git] DEBUG  * branch            refs/pull/22/head -> FETCH_HEAD
2025-10-17 00:45:03,477 [     scc.git] DEBUG ## Unique users: []
2025-10-17 00:45:03,477 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:45:03,477 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:03,479 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...2ee819462af52bf2878fadf06d6ebdbafb8f1902'
2025-10-17 00:45:03,482 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:03,484 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 22 (Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows) 2ee819462af52bf2878fadf06d6ebdbafb8f1902'
2025-10-17 00:45:03,490 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-17 00:45:03,493 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 2 +-
2025-10-17 00:45:03,493 [     scc.git] DEBUG  1 file changed, 1 insertion(+), 1 deletion(-)
2025-10-17 00:45:03,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:03,669 [     scc.git] DEBUG Calling 'git submodule update'
2025-10-17 00:45:03,705 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:45:03,705 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:03,707 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-17 00:45:03,744 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-10-17 00:45:03,747 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f17e6327c50> has no local changes
2025-10-17 00:45:03,747 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-virtual-microscope
Updating deab817..160d894
Previously merged:
  - PR 20 jburel 'Build'

Merged PRs:
  - PR 22 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'

Generated by OMERO-plugins-push#560 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/)'
2025-10-17 00:45:03,752 [     scc.git] DEBUG [detached HEAD 8ead15f] merge master -Dorg -Ssuccess-only
2025-10-17 00:45:03,752 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:03,752 [     scc.git] INFO  Overriding base-branch from master to main
2025-10-17 00:45:03,752 [    scc.repo] DEBUG ## PRs found:
2025-10-17 00:45:04,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-10-17 00:45:04,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/21 HTTP/1.1" 200 None
2025-10-17 00:45:05,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/21/comments HTTP/1.1" 200 None
2025-10-17 00:45:05,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/d07067753650282c9e8cdbbeae37897b7ed0d4cc HTTP/1.1" 200 None
2025-10-17 00:45:06,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/d07067753650282c9e8cdbbeae37897b7ed0d4cc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-17 00:45:06,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/d07067753650282c9e8cdbbeae37897b7ed0d4cc/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-17 00:45:07,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/d07067753650282c9e8cdbbeae37897b7ed0d4cc HTTP/1.1" 200 None
2025-10-17 00:45:07,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/d07067753650282c9e8cdbbeae37897b7ed0d4cc?per_page=1 HTTP/1.1" 200 2
2025-10-17 00:45:07,688 [    scc.repo] DEBUG   - PR 21 will-moore 'Web zarr import'
2025-10-17 00:45:08,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-10-17 00:45:08,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-10-17 00:45:09,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-10-17 00:45:09,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-10-17 00:45:10,073 [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-10-17 00:45:10,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-10-17 00:45:11,010 [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-10-17 00:45:11,010 [    scc.repo] DEBUG   - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-10-17 00:45:11,011 [    scc.repo] DEBUG ## Branches found:
2025-10-17 00:45:11,011 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-10-17 00:45:11,011 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:45:11,011 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:11,013 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-10-17 00:45:11,015 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-17 00:45:11,015 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-10-17 00:45:11,018 [     scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-10-17 00:45:11,024 [     scc.git] DEBUG Updating 8f3c313..00e0207

2025-10-17 00:45:11,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls/20 HTTP/1.1" 200 None
2025-10-17 00:45:11,775 [     scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-10-17 00:45:12,053 [     scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-10-17 00:45:12,054 [     scc.git] DEBUG  * branch            refs/pull/10/head -> FETCH_HEAD
2025-10-17 00:45:12,058 [     scc.git] DEBUG Calling 'git fetch origin pull/21/head'
2025-10-17 00:45:12,333 [     scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-10-17 00:45:12,333 [     scc.git] DEBUG  * branch            refs/pull/21/head -> FETCH_HEAD
2025-10-17 00:45:12,337 [     scc.git] DEBUG ## Unique users: []
2025-10-17 00:45:12,337 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:45:12,337 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:12,339 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-10-17 00:45:12,342 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:12,344 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-10-17 00:45:12,351 [     scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-10-17 00:45:12,351 [     scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-10-17 00:45:12,351 [     scc.git] DEBUG Auto-merging omero_web_zarr/views.py
2025-10-17 00:45:12,351 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-10-17 00:45:12,352 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-10-17 00:45:12,354 [     scc.git] DEBUG Calling 'git reset --hard 00e02072dc29b04eba14c080ca8a0175a1499c15'
2025-10-17 00:45:12,357 [     scc.git] DEBUG HEAD is now at 00e0207 Merge pull request #20 from will-moore/zarr_python_v3
2025-10-17 00:45:12,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:12,506 [     scc.git] DEBUG Calling 'git merge-base 00e02072dc29b04eba14c080ca8a0175a1499c15 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-10-17 00:45:12,509 [     scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..00e02072dc29b04eba14c080ca8a0175a1499c15'
2025-10-17 00:45:12,511 [     scc.git] INFO    - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#560](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - omero_web_zarr/urls.py

--conflicts

2025-10-17 00:45:12,513 [  scc.config] DEBUG Found github.token
2025-10-17 00:45:12,513 [     scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-10-17 00:45:12,513 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...d07067753650282c9e8cdbbeae37897b7ed0d4cc'
2025-10-17 00:45:12,516 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:12,518 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 21 (Web zarr import) d07067753650282c9e8cdbbeae37897b7ed0d4cc'
2025-10-17 00:45:12,525 [     scc.git] DEBUG Auto-merging omero_web_zarr/views.py
2025-10-17 00:45:12,526 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-17 00:45:12,529 [     scc.git] DEBUG  README.rst                                         |   3 +
2025-10-17 00:45:12,529 [     scc.git] DEBUG  .../templates/omero_web_zarr/zarr_import.html      | 358 +++++++++++++++++++++
2025-10-17 00:45:12,529 [     scc.git] DEBUG  omero_web_zarr/urls.py                             |   2 +
2025-10-17 00:45:12,529 [     scc.git] DEBUG  omero_web_zarr/views.py                            |  43 ++-
2025-10-17 00:45:12,529 [     scc.git] DEBUG  setup.py                                           |   5 +-
2025-10-17 00:45:12,529 [     scc.git] DEBUG  5 files changed, 409 insertions(+), 2 deletions(-)
2025-10-17 00:45:12,529 [     scc.git] DEBUG  create mode 100644 omero_web_zarr/templates/omero_web_zarr/zarr_import.html
2025-10-17 00:45:12,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:12,907 [     scc.git] DEBUG Calling 'git submodule update'
2025-10-17 00:45:12,943 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:45:12,943 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:12,945 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-17 00:45:12,980 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-10-17 00:45:12,983 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f17e62d2710> has no local changes
2025-10-17 00:45:12,983 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

Repository: ome/omero-web-zarr
Excluded PRs:
  - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Updating 8f3c313..00e0207
Previously merged:
  - PR 20 will-moore 'Use zarr_format=2 for .zarray and chunk endpoints'

Merged PRs:
  - PR 21 will-moore 'Web zarr import'

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

Generated by OMERO-plugins-push#560 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/)'
2025-10-17 00:45:12,988 [     scc.git] DEBUG [detached HEAD 80b7489] merge master -Dorg -Ssuccess-only
2025-10-17 00:45:12,988 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:12,988 [    scc.repo] DEBUG ## PRs found:
2025-10-17 00:45:13,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 None
2025-10-17 00:45:14,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/issues/25 HTTP/1.1" 200 None
2025-10-17 00:45:14,714 [    scc.repo] DEBUG   # ... Include label: dependencies
2025-10-17 00:45:15,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/commits/c73bedb717b9ecce0af666245d3486aa5a2dafe9 HTTP/1.1" 200 None
2025-10-17 00:45:15,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/commits/c73bedb717b9ecce0af666245d3486aa5a2dafe9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-17 00:45:16,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/commits/c73bedb717b9ecce0af666245d3486aa5a2dafe9/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-17 00:45:16,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/commits/c73bedb717b9ecce0af666245d3486aa5a2dafe9 HTTP/1.1" 200 None
2025-10-17 00:45:17,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/statuses/c73bedb717b9ecce0af666245d3486aa5a2dafe9?per_page=1 HTTP/1.1" 200 2
2025-10-17 00:45:17,279 [    scc.repo] DEBUG   - PR 25 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-17 00:45:17,279 [    scc.repo] DEBUG ## Branches found:
2025-10-17 00:45:17,279 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-10-17 00:45:17,279 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:45:17,279 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:17,282 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-17 00:45:17,284 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-17 00:45:17,284 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-17 00:45:17,286 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-17 00:45:17,289 [     scc.git] DEBUG Already up to date.

2025-10-17 00:45:17,289 [     scc.git] DEBUG Calling 'git fetch origin pull/25/head'
2025-10-17 00:45:17,584 [     scc.git] DEBUG From https://github.com/openmicroscopy/omero-weberror
2025-10-17 00:45:17,584 [     scc.git] DEBUG  * branch            refs/pull/25/head -> FETCH_HEAD
2025-10-17 00:45:17,588 [     scc.git] DEBUG ## Unique users: []
2025-10-17 00:45:17,588 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:45:17,588 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:17,590 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...c73bedb717b9ecce0af666245d3486aa5a2dafe9'
2025-10-17 00:45:17,593 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:17,594 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 25 (Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows) c73bedb717b9ecce0af666245d3486aa5a2dafe9'
2025-10-17 00:45:17,601 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-17 00:45:17,603 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 2 +-
2025-10-17 00:45:17,603 [     scc.git] DEBUG  1 file changed, 1 insertion(+), 1 deletion(-)
2025-10-17 00:45:17,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:17,741 [     scc.git] DEBUG Calling 'git submodule update'
2025-10-17 00:45:17,777 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:45:17,777 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:17,779 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-17 00:45:17,814 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-10-17 00:45:17,817 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f17e63a1310> has no local changes
2025-10-17 00:45:17,817 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

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

Merged PRs:
  - PR 25 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'

Generated by OMERO-plugins-push#560 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/)'
2025-10-17 00:45:17,822 [     scc.git] DEBUG [detached HEAD ea90593] merge master -Dorg -Ssuccess-only
2025-10-17 00:45:17,823 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:17,823 [    scc.repo] DEBUG ## PRs found:
2025-10-17 00:45:18,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 None
2025-10-17 00:45:18,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/issues/37 HTTP/1.1" 200 None
2025-10-17 00:45:18,749 [    scc.repo] DEBUG   # ... Include label: dependencies
2025-10-17 00:45:19,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/commits/8cf5f7e65ae8e945b134e41e77bc13a785aff478 HTTP/1.1" 200 None
2025-10-17 00:45:19,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/commits/8cf5f7e65ae8e945b134e41e77bc13a785aff478/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-17 00:45:20,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/commits/8cf5f7e65ae8e945b134e41e77bc13a785aff478/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-17 00:45:20,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/commits/8cf5f7e65ae8e945b134e41e77bc13a785aff478 HTTP/1.1" 200 None
2025-10-17 00:45:21,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/statuses/8cf5f7e65ae8e945b134e41e77bc13a785aff478?per_page=1 HTTP/1.1" 200 2
2025-10-17 00:45:21,309 [    scc.repo] DEBUG   - PR 37 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-17 00:45:21,309 [    scc.repo] DEBUG ## Branches found:
2025-10-17 00:45:21,309 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-10-17 00:45:21,309 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:45:21,309 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:21,311 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-17 00:45:21,313 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-17 00:45:21,314 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-17 00:45:21,316 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-17 00:45:21,319 [     scc.git] DEBUG Already up to date.

2025-10-17 00:45:21,319 [     scc.git] DEBUG Calling 'git fetch origin pull/37/head'
2025-10-17 00:45:21,622 [     scc.git] DEBUG From https://github.com/openmicroscopy/omero-webtest
2025-10-17 00:45:21,622 [     scc.git] DEBUG  * branch            refs/pull/37/head -> FETCH_HEAD
2025-10-17 00:45:21,626 [     scc.git] DEBUG ## Unique users: []
2025-10-17 00:45:21,626 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:45:21,626 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:21,628 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...8cf5f7e65ae8e945b134e41e77bc13a785aff478'
2025-10-17 00:45:21,631 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:21,633 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 37 (Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows) 8cf5f7e65ae8e945b134e41e77bc13a785aff478'
2025-10-17 00:45:21,640 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-17 00:45:21,642 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 2 +-
2025-10-17 00:45:21,642 [     scc.git] DEBUG  1 file changed, 1 insertion(+), 1 deletion(-)
2025-10-17 00:45:21,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:21,795 [     scc.git] DEBUG Calling 'git submodule update'
2025-10-17 00:45:21,832 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:45:21,832 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:21,834 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-17 00:45:21,870 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-10-17 00:45:21,873 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f17e41a28d0> has no local changes
2025-10-17 00:45:21,873 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

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

Merged PRs:
  - PR 37 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'

Generated by OMERO-plugins-push#560 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/)'
2025-10-17 00:45:21,878 [     scc.git] DEBUG [detached HEAD 124cb86] merge master -Dorg -Ssuccess-only
2025-10-17 00:45:21,878 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:21,878 [    scc.repo] DEBUG ## PRs found:
2025-10-17 00:45:22,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-10-17 00:45:22,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-10-17 00:45:23,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-10-17 00:45:23,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-10-17 00:45:24,193 [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-10-17 00:45:24,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-10-17 00:45:25,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-10-17 00:45:25,142 [    scc.repo] DEBUG   - PR 100 dominikl 'Run tests properly'
2025-10-17 00:45:25,142 [    scc.repo] DEBUG ## Branches found:
2025-10-17 00:45:25,142 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-10-17 00:45:25,142 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:45:25,142 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:25,144 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-17 00:45:25,146 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-17 00:45:25,146 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-17 00:45:25,149 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-17 00:45:25,151 [     scc.git] DEBUG Already up to date.

2025-10-17 00:45:25,151 [     scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-10-17 00:45:25,439 [     scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-10-17 00:45:25,439 [     scc.git] DEBUG  * branch            refs/pull/100/head -> FETCH_HEAD
2025-10-17 00:45:25,443 [     scc.git] DEBUG ## Unique users: []
2025-10-17 00:45:25,443 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:45:25,444 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:25,446 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-10-17 00:45:25,448 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:25,450 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-10-17 00:45:25,458 [     scc.git] DEBUG Auto-merging Dockerfile
2025-10-17 00:45:25,458 [     scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-10-17 00:45:25,458 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-10-17 00:45:25,459 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-10-17 00:45:25,461 [     scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-10-17 00:45:25,465 [     scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-10-17 00:45:25,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:25,609 [     scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-10-17 00:45:25,612 [     scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-10-17 00:45:25,614 [     scc.git] INFO    - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#560](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - Dockerfile

--conflicts

2025-10-17 00:45:25,616 [  scc.config] DEBUG Found github.token
2025-10-17 00:45:25,616 [     scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-10-17 00:45:25,616 [     scc.git] DEBUG Calling 'git submodule update'
2025-10-17 00:45:25,652 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:45:25,652 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:25,654 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-17 00:45:25,690 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-10-17 00:45:25,693 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f17e639f610> has no local changes
2025-10-17 00:45:25,693 [     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#560 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/)'
2025-10-17 00:45:25,699 [     scc.git] DEBUG [detached HEAD cc1cfc7] merge master -Dorg -Ssuccess-only
2025-10-17 00:45:25,699 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:25,699 [     scc.git] INFO  Overriding base-branch from master to develop
2025-10-17 00:45:25,699 [    scc.repo] DEBUG ## PRs found:
2025-10-17 00:45:26,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-10-17 00:45:26,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-10-17 00:45:27,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-10-17 00:45:27,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-10-17 00:45:28,110 [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-10-17 00:45:28,602 [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-10-17 00:45:29,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-10-17 00:45:29,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-10-17 00:45:29,449 [    scc.repo] DEBUG   - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-10-17 00:45:29,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-10-17 00:45:30,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-10-17 00:45:30,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-10-17 00:45:31,340 [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-10-17 00:45:31,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-10-17 00:45:32,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-10-17 00:45:32,215 [    scc.repo] DEBUG   - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-10-17 00:45:32,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-10-17 00:45:33,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-10-17 00:45:33,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-10-17 00:45:34,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-10-17 00:45:34,160 [    scc.repo] DEBUG ## Branches found:
2025-10-17 00:45:34,160 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-10-17 00:45:34,160 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:45:34,160 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:34,162 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-10-17 00:45:34,164 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-17 00:45:34,164 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-10-17 00:45:34,167 [     scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-10-17 00:45:34,176 [     scc.git] DEBUG Updating 4b4c755..03b9116

2025-10-17 00:45:35,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/228 HTTP/1.1" 200 None
2025-10-17 00:45:35,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/227 HTTP/1.1" 200 None
2025-10-17 00:45:36,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-10-17 00:45:36,397 [     scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-10-17 00:45:36,748 [     scc.git] DEBUG From https://github.com/ome/scripts
2025-10-17 00:45:36,748 [     scc.git] DEBUG  * branch            refs/pull/202/head -> FETCH_HEAD
2025-10-17 00:45:36,751 [     scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-10-17 00:45:37,059 [     scc.git] DEBUG From https://github.com/ome/scripts
2025-10-17 00:45:37,059 [     scc.git] DEBUG  * branch            refs/pull/223/head -> FETCH_HEAD
2025-10-17 00:45:37,063 [     scc.git] DEBUG ## Unique users: []
2025-10-17 00:45:37,063 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:45:37,063 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:37,065 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-10-17 00:45:37,070 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:37,072 [     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-10-17 00:45:37,082 [     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-10-17 00:45:37,082 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-10-17 00:45:37,082 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-10-17 00:45:37,084 [     scc.git] DEBUG Calling 'git reset --hard 03b9116196e1a799dd18a666559613d912be01a5'
2025-10-17 00:45:37,088 [     scc.git] DEBUG HEAD is now at 03b9116 Merge pull request #228 from ome/dependabot/github_actions/dot-github/workflows/pypa/gh-action-pypi-publish-1.13.0
2025-10-17 00:45:37,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:37,243 [     scc.git] DEBUG Calling 'git merge-base 03b9116196e1a799dd18a666559613d912be01a5 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-10-17 00:45:37,248 [     scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..03b9116196e1a799dd18a666559613d912be01a5'
2025-10-17 00:45:37,251 [     scc.git] INFO    - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#560](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - omero/annotation_scripts/KeyVal_to_csv.py

--conflicts

2025-10-17 00:45:37,253 [  scc.config] DEBUG Found github.token
2025-10-17 00:45:37,253 [     scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-10-17 00:45:37,253 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-10-17 00:45:37,257 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:37,259 [     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-10-17 00:45:37,267 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-17 00:45:37,270 [     scc.git] DEBUG  omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-10-17 00:45:37,270 [     scc.git] DEBUG  1 file changed, 8 insertions(+), 1 deletion(-)
2025-10-17 00:45:37,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:37,633 [     scc.git] DEBUG Calling 'git submodule update'
2025-10-17 00:45:37,670 [     scc.git] DEBUG Get sha1 of %s
2025-10-17 00:45:37,670 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-17 00:45:37,672 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-17 00:45:37,707 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-10-17 00:45:37,710 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f17e6322f10> has no local changes
2025-10-17 00:45:37,710 [     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..03b9116
Previously merged:
  - PR 228 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.3.0 to 1.13.0 in /.github/workflows'
  - PR 227 jburel 'Replace tostring by tobytes'
  - 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#560 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/)'
2025-10-17 00:45:37,716 [     scc.git] DEBUG [detached HEAD 067d86e] merge master -Dorg -Ssuccess-only
2025-10-17 00:45:37,717 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:37,717 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-17 00:45:37,783 [  scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-10-17 00:45:38,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:38,044 [  scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-10-17 00:45:38,045 [  scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-10-17 00:45:38,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:38,445 [  scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-10-17 00:45:38,447 [  scc.config] DEBUG Found submodule.omero-cli-render.url
2025-10-17 00:45:38,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:38,852 [  scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-10-17 00:45:38,854 [  scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-10-17 00:45:39,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:39,245 [  scc.config] DEBUG Found submodule.omero-figure.url
2025-10-17 00:45:39,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:39,644 [  scc.config] DEBUG Found submodule.omero-figure.branch
2025-10-17 00:45:39,646 [  scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-10-17 00:45:40,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:40,046 [  scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-10-17 00:45:40,048 [  scc.config] DEBUG Found submodule.omero-gallery.url
2025-10-17 00:45:40,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:40,441 [  scc.config] DEBUG Found submodule.omero-gallery.branch
2025-10-17 00:45:40,443 [  scc.config] DEBUG Found submodule.omero-iviewer.url
2025-10-17 00:45:40,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:40,835 [  scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-10-17 00:45:40,837 [  scc.config] DEBUG Found submodule.omero-mapr.url
2025-10-17 00:45:41,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:41,227 [  scc.config] DEBUG Found submodule.omero-mapr.branch
2025-10-17 00:45:41,229 [  scc.config] DEBUG Found submodule.omero-metadata.url
2025-10-17 00:45:41,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:41,687 [  scc.config] DEBUG Found submodule.omero-metadata.branch
2025-10-17 00:45:41,689 [  scc.config] DEBUG Found submodule.omero-parade.url
2025-10-17 00:45:42,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:42,090 [  scc.config] DEBUG Found submodule.omero-parade.branch
2025-10-17 00:45:42,092 [  scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-10-17 00:45:42,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:42,498 [  scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-10-17 00:45:42,500 [  scc.config] DEBUG Found submodule.omero-rois.url
2025-10-17 00:45:42,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:42,887 [  scc.config] DEBUG Found submodule.omero-signup.url
2025-10-17 00:45:43,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:43,281 [  scc.config] DEBUG Found submodule.omero-test-infra.url
2025-10-17 00:45:43,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:43,681 [  scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-10-17 00:45:43,683 [  scc.config] DEBUG Found submodule.omero-upload.url
2025-10-17 00:45:44,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:44,088 [  scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-10-17 00:45:44,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:44,489 [  scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-10-17 00:45:44,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:44,875 [  scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-10-17 00:45:44,877 [  scc.config] DEBUG Found submodule.omero-weberror.url
2025-10-17 00:45:45,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:45,274 [  scc.config] DEBUG Found submodule.omero-weberror.branch
2025-10-17 00:45:45,275 [  scc.config] DEBUG Found submodule.omero-webtest.url
2025-10-17 00:45:45,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:45,666 [  scc.config] DEBUG Found submodule.omero-webtest.branch
2025-10-17 00:45:45,668 [  scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-10-17 00:45:46,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:46,068 [  scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-10-17 00:45:46,070 [  scc.config] DEBUG Found submodule.scripts.url
2025-10-17 00:45:46,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-17 00:45:46,469 [  scc.config] DEBUG Found submodule.scripts.branch
2025-10-17 00:45:46,470 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-10-17 00:45:46,546 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f17e74d6850> has local changes
2025-10-17 00:45:46,546 [     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.

Merged PRs:
  - PR 29 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'

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'
  - PR 71 dominikl 'Escape slash character in image names'
  - PR 73 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'

Repository: ome/omero-cli-zarr
Excluded PRs:
  - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
  - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
  - PR 167 dominikl 'Add extinfo command' (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..37ea700
Previously merged:
  - PR 180 will-moore 'Import command'
  - PR 179 will-moore 'Changelog 0.6.0'
  - PR 177 jburel 'Replace fromstring by frombuffer'
  - PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
  - PR 147 will-moore 'Name option'
  - PR 173 will-moore 'Add test_export_plate_polygons()'
  - PR 171 will-moore 'Initial addition of integration tests'
  - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'

Merged PRs:
  - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py'

Conflicting PRs (not included):
  - PR 174 will-moore 'Skip wells'
  - PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
  - PR 181 will-moore 'Add labels support for import'
  - PR 182 will-moore 'Revert "Remove support for Plate import"'

Repository: ome/omero-figure
Excluded PRs:
  - PR 641 Rdornier 'OMERO ROIs improvements : filtering visible and adding all' (user: Rdornier)
  - PR 619 will-moore 'OME-Zarr support' (stage: draft)
  - PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..baab5c06
Previously merged:
  - PR 612 will-moore 'Script version'
  - PR 630 will-moore 'Fix color and position for ALL new panel insets'
  - PR 616 Rdornier 'Fix labels around border'
  - PR 605 Tom-TBT 'Colorbar feature'
  - PR 638 Rdornier 'Fix arrow opacity'
  - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
  - PR 635 dependabot[bot] 'Bump esbuild and vite'
  - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
  - 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 610 will-moore 'Add docs/contributing.rst'
  - PR 642 dependabot[bot] 'Bump vite from 6.2.6 to 6.3.6'

Conflicting PRs (not included):
  - PR 637 Rdornier 'Fix scalebar position'
  - PR 643 Rdornier 'Shape scaling'

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

Merged PRs:
  - PR 18 jburel 'default  size z value'
  - PR 31 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'

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 508 will-moore 'Broadcast channel demo' (stage: draft)
  - PR 503 will-moore 'Basic working tile-coordinates grid 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)
Updating 7a798ce..bb94cf8
Previously merged:
  - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'

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'

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'

Conflicting PRs (not included):
  - PR 95 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'

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.

Merged PRs:
  - PR 16 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'

Repository: ome/omero-rois
Excluded PRs:
  - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.

Merged PRs:
  - PR 33 jo-mueller 'Add roi to array functions'
  - PR 34 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'

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

Merged PRs:
  - PR 22 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'

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.

Merged PRs:
  - PR 14 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'

Repository: ome/omero-virtual-microscope
Updating deab817..160d894
Previously merged:
  - PR 20 jburel 'Build'

Merged PRs:
  - PR 22 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'

Repository: ome/omero-web-zarr
Excluded PRs:
  - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Updating 8f3c313..00e0207
Previously merged:
  - PR 20 will-moore 'Use zarr_format=2 for .zarray and chunk endpoints'

Merged PRs:
  - PR 21 will-moore 'Web zarr import'

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

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

Merged PRs:
  - PR 25 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'

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

Merged PRs:
  - PR 37 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'

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..03b9116
Previously merged:
  - PR 228 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.3.0 to 1.13.0 in /.github/workflows'
  - PR 227 jburel 'Replace tostring by tobytes'
  - 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#560 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/560/)'
2025-10-17 00:45:46,556 [     scc.git] DEBUG [detached HEAD 23983c3] merge master -Dorg -Ssuccess-only
2025-10-17 00:45:46,556 [     scc.git] DEBUG  23 files changed, 44 insertions(+), 44 deletions(-)
2025-10-17 00:45:46,556 [   scc.merge] INFO  Repository: ome/omero-plugins
2025-10-17 00:45:46,556 [   scc.merge] INFO  Already up to date.
2025-10-17 00:45:46,556 [   scc.merge] INFO  
2025-10-17 00:45:46,556 [   scc.merge] INFO  Merged PRs:
2025-10-17 00:45:46,556 [   scc.merge] INFO    - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-10-17 00:45:46,556 [   scc.merge] INFO    - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-10-17 00:45:46,556 [   scc.merge] INFO    - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-10-17 00:45:46,556 [   scc.merge] INFO  
2025-10-17 00:45:46,556 [   scc.merge] INFO  Repository: ome/minimal-omero-client
2025-10-17 00:45:46,556 [   scc.merge] INFO  Already up to date.
2025-10-17 00:45:46,556 [   scc.merge] INFO  
2025-10-17 00:45:46,556 [   scc.merge] INFO  
2025-10-17 00:45:46,556 [   scc.merge] INFO  Repository: ome/omero-cli-duplicate
2025-10-17 00:45:46,556 [   scc.merge] INFO  Excluded PRs:
2025-10-17 00:45:46,556 [   scc.merge] INFO    - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-10-17 00:45:46,556 [   scc.merge] INFO  Already up to date.
2025-10-17 00:45:46,556 [   scc.merge] INFO  
2025-10-17 00:45:46,556 [   scc.merge] INFO  Merged PRs:
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 29 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-17 00:45:46,557 [   scc.merge] INFO  
2025-10-17 00:45:46,557 [   scc.merge] INFO  Repository: ome/omero-cli-render
2025-10-17 00:45:46,557 [   scc.merge] INFO  Excluded PRs:
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-10-17 00:45:46,557 [   scc.merge] INFO  Already up to date.
2025-10-17 00:45:46,557 [   scc.merge] INFO  
2025-10-17 00:45:46,557 [   scc.merge] INFO  Merged PRs:
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 59 will-moore 'Apply settings to Plate'
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 69 dominikl 'Fix help text for impo/export commands'
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 71 dominikl 'Escape slash character in image names'
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 73 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-17 00:45:46,557 [   scc.merge] INFO  
2025-10-17 00:45:46,557 [   scc.merge] INFO  Repository: ome/omero-cli-zarr
2025-10-17 00:45:46,557 [   scc.merge] INFO  Excluded PRs:
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-10-17 00:45:46,557 [   scc.merge] INFO  Updating 11d3587..37ea700
2025-10-17 00:45:46,557 [   scc.merge] INFO  Previously merged:
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 180 will-moore 'Import command'
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 179 will-moore 'Changelog 0.6.0'
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 177 jburel 'Replace fromstring by frombuffer'
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 147 will-moore 'Name option'
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 173 will-moore 'Add test_export_plate_polygons()'
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 171 will-moore 'Initial addition of integration tests'
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-10-17 00:45:46,557 [   scc.merge] INFO  
2025-10-17 00:45:46,557 [   scc.merge] INFO  Merged PRs:
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py'
2025-10-17 00:45:46,557 [   scc.merge] INFO  
2025-10-17 00:45:46,557 [   scc.merge] INFO  Conflicting PRs (not included):
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 174 will-moore 'Skip wells'
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 181 will-moore 'Add labels support for import'
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 182 will-moore 'Revert "Remove support for Plate import"'
2025-10-17 00:45:46,557 [   scc.merge] INFO  
2025-10-17 00:45:46,557 [   scc.merge] INFO  Repository: ome/omero-figure
2025-10-17 00:45:46,557 [   scc.merge] INFO  Excluded PRs:
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 641 Rdornier 'OMERO ROIs improvements : filtering visible and adding all' (user: Rdornier)
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-10-17 00:45:46,557 [   scc.merge] INFO    - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-10-17 00:45:46,557 [   scc.merge] INFO  Updating 9cc36cde..baab5c06
2025-10-17 00:45:46,557 [   scc.merge] INFO  Previously merged:
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 612 will-moore 'Script version'
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 616 Rdornier 'Fix labels around border'
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 605 Tom-TBT 'Colorbar feature'
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 638 Rdornier 'Fix arrow opacity'
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-10-17 00:45:46,558 [   scc.merge] INFO  
2025-10-17 00:45:46,558 [   scc.merge] INFO  Merged PRs:
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 600 Rdornier 'Label on rois'
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 610 will-moore 'Add docs/contributing.rst'
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 642 dependabot[bot] 'Bump vite from 6.2.6 to 6.3.6'
2025-10-17 00:45:46,558 [   scc.merge] INFO  
2025-10-17 00:45:46,558 [   scc.merge] INFO  Conflicting PRs (not included):
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 637 Rdornier 'Fix scalebar position'
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 643 Rdornier 'Shape scaling'
2025-10-17 00:45:46,558 [   scc.merge] INFO  
2025-10-17 00:45:46,558 [   scc.merge] INFO  Repository: ome/omero-fpbioimage
2025-10-17 00:45:46,558 [   scc.merge] INFO  Already up to date.
2025-10-17 00:45:46,558 [   scc.merge] INFO  
2025-10-17 00:45:46,558 [   scc.merge] INFO  Merged PRs:
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 18 jburel 'default  size z value'
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 31 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-17 00:45:46,558 [   scc.merge] INFO  
2025-10-17 00:45:46,558 [   scc.merge] INFO  Repository: ome/omero-gallery
2025-10-17 00:45:46,558 [   scc.merge] INFO  Already up to date.
2025-10-17 00:45:46,558 [   scc.merge] INFO  
2025-10-17 00:45:46,558 [   scc.merge] INFO  Merged PRs:
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-10-17 00:45:46,558 [   scc.merge] INFO  
2025-10-17 00:45:46,558 [   scc.merge] INFO  Conflicting PRs (not included):
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-10-17 00:45:46,558 [   scc.merge] INFO  
2025-10-17 00:45:46,558 [   scc.merge] INFO  Repository: ome/omero-iviewer
2025-10-17 00:45:46,558 [   scc.merge] INFO  Excluded PRs:
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 508 will-moore 'Broadcast channel demo' (stage: draft)
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 503 will-moore 'Basic working tile-coordinates grid shown over the image' (stage: draft)
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-10-17 00:45:46,558 [   scc.merge] INFO    - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-10-17 00:45:46,558 [   scc.merge] INFO  Updating 7a798ce..bb94cf8
2025-10-17 00:45:46,558 [   scc.merge] INFO  Previously merged:
2025-10-17 00:45:46,559 [   scc.merge] INFO    - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-10-17 00:45:46,559 [   scc.merge] INFO  
2025-10-17 00:45:46,559 [   scc.merge] INFO  Merged PRs:
2025-10-17 00:45:46,559 [   scc.merge] INFO    - PR 460 will-moore 'Channel min spinner fix'
2025-10-17 00:45:46,559 [   scc.merge] INFO    - PR 465 will-moore 'Save as Figure'
2025-10-17 00:45:46,559 [   scc.merge] INFO    - PR 471 will-moore 'Z projection disabled tooltip'
2025-10-17 00:45:46,559 [   scc.merge] INFO    - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-10-17 00:45:46,559 [   scc.merge] INFO  
2025-10-17 00:45:46,559 [   scc.merge] INFO  Conflicting PRs (not included):
2025-10-17 00:45:46,559 [   scc.merge] INFO    - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-10-17 00:45:46,559 [   scc.merge] INFO  
2025-10-17 00:45:46,559 [   scc.merge] INFO  Repository: ome/omero-mapr
2025-10-17 00:45:46,559 [   scc.merge] INFO  Excluded PRs:
2025-10-17 00:45:46,559 [   scc.merge] INFO    - PR 79 will-moore 'Right panel title' (exclude comment)
2025-10-17 00:45:46,559 [   scc.merge] INFO  Already up to date.
2025-10-17 00:45:46,559 [   scc.merge] INFO  
2025-10-17 00:45:46,559 [   scc.merge] INFO  Merged PRs:
2025-10-17 00:45:46,559 [   scc.merge] INFO    - PR 74 will-moore 'mapr extension of webclient'
2025-10-17 00:45:46,559 [   scc.merge] INFO    - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-10-17 00:45:46,559 [   scc.merge] INFO  
2025-10-17 00:45:46,559 [   scc.merge] INFO  Conflicting PRs (not included):
2025-10-17 00:45:46,559 [   scc.merge] INFO    - PR 95 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-17 00:45:46,559 [   scc.merge] INFO  
2025-10-17 00:45:46,559 [   scc.merge] INFO  Repository: ome/omero-metadata
2025-10-17 00:45:46,559 [   scc.merge] INFO  Updating 3cd120c..55060a2
2025-10-17 00:45:46,559 [   scc.merge] INFO  Previously merged:
2025-10-17 00:45:46,559 [   scc.merge] INFO    - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-10-17 00:45:46,559 [   scc.merge] INFO  
2025-10-17 00:45:46,559 [   scc.merge] INFO  Conflicting PRs (not included):
2025-10-17 00:45:46,559 [   scc.merge] INFO    - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-10-17 00:45:46,559 [   scc.merge] INFO    - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-10-17 00:45:46,559 [   scc.merge] INFO  
2025-10-17 00:45:46,559 [   scc.merge] INFO  Repository: ome/omero-parade
2025-10-17 00:45:46,559 [   scc.merge] INFO  Excluded PRs:
2025-10-17 00:45:46,559 [   scc.merge] INFO    - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-10-17 00:45:46,559 [   scc.merge] INFO    - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-10-17 00:45:46,559 [   scc.merge] INFO    - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-10-17 00:45:46,559 [   scc.merge] INFO    - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-10-17 00:45:46,559 [   scc.merge] INFO  Already up to date.
2025-10-17 00:45:46,559 [   scc.merge] INFO  
2025-10-17 00:45:46,559 [   scc.merge] INFO  Merged PRs:
2025-10-17 00:45:46,559 [   scc.merge] INFO    - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-10-17 00:45:46,559 [   scc.merge] INFO    - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-10-17 00:45:46,559 [   scc.merge] INFO    - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-10-17 00:45:46,559 [   scc.merge] INFO  
2025-10-17 00:45:46,559 [   scc.merge] INFO  Repository: ome/omero-prometheus-tools
2025-10-17 00:45:46,559 [   scc.merge] INFO  Already up to date.
2025-10-17 00:45:46,559 [   scc.merge] INFO  
2025-10-17 00:45:46,559 [   scc.merge] INFO  Merged PRs:
2025-10-17 00:45:46,559 [   scc.merge] INFO    - PR 16 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-17 00:45:46,560 [   scc.merge] INFO  
2025-10-17 00:45:46,560 [   scc.merge] INFO  Repository: ome/omero-rois
2025-10-17 00:45:46,560 [   scc.merge] INFO  Excluded PRs:
2025-10-17 00:45:46,560 [   scc.merge] INFO    - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-10-17 00:45:46,560 [   scc.merge] INFO  Already up to date.
2025-10-17 00:45:46,560 [   scc.merge] INFO  
2025-10-17 00:45:46,560 [   scc.merge] INFO  Merged PRs:
2025-10-17 00:45:46,560 [   scc.merge] INFO    - PR 33 jo-mueller 'Add roi to array functions'
2025-10-17 00:45:46,560 [   scc.merge] INFO    - PR 34 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-17 00:45:46,560 [   scc.merge] INFO  
2025-10-17 00:45:46,560 [   scc.merge] INFO  Repository: ome/omero-signup
2025-10-17 00:45:46,560 [   scc.merge] INFO  Already up to date.
2025-10-17 00:45:46,560 [   scc.merge] INFO  
2025-10-17 00:45:46,560 [   scc.merge] INFO  Merged PRs:
2025-10-17 00:45:46,560 [   scc.merge] INFO    - PR 22 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-17 00:45:46,560 [   scc.merge] INFO  
2025-10-17 00:45:46,560 [   scc.merge] INFO  Conflicting PRs (not included):
2025-10-17 00:45:46,560 [   scc.merge] INFO    - PR 14 manics 'Add pre-commit (black, flake8)'
2025-10-17 00:45:46,560 [   scc.merge] INFO  
2025-10-17 00:45:46,560 [   scc.merge] INFO  Repository: openmicroscopy/omero-test-infra
2025-10-17 00:45:46,560 [   scc.merge] INFO  Excluded PRs:
2025-10-17 00:45:46,560 [   scc.merge] INFO    - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-10-17 00:45:46,560 [   scc.merge] INFO    - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-10-17 00:45:46,560 [   scc.merge] INFO    - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-10-17 00:45:46,560 [   scc.merge] INFO  Already up to date.
2025-10-17 00:45:46,560 [   scc.merge] INFO  
2025-10-17 00:45:46,560 [   scc.merge] INFO  Merged PRs:
2025-10-17 00:45:46,560 [   scc.merge] INFO    - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-10-17 00:45:46,560 [   scc.merge] INFO    - PR 76 will-moore 'Run cli deps'
2025-10-17 00:45:46,560 [   scc.merge] INFO  
2025-10-17 00:45:46,560 [   scc.merge] INFO  Repository: ome/omero-upload
2025-10-17 00:45:46,560 [   scc.merge] INFO  Already up to date.
2025-10-17 00:45:46,560 [   scc.merge] INFO  
2025-10-17 00:45:46,560 [   scc.merge] INFO  Merged PRs:
2025-10-17 00:45:46,560 [   scc.merge] INFO    - PR 14 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-17 00:45:46,560 [   scc.merge] INFO  
2025-10-17 00:45:46,560 [   scc.merge] INFO  Repository: ome/omero-virtual-microscope
2025-10-17 00:45:46,560 [   scc.merge] INFO  Updating deab817..160d894
2025-10-17 00:45:46,560 [   scc.merge] INFO  Previously merged:
2025-10-17 00:45:46,560 [   scc.merge] INFO    - PR 20 jburel 'Build'
2025-10-17 00:45:46,560 [   scc.merge] INFO  
2025-10-17 00:45:46,560 [   scc.merge] INFO  Merged PRs:
2025-10-17 00:45:46,560 [   scc.merge] INFO    - PR 22 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-17 00:45:46,560 [   scc.merge] INFO  
2025-10-17 00:45:46,560 [   scc.merge] INFO  Repository: ome/omero-web-zarr
2025-10-17 00:45:46,560 [   scc.merge] INFO  Excluded PRs:
2025-10-17 00:45:46,560 [   scc.merge] INFO    - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-10-17 00:45:46,560 [   scc.merge] INFO  Updating 8f3c313..00e0207
2025-10-17 00:45:46,560 [   scc.merge] INFO  Previously merged:
2025-10-17 00:45:46,560 [   scc.merge] INFO    - PR 20 will-moore 'Use zarr_format=2 for .zarray and chunk endpoints'
2025-10-17 00:45:46,561 [   scc.merge] INFO  
2025-10-17 00:45:46,561 [   scc.merge] INFO  Merged PRs:
2025-10-17 00:45:46,561 [   scc.merge] INFO    - PR 21 will-moore 'Web zarr import'
2025-10-17 00:45:46,561 [   scc.merge] INFO  
2025-10-17 00:45:46,561 [   scc.merge] INFO  Conflicting PRs (not included):
2025-10-17 00:45:46,561 [   scc.merge] INFO    - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-10-17 00:45:46,561 [   scc.merge] INFO  
2025-10-17 00:45:46,561 [   scc.merge] INFO  Repository: openmicroscopy/omero-weberror
2025-10-17 00:45:46,561 [   scc.merge] INFO  Already up to date.
2025-10-17 00:45:46,561 [   scc.merge] INFO  
2025-10-17 00:45:46,561 [   scc.merge] INFO  Merged PRs:
2025-10-17 00:45:46,561 [   scc.merge] INFO    - PR 25 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-17 00:45:46,561 [   scc.merge] INFO  
2025-10-17 00:45:46,561 [   scc.merge] INFO  Repository: openmicroscopy/omero-webtest
2025-10-17 00:45:46,561 [   scc.merge] INFO  Already up to date.
2025-10-17 00:45:46,561 [   scc.merge] INFO  
2025-10-17 00:45:46,561 [   scc.merge] INFO  Merged PRs:
2025-10-17 00:45:46,561 [   scc.merge] INFO    - PR 37 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-17 00:45:46,561 [   scc.merge] INFO  
2025-10-17 00:45:46,561 [   scc.merge] INFO  Repository: ome/rOMERO-gateway
2025-10-17 00:45:46,561 [   scc.merge] INFO  Already up to date.
2025-10-17 00:45:46,561 [   scc.merge] INFO  
2025-10-17 00:45:46,561 [   scc.merge] INFO  Conflicting PRs (not included):
2025-10-17 00:45:46,561 [   scc.merge] INFO    - PR 100 dominikl 'Run tests properly'
2025-10-17 00:45:46,561 [   scc.merge] INFO  
2025-10-17 00:45:46,561 [   scc.merge] INFO  Repository: ome/scripts
2025-10-17 00:45:46,561 [   scc.merge] INFO  Excluded PRs:
2025-10-17 00:45:46,561 [   scc.merge] INFO    - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-10-17 00:45:46,561 [   scc.merge] INFO    - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-10-17 00:45:46,561 [   scc.merge] INFO  Updating 4b4c755..03b9116
2025-10-17 00:45:46,561 [   scc.merge] INFO  Previously merged:
2025-10-17 00:45:46,561 [   scc.merge] INFO    - PR 228 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.3.0 to 1.13.0 in /.github/workflows'
2025-10-17 00:45:46,561 [   scc.merge] INFO    - PR 227 jburel 'Replace tostring by tobytes'
2025-10-17 00:45:46,561 [   scc.merge] INFO    - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-10-17 00:45:46,561 [   scc.merge] INFO  
2025-10-17 00:45:46,561 [   scc.merge] INFO  Merged PRs:
2025-10-17 00:45:46,561 [   scc.merge] INFO    - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-10-17 00:45:46,561 [   scc.merge] INFO  
2025-10-17 00:45:46,561 [   scc.merge] INFO  Conflicting PRs (not included):
2025-10-17 00:45:46,561 [   scc.merge] INFO    - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-10-17 00:45:46,561 [   scc.merge] INFO  
2025-10-17 00:45:46,561 [   scc.merge] DEBUG Cleaning remote branches created for merging
2025-10-17 00:45:46,561 [     scc.git] DEBUG Calling 'git remote'
2025-10-17 00:45:46,563 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-10-17 00:45:46,563 [     scc.git] DEBUG Calling 'git remote'
2025-10-17 00:45:46,565 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:46,565 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-10-17 00:45:46,565 [     scc.git] DEBUG Calling 'git remote'
2025-10-17 00:45:46,567 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:46,567 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-10-17 00:45:46,567 [     scc.git] DEBUG Calling 'git remote'
2025-10-17 00:45:46,569 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:46,569 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-10-17 00:45:46,569 [     scc.git] DEBUG Calling 'git remote'
2025-10-17 00:45:46,571 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:46,571 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-10-17 00:45:46,571 [     scc.git] DEBUG Calling 'git remote'
2025-10-17 00:45:46,573 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:46,573 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-10-17 00:45:46,573 [     scc.git] DEBUG Calling 'git remote'
2025-10-17 00:45:46,575 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:46,575 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-10-17 00:45:46,575 [     scc.git] DEBUG Calling 'git remote'
2025-10-17 00:45:46,578 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:46,578 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-10-17 00:45:46,578 [     scc.git] DEBUG Calling 'git remote'
2025-10-17 00:45:46,580 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:46,580 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-10-17 00:45:46,580 [     scc.git] DEBUG Calling 'git remote'
2025-10-17 00:45:46,582 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:46,582 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-10-17 00:45:46,582 [     scc.git] DEBUG Calling 'git remote'
2025-10-17 00:45:46,584 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:46,584 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-10-17 00:45:46,584 [     scc.git] DEBUG Calling 'git remote'
2025-10-17 00:45:46,586 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:46,586 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-10-17 00:45:46,586 [     scc.git] DEBUG Calling 'git remote'
2025-10-17 00:45:46,588 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:46,588 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-10-17 00:45:46,588 [     scc.git] DEBUG Calling 'git remote'
2025-10-17 00:45:46,590 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:46,590 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-10-17 00:45:46,590 [     scc.git] DEBUG Calling 'git remote'
2025-10-17 00:45:46,592 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:46,592 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-10-17 00:45:46,592 [     scc.git] DEBUG Calling 'git remote'
2025-10-17 00:45:46,594 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:46,594 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-10-17 00:45:46,594 [     scc.git] DEBUG Calling 'git remote'
2025-10-17 00:45:46,596 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:46,596 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-10-17 00:45:46,596 [     scc.git] DEBUG Calling 'git remote'
2025-10-17 00:45:46,598 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:46,598 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-10-17 00:45:46,598 [     scc.git] DEBUG Calling 'git remote'
2025-10-17 00:45:46,600 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:46,600 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-10-17 00:45:46,600 [     scc.git] DEBUG Calling 'git remote'
2025-10-17 00:45:46,602 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:46,602 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-10-17 00:45:46,602 [     scc.git] DEBUG Calling 'git remote'
2025-10-17 00:45:46,604 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:46,604 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-10-17 00:45:46,604 [     scc.git] DEBUG Calling 'git remote'
2025-10-17 00:45:46,606 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-17 00:45:46,606 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-10-17 00:45:46,606 [     scc.git] DEBUG Calling 'git remote'
2025-10-17 00:45:46,608 [     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.4-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 dcbbe59] 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 92d728a] Update component versions
 1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-10-17 00:46:33,267 [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-10-17 00:46:42,495 [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-10-17 00:46:44,829 [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-10-17 00:46:49,612 [github.Reque] INFO  Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-10-17 00:47:29,081 [    scc.push] INFO  Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci