Skip to content

Console Output

Skipping 189 KB.. Full Log
i.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-09-29 00:30:07,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-09-29 00:30:07,004 [    scc.repo] DEBUG   - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-09-29 00:30:07,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-09-29 00:30:07,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-09-29 00:30:08,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-09-29 00:30:08,931 [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-09-29 00:30:09,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-09-29 00:30:09,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-09-29 00:30:09,793 [    scc.repo] DEBUG   - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-09-29 00:30:09,793 [    scc.repo] DEBUG ## Branches found:
2025-09-29 00:30:09,793 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-09-29 00:30:09,793 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:30:09,793 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:09,796 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-09-29 00:30:09,798 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-09-29 00:30:09,798 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-09-29 00:30:09,800 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-09-29 00:30:09,806 [     scc.git] DEBUG Updating 3cd120c..55060a2

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

--conflicts

2025-09-29 00:30:11,267 [  scc.config] DEBUG Found github.token
2025-09-29 00:30:11,267 [     scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-09-29 00:30:11,268 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-09-29 00:30:11,271 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:11,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-09-29 00:30:11,287 [     scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-09-29 00:30:11,287 [     scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-09-29 00:30:11,287 [     scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-09-29 00:30:11,287 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-09-29 00:30:11,288 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-09-29 00:30:11,290 [     scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-09-29 00:30:11,294 [     scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-09-29 00:30:11,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:30:11,654 [     scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-09-29 00:30:11,658 [     scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-09-29 00:30:11,660 [     scc.git] INFO    - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#545](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/545/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/545/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-09-29 00:30:11,662 [  scc.config] DEBUG Found github.token
2025-09-29 00:30:11,662 [     scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-09-29 00:30:11,662 [     scc.git] DEBUG Calling 'git submodule update'
2025-09-29 00:30:11,699 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:30:11,699 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:11,701 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-09-29 00:30:11,735 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-09-29 00:30:11,739 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fa84ffe4710> has no local changes
2025-09-29 00:30:11,739 [     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#545 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/545/)'
2025-09-29 00:30:11,745 [     scc.git] DEBUG [detached HEAD 2109ad4] merge master -Dorg -Ssuccess-only
2025-09-29 00:30:11,745 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:30:11,745 [    scc.repo] DEBUG ## PRs found:
2025-09-29 00:30:12,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-09-29 00:30:12,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-09-29 00:30:13,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-09-29 00:30:13,705 [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-09-29 00:30:14,179 [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-09-29 00:30:14,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-09-29 00:30:15,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-09-29 00:30:15,082 [    scc.repo] DEBUG   - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-09-29 00:30:15,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-09-29 00:30:15,576 [    scc.repo] DEBUG   # ... Include label: dependencies
2025-09-29 00:30:16,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-09-29 00:30:16,852 [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-09-29 00:30:17,355 [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-09-29 00:30:17,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-09-29 00:30:18,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-09-29 00:30:18,299 [    scc.repo] DEBUG   - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-09-29 00:30:18,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-09-29 00:30:18,769 [    scc.repo] DEBUG   # ... Include label: dependencies
2025-09-29 00:30:19,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-09-29 00:30:19,814 [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-09-29 00:30:20,354 [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-09-29 00:30:20,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-09-29 00:30:21,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-09-29 00:30:21,222 [    scc.repo] DEBUG   - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-09-29 00:30:21,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-09-29 00:30:22,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-09-29 00:30:22,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-09-29 00:30:23,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-09-29 00:30:23,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-09-29 00:30:24,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-09-29 00:30:24,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-09-29 00:30:24,482 [    scc.repo] DEBUG ## Branches found:
2025-09-29 00:30:24,482 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-09-29 00:30:24,482 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:30:24,482 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:24,485 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-09-29 00:30:24,487 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-09-29 00:30:24,487 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-09-29 00:30:24,489 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-09-29 00:30:24,492 [     scc.git] DEBUG Already up to date.

2025-09-29 00:30:24,492 [     scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-09-29 00:30:24,784 [     scc.git] DEBUG From https://github.com/ome/omero-parade
2025-09-29 00:30:24,784 [     scc.git] DEBUG  * branch            refs/pull/140/head -> FETCH_HEAD
2025-09-29 00:30:24,789 [     scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-09-29 00:30:25,068 [     scc.git] DEBUG From https://github.com/ome/omero-parade
2025-09-29 00:30:25,068 [     scc.git] DEBUG  * branch            refs/pull/141/head -> FETCH_HEAD
2025-09-29 00:30:25,073 [     scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-09-29 00:30:25,351 [     scc.git] DEBUG From https://github.com/ome/omero-parade
2025-09-29 00:30:25,352 [     scc.git] DEBUG  * branch            refs/pull/142/head -> FETCH_HEAD
2025-09-29 00:30:25,355 [     scc.git] DEBUG ## Unique users: []
2025-09-29 00:30:25,356 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:30:25,356 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:25,358 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-09-29 00:30:25,360 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:25,362 [     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-09-29 00:30:25,369 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-09-29 00:30:25,372 [     scc.git] DEBUG  package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-09-29 00:30:25,372 [     scc.git] DEBUG  package.json      |   2 +-
2025-09-29 00:30:25,372 [     scc.git] DEBUG  2 files changed, 138 insertions(+), 153 deletions(-)
2025-09-29 00:30:25,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:30:25,518 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-09-29 00:30:25,521 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:25,523 [     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-09-29 00:30:25,532 [     scc.git] DEBUG Auto-merging package-lock.json
2025-09-29 00:30:25,532 [     scc.git] DEBUG Auto-merging package.json
2025-09-29 00:30:25,532 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-09-29 00:30:25,535 [     scc.git] DEBUG  package-lock.json | 18 ++++++++++--------
2025-09-29 00:30:25,535 [     scc.git] DEBUG  package.json      |  2 +-
2025-09-29 00:30:25,535 [     scc.git] DEBUG  2 files changed, 11 insertions(+), 9 deletions(-)
2025-09-29 00:30:25,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:30:25,902 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-09-29 00:30:25,904 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:25,906 [     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-09-29 00:30:25,913 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-09-29 00:30:25,915 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 2 +-
2025-09-29 00:30:25,915 [     scc.git] DEBUG  1 file changed, 1 insertion(+), 1 deletion(-)
2025-09-29 00:30:26,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:30:26,290 [     scc.git] DEBUG Calling 'git submodule update'
2025-09-29 00:30:26,325 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:30:26,325 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:26,327 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-09-29 00:30:26,362 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-09-29 00:30:26,365 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fa84de0fa10> has no local changes
2025-09-29 00:30:26,365 [     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#545 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/545/)'
2025-09-29 00:30:26,371 [     scc.git] DEBUG [detached HEAD e883062] merge master -Dorg -Ssuccess-only
2025-09-29 00:30:26,371 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:30:26,371 [    scc.repo] DEBUG ## PRs found:
2025-09-29 00:30:26,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2025-09-29 00:30:27,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/16 HTTP/1.1" 200 None
2025-09-29 00:30:27,257 [    scc.repo] DEBUG   # ... Include label: dependencies
2025-09-29 00:30:27,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/5381b9f25e1666d81d236039a1317276291e9b2e HTTP/1.1" 200 None
2025-09-29 00:30:28,415 [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-09-29 00:30:28,907 [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-09-29 00:30:29,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/5381b9f25e1666d81d236039a1317276291e9b2e HTTP/1.1" 200 None
2025-09-29 00:30:29,802 [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-09-29 00:30:29,802 [    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-09-29 00:30:29,802 [    scc.repo] DEBUG ## Branches found:
2025-09-29 00:30:29,802 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-09-29 00:30:29,802 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:30:29,802 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:29,804 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-09-29 00:30:29,806 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-09-29 00:30:29,807 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-09-29 00:30:29,809 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-09-29 00:30:29,811 [     scc.git] DEBUG Already up to date.

2025-09-29 00:30:29,812 [     scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2025-09-29 00:30:30,099 [     scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2025-09-29 00:30:30,099 [     scc.git] DEBUG  * branch            refs/pull/16/head -> FETCH_HEAD
2025-09-29 00:30:30,102 [     scc.git] DEBUG ## Unique users: []
2025-09-29 00:30:30,103 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:30:30,103 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:30,105 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...5381b9f25e1666d81d236039a1317276291e9b2e'
2025-09-29 00:30:30,107 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:30,109 [     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-09-29 00:30:30,115 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-09-29 00:30:30,117 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 2 +-
2025-09-29 00:30:30,117 [     scc.git] DEBUG  1 file changed, 1 insertion(+), 1 deletion(-)
2025-09-29 00:30:30,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:30:30,408 [     scc.git] DEBUG Calling 'git submodule update'
2025-09-29 00:30:30,443 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:30:30,443 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:30,445 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-09-29 00:30:30,479 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-09-29 00:30:30,482 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fa84de0ff90> has no local changes
2025-09-29 00:30:30,482 [     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#545 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/545/)'
2025-09-29 00:30:30,487 [     scc.git] DEBUG [detached HEAD e39002c] merge master -Dorg -Ssuccess-only
2025-09-29 00:30:30,487 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:30:30,487 [    scc.repo] DEBUG ## PRs found:
2025-09-29 00:30:31,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-09-29 00:30:31,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/34 HTTP/1.1" 200 None
2025-09-29 00:30:31,560 [    scc.repo] DEBUG   # ... Include label: dependencies
2025-09-29 00:30:32,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/149bb248277256d589ea0db597c04739e8134301 HTTP/1.1" 200 None
2025-09-29 00:30:32,752 [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-09-29 00:30:33,271 [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-09-29 00:30:33,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/149bb248277256d589ea0db597c04739e8134301 HTTP/1.1" 200 None
2025-09-29 00:30:34,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/149bb248277256d589ea0db597c04739e8134301?per_page=1 HTTP/1.1" 200 None
2025-09-29 00:30:34,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/149bb248277256d589ea0db597c04739e8134301 HTTP/1.1" 200 None
2025-09-29 00:30:35,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/149bb248277256d589ea0db597c04739e8134301/status HTTP/1.1" 200 None
2025-09-29 00:30:35,241 [    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-09-29 00:30:35,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-09-29 00:30:36,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-09-29 00:30:36,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3 HTTP/1.1" 200 None
2025-09-29 00:30:37,165 [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-09-29 00:30:37,644 [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-09-29 00:30:38,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3 HTTP/1.1" 200 None
2025-09-29 00:30:38,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/1122baea98746effd4eb59deed25870f673ce3d3?per_page=1 HTTP/1.1" 200 None
2025-09-29 00:30:39,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3 HTTP/1.1" 200 None
2025-09-29 00:30:39,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3/status HTTP/1.1" 200 None
2025-09-29 00:30:39,668 [    scc.repo] DEBUG   - PR 33 jo-mueller 'Add roi to array functions'
2025-09-29 00:30:40,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-09-29 00:30:40,121 [    scc.repo] DEBUG ## Branches found:
2025-09-29 00:30:40,121 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-09-29 00:30:40,121 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:30:40,121 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:40,124 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-09-29 00:30:40,126 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-09-29 00:30:40,126 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-09-29 00:30:40,128 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-09-29 00:30:40,131 [     scc.git] DEBUG Already up to date.

2025-09-29 00:30:40,131 [     scc.git] DEBUG Calling 'git fetch origin pull/33/head'
2025-09-29 00:30:40,416 [     scc.git] DEBUG From https://github.com/ome/omero-rois
2025-09-29 00:30:40,416 [     scc.git] DEBUG  * branch            refs/pull/33/head -> FETCH_HEAD
2025-09-29 00:30:40,420 [     scc.git] DEBUG Calling 'git fetch origin pull/34/head'
2025-09-29 00:30:40,693 [     scc.git] DEBUG From https://github.com/ome/omero-rois
2025-09-29 00:30:40,693 [     scc.git] DEBUG  * branch            refs/pull/34/head -> FETCH_HEAD
2025-09-29 00:30:40,697 [     scc.git] DEBUG ## Unique users: []
2025-09-29 00:30:40,697 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:30:40,697 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:40,699 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...1122baea98746effd4eb59deed25870f673ce3d3'
2025-09-29 00:30:40,701 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:40,704 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 33 (Add roi to array functions) 1122baea98746effd4eb59deed25870f673ce3d3'
2025-09-29 00:30:40,710 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-09-29 00:30:40,713 [     scc.git] DEBUG  setup.py                   |   4 +-
2025-09-29 00:30:40,713 [     scc.git] DEBUG  src/omero_rois/__init__.py |   4 +
2025-09-29 00:30:40,713 [     scc.git] DEBUG  src/omero_rois/library.py  | 204 +++++++++++++++++++++++++++++++++++++++++++--
2025-09-29 00:30:40,713 [     scc.git] DEBUG  3 files changed, 203 insertions(+), 9 deletions(-)
2025-09-29 00:30:40,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:30:40,875 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...149bb248277256d589ea0db597c04739e8134301'
2025-09-29 00:30:40,878 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:40,880 [     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-09-29 00:30:40,887 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-09-29 00:30:40,889 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 2 +-
2025-09-29 00:30:40,889 [     scc.git] DEBUG  1 file changed, 1 insertion(+), 1 deletion(-)
2025-09-29 00:30:41,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:30:41,269 [     scc.git] DEBUG Calling 'git submodule update'
2025-09-29 00:30:41,304 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:30:41,304 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:41,306 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-09-29 00:30:41,339 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-09-29 00:30:41,342 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fa84de13f50> has no local changes
2025-09-29 00:30:41,342 [     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#545 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/545/)'
2025-09-29 00:30:41,347 [     scc.git] DEBUG [detached HEAD b8c465f] merge master -Dorg -Ssuccess-only
2025-09-29 00:30:41,347 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:30:41,348 [    scc.repo] DEBUG ## PRs found:
2025-09-29 00:30:41,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-09-29 00:30:42,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/22 HTTP/1.1" 200 None
2025-09-29 00:30:42,235 [    scc.repo] DEBUG   # ... Include label: dependencies
2025-09-29 00:30:42,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/8b27e47a330555e99e9594f0c4b546946f4f98aa HTTP/1.1" 200 None
2025-09-29 00:30:43,350 [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-09-29 00:30:43,841 [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-09-29 00:30:44,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/8b27e47a330555e99e9594f0c4b546946f4f98aa HTTP/1.1" 200 None
2025-09-29 00:30:44,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/8b27e47a330555e99e9594f0c4b546946f4f98aa?per_page=1 HTTP/1.1" 200 2
2025-09-29 00:30:44,681 [    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-09-29 00:30:45,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-09-29 00:30:45,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-09-29 00:30:46,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-09-29 00:30:46,652 [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-09-29 00:30:47,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-09-29 00:30:47,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-09-29 00:30:47,604 [    scc.repo] DEBUG   - PR 14 manics 'Add pre-commit (black, flake8)'
2025-09-29 00:30:47,604 [    scc.repo] DEBUG ## Branches found:
2025-09-29 00:30:47,604 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-09-29 00:30:47,604 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:30:47,605 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:47,607 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-09-29 00:30:47,609 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-09-29 00:30:47,609 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-09-29 00:30:47,611 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-09-29 00:30:47,614 [     scc.git] DEBUG Already up to date.

2025-09-29 00:30:47,614 [     scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-09-29 00:30:47,900 [     scc.git] DEBUG From https://github.com/ome/omero-signup
2025-09-29 00:30:47,900 [     scc.git] DEBUG  * branch            refs/pull/14/head -> FETCH_HEAD
2025-09-29 00:30:47,903 [     scc.git] DEBUG Calling 'git fetch origin pull/22/head'
2025-09-29 00:30:48,179 [     scc.git] DEBUG From https://github.com/ome/omero-signup
2025-09-29 00:30:48,179 [     scc.git] DEBUG  * branch            refs/pull/22/head -> FETCH_HEAD
2025-09-29 00:30:48,183 [     scc.git] DEBUG ## Unique users: []
2025-09-29 00:30:48,183 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:30:48,184 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:48,186 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-09-29 00:30:48,188 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:48,190 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-09-29 00:30:48,198 [     scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-09-29 00:30:48,198 [     scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-09-29 00:30:48,198 [     scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-09-29 00:30:48,198 [     scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-09-29 00:30:48,198 [     scc.git] DEBUG Auto-merging omero_signup/views.py
2025-09-29 00:30:48,198 [     scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-09-29 00:30:48,198 [     scc.git] DEBUG Auto-merging setup.py
2025-09-29 00:30:48,198 [     scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-09-29 00:30:48,198 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-09-29 00:30:48,198 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-09-29 00:30:48,201 [     scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-09-29 00:30:48,204 [     scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-09-29 00:30:48,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:30:48,360 [     scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-09-29 00:30:48,363 [     scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-09-29 00:30:48,365 [     scc.git] INFO    - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#545](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/545/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/545/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - omero_signup/signup_settings.py
    - omero_signup/views.py
    - omero_signup/urls.py
    - setup.py

--conflicts

2025-09-29 00:30:48,367 [  scc.config] DEBUG Found github.token
2025-09-29 00:30:48,367 [     scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-09-29 00:30:48,367 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...8b27e47a330555e99e9594f0c4b546946f4f98aa'
2025-09-29 00:30:48,370 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:48,372 [     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-09-29 00:30:48,378 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-09-29 00:30:48,380 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 2 +-
2025-09-29 00:30:48,381 [     scc.git] DEBUG  1 file changed, 1 insertion(+), 1 deletion(-)
2025-09-29 00:30:48,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:30:48,757 [     scc.git] DEBUG Calling 'git submodule update'
2025-09-29 00:30:48,791 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:30:48,791 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:48,793 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-09-29 00:30:48,827 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-09-29 00:30:48,830 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fa84ff7a0d0> has no local changes
2025-09-29 00:30:48,830 [     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#545 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/545/)'
2025-09-29 00:30:48,836 [     scc.git] DEBUG [detached HEAD 1968297] merge master -Dorg -Ssuccess-only
2025-09-29 00:30:48,836 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:30:48,836 [    scc.repo] DEBUG ## PRs found:
2025-09-29 00:30:49,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-09-29 00:30:49,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-09-29 00:30:50,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-09-29 00:30:50,879 [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-09-29 00:30:51,372 [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-09-29 00:30:51,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-09-29 00:30:52,370 [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-09-29 00:30:52,370 [    scc.repo] DEBUG   - PR 76 will-moore 'Run cli deps'
2025-09-29 00:30:52,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-09-29 00:30:53,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-09-29 00:30:53,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-09-29 00:30:54,337 [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-09-29 00:30:54,960 [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-09-29 00:30:55,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-09-29 00:30:55,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-09-29 00:30:56,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-09-29 00:30:56,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-09-29 00:30:57,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-09-29 00:30:57,755 [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-09-29 00:30:58,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-09-29 00:30:58,664 [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-09-29 00:30:58,665 [    scc.repo] DEBUG   - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-09-29 00:30:58,665 [    scc.repo] DEBUG ## Branches found:
2025-09-29 00:30:58,665 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-09-29 00:30:58,665 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:30:58,665 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:58,667 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-09-29 00:30:58,669 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-09-29 00:30:58,669 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-09-29 00:30:58,672 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-09-29 00:30:58,675 [     scc.git] DEBUG Already up to date.

2025-09-29 00:30:58,675 [     scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-09-29 00:30:58,970 [     scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-09-29 00:30:58,970 [     scc.git] DEBUG  * branch            refs/pull/12/head -> FETCH_HEAD
2025-09-29 00:30:58,973 [     scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-09-29 00:30:59,268 [     scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-09-29 00:30:59,268 [     scc.git] DEBUG  * branch            refs/pull/76/head -> FETCH_HEAD
2025-09-29 00:30:59,272 [     scc.git] DEBUG ## Unique users: []
2025-09-29 00:30:59,272 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:30:59,272 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:59,274 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-09-29 00:30:59,278 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:59,280 [     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-09-29 00:30:59,290 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-09-29 00:30:59,293 [     scc.git] DEBUG  idr-compose.yml                            |  66 ++++++++++++++
2025-09-29 00:30:59,293 [     scc.git] DEBUG  idr-haproxy.yml                            |  58 +++++++++++++
2025-09-29 00:30:59,293 [     scc.git] DEBUG  idr/40-ansible.sh                          |   7 ++
2025-09-29 00:30:59,293 [     scc.git] DEBUG  idr/70-reset-password.sh                   |   1 +
2025-09-29 00:30:59,293 [     scc.git] DEBUG  idr/nginx/conf.d/default.conf              |   1 +
2025-09-29 00:30:59,293 [     scc.git] DEBUG  idr/nginx/conf.d/example_ssl.conf          |   1 +
2025-09-29 00:30:59,293 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-cache.conf          |  53 +++++++++++
2025-09-29 00:30:59,293 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-cachebuster.conf    | 114 ++++++++++++++++++++++++
2025-09-29 00:30:59,294 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-default.conf        | 135 +++++++++++++++++++++++++++++
2025-09-29 00:30:59,294 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-09-29 00:30:59,294 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-redirect.conf       |  15 ++++
2025-09-29 00:30:59,294 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-upstream.conf       |  13 +++
2025-09-29 00:30:59,294 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-v0.conf             |  26 ++++++
2025-09-29 00:30:59,294 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-v1.conf             |  30 +++++++
2025-09-29 00:30:59,294 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-v2.conf             |  30 +++++++
2025-09-29 00:30:59,294 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-websockets.conf     |   6 ++
2025-09-29 00:30:59,294 [     scc.git] DEBUG  idr/nginx/nginx.conf                       |  53 +++++++++++
2025-09-29 00:30:59,294 [     scc.git] DEBUG  idr/omero/Dockerfile                       |   3 +
2025-09-29 00:30:59,294 [     scc.git] DEBUG  idr/omero/playbook.yml                     |  41 +++++++++
2025-09-29 00:30:59,294 [     scc.git] DEBUG  idr/redirect/Dockerfile                    |   6 ++
2025-09-29 00:30:59,294 [     scc.git] DEBUG  idr/web/Dockerfile                         |   5 ++
2025-09-29 00:30:59,294 [     scc.git] DEBUG  idr/web/playbook.yml                       |  45 ++++++++++
2025-09-29 00:30:59,294 [     scc.git] DEBUG  22 files changed, 824 insertions(+)
2025-09-29 00:30:59,294 [     scc.git] DEBUG  create mode 100644 idr-compose.yml
2025-09-29 00:30:59,294 [     scc.git] DEBUG  create mode 100644 idr-haproxy.yml
2025-09-29 00:30:59,294 [     scc.git] DEBUG  create mode 100755 idr/40-ansible.sh
2025-09-29 00:30:59,294 [     scc.git] DEBUG  create mode 100755 idr/70-reset-password.sh
2025-09-29 00:30:59,294 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/default.conf
2025-09-29 00:30:59,294 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-09-29 00:30:59,294 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-09-29 00:30:59,294 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-09-29 00:30:59,295 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-09-29 00:30:59,295 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-09-29 00:30:59,295 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-09-29 00:30:59,295 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-09-29 00:30:59,295 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-09-29 00:30:59,295 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-09-29 00:30:59,295 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-09-29 00:30:59,295 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-09-29 00:30:59,295 [     scc.git] DEBUG  create mode 100644 idr/nginx/nginx.conf
2025-09-29 00:30:59,295 [     scc.git] DEBUG  create mode 100644 idr/omero/Dockerfile
2025-09-29 00:30:59,295 [     scc.git] DEBUG  create mode 100644 idr/omero/playbook.yml
2025-09-29 00:30:59,295 [     scc.git] DEBUG  create mode 100644 idr/redirect/Dockerfile
2025-09-29 00:30:59,295 [     scc.git] DEBUG  create mode 100644 idr/web/Dockerfile
2025-09-29 00:30:59,295 [     scc.git] DEBUG  create mode 100644 idr/web/playbook.yml
2025-09-29 00:30:59,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:30:59,457 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-09-29 00:30:59,460 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:59,462 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-09-29 00:30:59,471 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-09-29 00:30:59,473 [     scc.git] DEBUG  docker | 1 +
2025-09-29 00:30:59,473 [     scc.git] DEBUG  1 file changed, 1 insertion(+)
2025-09-29 00:30:59,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:30:59,849 [     scc.git] DEBUG Calling 'git submodule update'
2025-09-29 00:30:59,886 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:30:59,886 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:30:59,888 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-09-29 00:30:59,922 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-09-29 00:30:59,925 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fa84de10390> has no local changes
2025-09-29 00:30:59,925 [     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#545 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/545/)'
2025-09-29 00:30:59,931 [     scc.git] DEBUG [detached HEAD 02d177c] merge master -Dorg -Ssuccess-only
2025-09-29 00:30:59,931 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:30:59,932 [    scc.repo] DEBUG ## PRs found:
2025-09-29 00:31:00,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 None
2025-09-29 00:31:00,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/issues/14 HTTP/1.1" 200 None
2025-09-29 00:31:00,831 [    scc.repo] DEBUG   # ... Include label: dependencies
2025-09-29 00:31:01,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/commits/1a4dbe9a31854f4f65c509ea929debf3319ba1ea HTTP/1.1" 200 None
2025-09-29 00:31:01,961 [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-09-29 00:31:02,464 [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-09-29 00:31:02,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/commits/1a4dbe9a31854f4f65c509ea929debf3319ba1ea HTTP/1.1" 200 None
2025-09-29 00:31:03,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/statuses/1a4dbe9a31854f4f65c509ea929debf3319ba1ea?per_page=1 HTTP/1.1" 200 2
2025-09-29 00:31:03,323 [    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-09-29 00:31:03,323 [    scc.repo] DEBUG ## Branches found:
2025-09-29 00:31:03,323 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-09-29 00:31:03,323 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:31:03,323 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:03,325 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-09-29 00:31:03,327 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-09-29 00:31:03,327 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-09-29 00:31:03,330 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-09-29 00:31:03,332 [     scc.git] DEBUG Already up to date.

2025-09-29 00:31:03,332 [     scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-09-29 00:31:03,622 [     scc.git] DEBUG From https://github.com/ome/omero-upload
2025-09-29 00:31:03,622 [     scc.git] DEBUG  * branch            refs/pull/14/head -> FETCH_HEAD
2025-09-29 00:31:03,626 [     scc.git] DEBUG ## Unique users: []
2025-09-29 00:31:03,626 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:31:03,626 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:03,628 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...1a4dbe9a31854f4f65c509ea929debf3319ba1ea'
2025-09-29 00:31:03,630 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:03,632 [     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-09-29 00:31:03,639 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-09-29 00:31:03,641 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 2 +-
2025-09-29 00:31:03,641 [     scc.git] DEBUG  1 file changed, 1 insertion(+), 1 deletion(-)
2025-09-29 00:31:03,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:03,776 [     scc.git] DEBUG Calling 'git submodule update'
2025-09-29 00:31:03,810 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:31:03,811 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:03,812 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-09-29 00:31:03,847 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-09-29 00:31:03,850 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fa84de5ad90> has no local changes
2025-09-29 00:31:03,850 [     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#545 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/545/)'
2025-09-29 00:31:03,855 [     scc.git] DEBUG [detached HEAD 23200ff] merge master -Dorg -Ssuccess-only
2025-09-29 00:31:03,855 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:03,855 [    scc.repo] DEBUG ## PRs found:
2025-09-29 00:31:04,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-09-29 00:31:04,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/22 HTTP/1.1" 200 None
2025-09-29 00:31:04,723 [    scc.repo] DEBUG   # ... Include label: dependencies
2025-09-29 00:31:05,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/2ee819462af52bf2878fadf06d6ebdbafb8f1902 HTTP/1.1" 200 None
2025-09-29 00:31:05,954 [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-09-29 00:31:06,464 [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-09-29 00:31:06,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/2ee819462af52bf2878fadf06d6ebdbafb8f1902 HTTP/1.1" 200 None
2025-09-29 00:31:07,312 [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-09-29 00:31:07,313 [    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-09-29 00:31:07,313 [    scc.repo] DEBUG ## Branches found:
2025-09-29 00:31:07,313 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-09-29 00:31:07,313 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:31:07,313 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:07,315 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-09-29 00:31:07,317 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-09-29 00:31:07,317 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-09-29 00:31:07,320 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-09-29 00:31:07,327 [     scc.git] DEBUG Updating deab817..160d894

2025-09-29 00:31:08,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls/20 HTTP/1.1" 200 None
2025-09-29 00:31:08,011 [     scc.git] DEBUG Calling 'git fetch origin pull/22/head'
2025-09-29 00:31:08,299 [     scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-09-29 00:31:08,299 [     scc.git] DEBUG  * branch            refs/pull/22/head -> FETCH_HEAD
2025-09-29 00:31:08,303 [     scc.git] DEBUG ## Unique users: []
2025-09-29 00:31:08,303 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:31:08,303 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:08,305 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...2ee819462af52bf2878fadf06d6ebdbafb8f1902'
2025-09-29 00:31:08,308 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:08,310 [     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-09-29 00:31:08,316 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-09-29 00:31:08,318 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 2 +-
2025-09-29 00:31:08,318 [     scc.git] DEBUG  1 file changed, 1 insertion(+), 1 deletion(-)
2025-09-29 00:31:08,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:08,484 [     scc.git] DEBUG Calling 'git submodule update'
2025-09-29 00:31:08,519 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:31:08,519 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:08,521 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-09-29 00:31:08,555 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-09-29 00:31:08,557 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fa84ffe7810> has no local changes
2025-09-29 00:31:08,558 [     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#545 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/545/)'
2025-09-29 00:31:08,563 [     scc.git] DEBUG [detached HEAD dc23b05] merge master -Dorg -Ssuccess-only
2025-09-29 00:31:08,563 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:08,563 [     scc.git] INFO  Overriding base-branch from master to main
2025-09-29 00:31:08,563 [    scc.repo] DEBUG ## PRs found:
2025-09-29 00:31:09,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-09-29 00:31:09,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/21 HTTP/1.1" 200 None
2025-09-29 00:31:09,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/21/comments HTTP/1.1" 200 None
2025-09-29 00:31:10,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/d07067753650282c9e8cdbbeae37897b7ed0d4cc HTTP/1.1" 200 None
2025-09-29 00:31:10,959 [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-09-29 00:31:11,423 [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-09-29 00:31:11,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/d07067753650282c9e8cdbbeae37897b7ed0d4cc HTTP/1.1" 200 None
2025-09-29 00:31:12,362 [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-09-29 00:31:12,362 [    scc.repo] DEBUG   - PR 21 will-moore 'Web zarr import'
2025-09-29 00:31:12,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-09-29 00:31:13,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-09-29 00:31:13,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-09-29 00:31:14,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-09-29 00:31:14,801 [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-09-29 00:31:15,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-09-29 00:31:15,783 [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-09-29 00:31:15,783 [    scc.repo] DEBUG   - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-09-29 00:31:15,783 [    scc.repo] DEBUG ## Branches found:
2025-09-29 00:31:15,783 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-09-29 00:31:15,783 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:31:15,784 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:15,786 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-09-29 00:31:15,788 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-09-29 00:31:15,788 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-09-29 00:31:15,790 [     scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-09-29 00:31:15,797 [     scc.git] DEBUG Updating 8f3c313..00e0207

2025-09-29 00:31:16,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls/20 HTTP/1.1" 200 None
2025-09-29 00:31:16,499 [     scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-09-29 00:31:16,784 [     scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-09-29 00:31:16,784 [     scc.git] DEBUG  * branch            refs/pull/10/head -> FETCH_HEAD
2025-09-29 00:31:16,788 [     scc.git] DEBUG Calling 'git fetch origin pull/21/head'
2025-09-29 00:31:17,073 [     scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-09-29 00:31:17,073 [     scc.git] DEBUG  * branch            refs/pull/21/head -> FETCH_HEAD
2025-09-29 00:31:17,077 [     scc.git] DEBUG ## Unique users: []
2025-09-29 00:31:17,077 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:31:17,077 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:17,079 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-09-29 00:31:17,082 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:17,084 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-09-29 00:31:17,092 [     scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-09-29 00:31:17,092 [     scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-09-29 00:31:17,092 [     scc.git] DEBUG Auto-merging omero_web_zarr/views.py
2025-09-29 00:31:17,092 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-09-29 00:31:17,092 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-09-29 00:31:17,095 [     scc.git] DEBUG Calling 'git reset --hard 00e02072dc29b04eba14c080ca8a0175a1499c15'
2025-09-29 00:31:17,098 [     scc.git] DEBUG HEAD is now at 00e0207 Merge pull request #20 from will-moore/zarr_python_v3
2025-09-29 00:31:17,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:17,232 [     scc.git] DEBUG Calling 'git merge-base 00e02072dc29b04eba14c080ca8a0175a1499c15 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-09-29 00:31:17,234 [     scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..00e02072dc29b04eba14c080ca8a0175a1499c15'
2025-09-29 00:31:17,237 [     scc.git] INFO    - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#545](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/545/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/545/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - omero_web_zarr/urls.py

--conflicts

2025-09-29 00:31:17,239 [  scc.config] DEBUG Found github.token
2025-09-29 00:31:17,239 [     scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-09-29 00:31:17,239 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...d07067753650282c9e8cdbbeae37897b7ed0d4cc'
2025-09-29 00:31:17,241 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:17,243 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 21 (Web zarr import) d07067753650282c9e8cdbbeae37897b7ed0d4cc'
2025-09-29 00:31:17,250 [     scc.git] DEBUG Auto-merging omero_web_zarr/views.py
2025-09-29 00:31:17,251 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-09-29 00:31:17,254 [     scc.git] DEBUG  README.rst                                         |   3 +
2025-09-29 00:31:17,254 [     scc.git] DEBUG  .../templates/omero_web_zarr/zarr_import.html      | 358 +++++++++++++++++++++
2025-09-29 00:31:17,254 [     scc.git] DEBUG  omero_web_zarr/urls.py                             |   2 +
2025-09-29 00:31:17,254 [     scc.git] DEBUG  omero_web_zarr/views.py                            |  43 ++-
2025-09-29 00:31:17,254 [     scc.git] DEBUG  setup.py                                           |   5 +-
2025-09-29 00:31:17,254 [     scc.git] DEBUG  5 files changed, 409 insertions(+), 2 deletions(-)
2025-09-29 00:31:17,254 [     scc.git] DEBUG  create mode 100644 omero_web_zarr/templates/omero_web_zarr/zarr_import.html
2025-09-29 00:31:17,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:17,623 [     scc.git] DEBUG Calling 'git submodule update'
2025-09-29 00:31:17,659 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:31:17,660 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:17,662 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-09-29 00:31:17,696 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-09-29 00:31:17,699 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fa8500185d0> has no local changes
2025-09-29 00:31:17,699 [     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#545 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/545/)'
2025-09-29 00:31:17,704 [     scc.git] DEBUG [detached HEAD 2aabcf2] merge master -Dorg -Ssuccess-only
2025-09-29 00:31:17,704 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:17,704 [    scc.repo] DEBUG ## PRs found:
2025-09-29 00:31:18,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 None
2025-09-29 00:31:18,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/issues/25 HTTP/1.1" 200 None
2025-09-29 00:31:18,627 [    scc.repo] DEBUG   # ... Include label: dependencies
2025-09-29 00:31:19,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/commits/c73bedb717b9ecce0af666245d3486aa5a2dafe9 HTTP/1.1" 200 None
2025-09-29 00:31:19,775 [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-09-29 00:31:20,284 [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-09-29 00:31:20,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/commits/c73bedb717b9ecce0af666245d3486aa5a2dafe9 HTTP/1.1" 200 None
2025-09-29 00:31:21,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/statuses/c73bedb717b9ecce0af666245d3486aa5a2dafe9?per_page=1 HTTP/1.1" 200 2
2025-09-29 00:31:21,164 [    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-09-29 00:31:21,164 [    scc.repo] DEBUG ## Branches found:
2025-09-29 00:31:21,164 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-09-29 00:31:21,165 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:31:21,165 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:21,167 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-09-29 00:31:21,169 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-09-29 00:31:21,169 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-09-29 00:31:21,171 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-09-29 00:31:21,174 [     scc.git] DEBUG Already up to date.

2025-09-29 00:31:21,174 [     scc.git] DEBUG Calling 'git fetch origin pull/25/head'
2025-09-29 00:31:21,470 [     scc.git] DEBUG From https://github.com/openmicroscopy/omero-weberror
2025-09-29 00:31:21,470 [     scc.git] DEBUG  * branch            refs/pull/25/head -> FETCH_HEAD
2025-09-29 00:31:21,474 [     scc.git] DEBUG ## Unique users: []
2025-09-29 00:31:21,474 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:31:21,474 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:21,476 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...c73bedb717b9ecce0af666245d3486aa5a2dafe9'
2025-09-29 00:31:21,479 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:21,481 [     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-09-29 00:31:21,487 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-09-29 00:31:21,489 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 2 +-
2025-09-29 00:31:21,489 [     scc.git] DEBUG  1 file changed, 1 insertion(+), 1 deletion(-)
2025-09-29 00:31:21,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:21,630 [     scc.git] DEBUG Calling 'git submodule update'
2025-09-29 00:31:21,665 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:31:21,665 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:21,667 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-09-29 00:31:21,701 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-09-29 00:31:21,704 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fa84de78650> has no local changes
2025-09-29 00:31:21,704 [     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#545 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/545/)'
2025-09-29 00:31:21,709 [     scc.git] DEBUG [detached HEAD d94bcb3] merge master -Dorg -Ssuccess-only
2025-09-29 00:31:21,709 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:21,710 [    scc.repo] DEBUG ## PRs found:
2025-09-29 00:31:22,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 None
2025-09-29 00:31:22,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/issues/37 HTTP/1.1" 200 None
2025-09-29 00:31:22,593 [    scc.repo] DEBUG   # ... Include label: dependencies
2025-09-29 00:31:23,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/commits/8cf5f7e65ae8e945b134e41e77bc13a785aff478 HTTP/1.1" 200 None
2025-09-29 00:31:23,638 [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-09-29 00:31:24,152 [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-09-29 00:31:24,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/commits/8cf5f7e65ae8e945b134e41e77bc13a785aff478 HTTP/1.1" 200 None
2025-09-29 00:31:25,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/statuses/8cf5f7e65ae8e945b134e41e77bc13a785aff478?per_page=1 HTTP/1.1" 200 2
2025-09-29 00:31:25,243 [    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-09-29 00:31:25,243 [    scc.repo] DEBUG ## Branches found:
2025-09-29 00:31:25,243 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-09-29 00:31:25,243 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:31:25,243 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:25,246 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-09-29 00:31:25,248 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-09-29 00:31:25,248 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-09-29 00:31:25,250 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-09-29 00:31:25,253 [     scc.git] DEBUG Already up to date.

2025-09-29 00:31:25,253 [     scc.git] DEBUG Calling 'git fetch origin pull/37/head'
2025-09-29 00:31:25,546 [     scc.git] DEBUG From https://github.com/openmicroscopy/omero-webtest
2025-09-29 00:31:25,546 [     scc.git] DEBUG  * branch            refs/pull/37/head -> FETCH_HEAD
2025-09-29 00:31:25,550 [     scc.git] DEBUG ## Unique users: []
2025-09-29 00:31:25,550 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:31:25,550 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:25,552 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...8cf5f7e65ae8e945b134e41e77bc13a785aff478'
2025-09-29 00:31:25,554 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:25,556 [     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-09-29 00:31:25,562 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-09-29 00:31:25,565 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 2 +-
2025-09-29 00:31:25,565 [     scc.git] DEBUG  1 file changed, 1 insertion(+), 1 deletion(-)
2025-09-29 00:31:25,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:25,741 [     scc.git] DEBUG Calling 'git submodule update'
2025-09-29 00:31:25,776 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:31:25,776 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:25,778 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-09-29 00:31:25,812 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-09-29 00:31:25,815 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fa84deafd50> has no local changes
2025-09-29 00:31:25,815 [     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#545 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/545/)'
2025-09-29 00:31:25,820 [     scc.git] DEBUG [detached HEAD 73db307] merge master -Dorg -Ssuccess-only
2025-09-29 00:31:25,821 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:25,821 [    scc.repo] DEBUG ## PRs found:
2025-09-29 00:31:26,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-09-29 00:31:26,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-09-29 00:31:27,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-09-29 00:31:27,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-09-29 00:31:28,104 [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-09-29 00:31:28,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-09-29 00:31:29,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-09-29 00:31:29,015 [    scc.repo] DEBUG   - PR 100 dominikl 'Run tests properly'
2025-09-29 00:31:29,015 [    scc.repo] DEBUG ## Branches found:
2025-09-29 00:31:29,016 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-09-29 00:31:29,016 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:31:29,016 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:29,018 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-09-29 00:31:29,020 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-09-29 00:31:29,020 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-09-29 00:31:29,022 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-09-29 00:31:29,025 [     scc.git] DEBUG Already up to date.

2025-09-29 00:31:29,025 [     scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-09-29 00:31:29,315 [     scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-09-29 00:31:29,315 [     scc.git] DEBUG  * branch            refs/pull/100/head -> FETCH_HEAD
2025-09-29 00:31:29,318 [     scc.git] DEBUG ## Unique users: []
2025-09-29 00:31:29,318 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:31:29,318 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:29,320 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-09-29 00:31:29,323 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:29,325 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-09-29 00:31:29,332 [     scc.git] DEBUG Auto-merging Dockerfile
2025-09-29 00:31:29,332 [     scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-09-29 00:31:29,332 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-09-29 00:31:29,333 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-09-29 00:31:29,335 [     scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-09-29 00:31:29,339 [     scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-09-29 00:31:29,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:29,490 [     scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-09-29 00:31:29,492 [     scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-09-29 00:31:29,495 [     scc.git] INFO    - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#545](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/545/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/545/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - Dockerfile

--conflicts

2025-09-29 00:31:29,497 [  scc.config] DEBUG Found github.token
2025-09-29 00:31:29,497 [     scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-09-29 00:31:29,497 [     scc.git] DEBUG Calling 'git submodule update'
2025-09-29 00:31:29,531 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:31:29,531 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:29,533 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-09-29 00:31:29,567 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-09-29 00:31:29,571 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fa84dec3950> has no local changes
2025-09-29 00:31:29,571 [     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#545 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/545/)'
2025-09-29 00:31:29,576 [     scc.git] DEBUG [detached HEAD e0f88ed] merge master -Dorg -Ssuccess-only
2025-09-29 00:31:29,577 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:29,577 [     scc.git] INFO  Overriding base-branch from master to develop
2025-09-29 00:31:29,577 [    scc.repo] DEBUG ## PRs found:
2025-09-29 00:31:30,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-09-29 00:31:30,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-09-29 00:31:31,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-09-29 00:31:31,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-09-29 00:31:32,160 [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-09-29 00:31:32,635 [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-09-29 00:31:33,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-09-29 00:31:33,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-09-29 00:31:33,467 [    scc.repo] DEBUG   - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-09-29 00:31:34,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-09-29 00:31:34,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-09-29 00:31:35,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-09-29 00:31:35,626 [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-09-29 00:31:36,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-09-29 00:31:36,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-09-29 00:31:36,572 [    scc.repo] DEBUG   - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-09-29 00:31:37,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-09-29 00:31:37,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-09-29 00:31:38,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-09-29 00:31:38,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-09-29 00:31:38,574 [    scc.repo] DEBUG ## Branches found:
2025-09-29 00:31:38,574 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-09-29 00:31:38,574 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:31:38,574 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:38,576 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-09-29 00:31:38,579 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-09-29 00:31:38,579 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-09-29 00:31:38,582 [     scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-09-29 00:31:38,590 [     scc.git] DEBUG Updating 4b4c755..03b9116

2025-09-29 00:31:39,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/228 HTTP/1.1" 200 None
2025-09-29 00:31:39,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/227 HTTP/1.1" 200 None
2025-09-29 00:31:40,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-09-29 00:31:40,486 [     scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-09-29 00:31:40,787 [     scc.git] DEBUG From https://github.com/ome/scripts
2025-09-29 00:31:40,788 [     scc.git] DEBUG  * branch            refs/pull/202/head -> FETCH_HEAD
2025-09-29 00:31:40,791 [     scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-09-29 00:31:41,089 [     scc.git] DEBUG From https://github.com/ome/scripts
2025-09-29 00:31:41,089 [     scc.git] DEBUG  * branch            refs/pull/223/head -> FETCH_HEAD
2025-09-29 00:31:41,093 [     scc.git] DEBUG ## Unique users: []
2025-09-29 00:31:41,093 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:31:41,093 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:41,095 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-09-29 00:31:41,100 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:41,102 [     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-09-29 00:31:41,111 [     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-09-29 00:31:41,111 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-09-29 00:31:41,112 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-09-29 00:31:41,114 [     scc.git] DEBUG Calling 'git reset --hard 03b9116196e1a799dd18a666559613d912be01a5'
2025-09-29 00:31:41,117 [     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-09-29 00:31:41,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:41,272 [     scc.git] DEBUG Calling 'git merge-base 03b9116196e1a799dd18a666559613d912be01a5 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-09-29 00:31:41,276 [     scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..03b9116196e1a799dd18a666559613d912be01a5'
2025-09-29 00:31:41,280 [     scc.git] INFO    - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#545](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/545/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/545/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - omero/annotation_scripts/KeyVal_to_csv.py

--conflicts

2025-09-29 00:31:41,282 [  scc.config] DEBUG Found github.token
2025-09-29 00:31:41,282 [     scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-09-29 00:31:41,282 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-09-29 00:31:41,286 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:41,288 [     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-09-29 00:31:41,296 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-09-29 00:31:41,299 [     scc.git] DEBUG  omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-09-29 00:31:41,299 [     scc.git] DEBUG  1 file changed, 8 insertions(+), 1 deletion(-)
2025-09-29 00:31:41,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:41,672 [     scc.git] DEBUG Calling 'git submodule update'
2025-09-29 00:31:41,707 [     scc.git] DEBUG Get sha1 of %s
2025-09-29 00:31:41,707 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-09-29 00:31:41,709 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-09-29 00:31:41,743 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-09-29 00:31:41,746 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fa84c492d10> has no local changes
2025-09-29 00:31:41,746 [     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#545 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/545/)'
2025-09-29 00:31:41,751 [     scc.git] DEBUG [detached HEAD 5c127aa] merge master -Dorg -Ssuccess-only
2025-09-29 00:31:41,751 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:41,752 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-09-29 00:31:41,818 [  scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-09-29 00:31:42,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:42,068 [  scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-09-29 00:31:42,070 [  scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-09-29 00:31:42,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:42,463 [  scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-09-29 00:31:42,464 [  scc.config] DEBUG Found submodule.omero-cli-render.url
2025-09-29 00:31:42,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:42,855 [  scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-09-29 00:31:42,857 [  scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-09-29 00:31:43,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:43,251 [  scc.config] DEBUG Found submodule.omero-figure.url
2025-09-29 00:31:43,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:43,687 [  scc.config] DEBUG Found submodule.omero-figure.branch
2025-09-29 00:31:43,689 [  scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-09-29 00:31:44,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:44,087 [  scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-09-29 00:31:44,088 [  scc.config] DEBUG Found submodule.omero-gallery.url
2025-09-29 00:31:44,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:44,481 [  scc.config] DEBUG Found submodule.omero-gallery.branch
2025-09-29 00:31:44,483 [  scc.config] DEBUG Found submodule.omero-iviewer.url
2025-09-29 00:31:44,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:44,869 [  scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-09-29 00:31:44,871 [  scc.config] DEBUG Found submodule.omero-mapr.url
2025-09-29 00:31:45,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:45,259 [  scc.config] DEBUG Found submodule.omero-mapr.branch
2025-09-29 00:31:45,261 [  scc.config] DEBUG Found submodule.omero-metadata.url
2025-09-29 00:31:45,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:45,643 [  scc.config] DEBUG Found submodule.omero-metadata.branch
2025-09-29 00:31:45,644 [  scc.config] DEBUG Found submodule.omero-parade.url
2025-09-29 00:31:46,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:46,035 [  scc.config] DEBUG Found submodule.omero-parade.branch
2025-09-29 00:31:46,037 [  scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-09-29 00:31:46,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:46,433 [  scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-09-29 00:31:46,434 [  scc.config] DEBUG Found submodule.omero-rois.url
2025-09-29 00:31:46,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:46,844 [  scc.config] DEBUG Found submodule.omero-signup.url
2025-09-29 00:31:47,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:47,230 [  scc.config] DEBUG Found submodule.omero-test-infra.url
2025-09-29 00:31:47,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:47,611 [  scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-09-29 00:31:47,613 [  scc.config] DEBUG Found submodule.omero-upload.url
2025-09-29 00:31:48,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:48,020 [  scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-09-29 00:31:48,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:48,417 [  scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-09-29 00:31:48,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:48,802 [  scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-09-29 00:31:48,804 [  scc.config] DEBUG Found submodule.omero-weberror.url
2025-09-29 00:31:49,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:49,197 [  scc.config] DEBUG Found submodule.omero-weberror.branch
2025-09-29 00:31:49,199 [  scc.config] DEBUG Found submodule.omero-webtest.url
2025-09-29 00:31:49,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:49,598 [  scc.config] DEBUG Found submodule.omero-webtest.branch
2025-09-29 00:31:49,600 [  scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-09-29 00:31:49,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:49,995 [  scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-09-29 00:31:49,996 [  scc.config] DEBUG Found submodule.scripts.url
2025-09-29 00:31:50,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-09-29 00:31:50,405 [  scc.config] DEBUG Found submodule.scripts.branch
2025-09-29 00:31:50,405 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-09-29 00:31:50,480 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fa850be7b90> has local changes
2025-09-29 00:31:50,480 [     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 174 will-moore 'Skip wells' (stage: draft)
  - 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 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 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#545 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/545/)'
2025-09-29 00:31:50,490 [     scc.git] DEBUG [detached HEAD 7539aa6] merge master -Dorg -Ssuccess-only
2025-09-29 00:31:50,490 [     scc.git] DEBUG  23 files changed, 44 insertions(+), 44 deletions(-)
2025-09-29 00:31:50,490 [   scc.merge] INFO  Repository: ome/omero-plugins
2025-09-29 00:31:50,490 [   scc.merge] INFO  Already up to date.
2025-09-29 00:31:50,490 [   scc.merge] INFO  
2025-09-29 00:31:50,490 [   scc.merge] INFO  Merged PRs:
2025-09-29 00:31:50,490 [   scc.merge] INFO    - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-09-29 00:31:50,490 [   scc.merge] INFO    - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-09-29 00:31:50,490 [   scc.merge] INFO    - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-09-29 00:31:50,490 [   scc.merge] INFO  
2025-09-29 00:31:50,490 [   scc.merge] INFO  Repository: ome/minimal-omero-client
2025-09-29 00:31:50,490 [   scc.merge] INFO  Already up to date.
2025-09-29 00:31:50,491 [   scc.merge] INFO  
2025-09-29 00:31:50,491 [   scc.merge] INFO  
2025-09-29 00:31:50,491 [   scc.merge] INFO  Repository: ome/omero-cli-duplicate
2025-09-29 00:31:50,491 [   scc.merge] INFO  Excluded PRs:
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-09-29 00:31:50,491 [   scc.merge] INFO  Already up to date.
2025-09-29 00:31:50,491 [   scc.merge] INFO  
2025-09-29 00:31:50,491 [   scc.merge] INFO  Merged PRs:
2025-09-29 00:31:50,491 [   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-09-29 00:31:50,491 [   scc.merge] INFO  
2025-09-29 00:31:50,491 [   scc.merge] INFO  Repository: ome/omero-cli-render
2025-09-29 00:31:50,491 [   scc.merge] INFO  Excluded PRs:
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-09-29 00:31:50,491 [   scc.merge] INFO  Already up to date.
2025-09-29 00:31:50,491 [   scc.merge] INFO  
2025-09-29 00:31:50,491 [   scc.merge] INFO  Merged PRs:
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 59 will-moore 'Apply settings to Plate'
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 69 dominikl 'Fix help text for impo/export commands'
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 71 dominikl 'Escape slash character in image names'
2025-09-29 00:31:50,491 [   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-09-29 00:31:50,491 [   scc.merge] INFO  
2025-09-29 00:31:50,491 [   scc.merge] INFO  Repository: ome/omero-cli-zarr
2025-09-29 00:31:50,491 [   scc.merge] INFO  Excluded PRs:
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 174 will-moore 'Skip wells' (stage: draft)
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-09-29 00:31:50,491 [   scc.merge] INFO  Updating 11d3587..37ea700
2025-09-29 00:31:50,491 [   scc.merge] INFO  Previously merged:
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 180 will-moore 'Import command'
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 179 will-moore 'Changelog 0.6.0'
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 177 jburel 'Replace fromstring by frombuffer'
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 147 will-moore 'Name option'
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 173 will-moore 'Add test_export_plate_polygons()'
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 171 will-moore 'Initial addition of integration tests'
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-09-29 00:31:50,491 [   scc.merge] INFO  
2025-09-29 00:31:50,491 [   scc.merge] INFO  Merged PRs:
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py'
2025-09-29 00:31:50,491 [   scc.merge] INFO  
2025-09-29 00:31:50,491 [   scc.merge] INFO  Conflicting PRs (not included):
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 181 will-moore 'Add labels support for import'
2025-09-29 00:31:50,491 [   scc.merge] INFO    - PR 182 will-moore 'Revert "Remove support for Plate import"'
2025-09-29 00:31:50,492 [   scc.merge] INFO  
2025-09-29 00:31:50,492 [   scc.merge] INFO  Repository: ome/omero-figure
2025-09-29 00:31:50,492 [   scc.merge] INFO  Excluded PRs:
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 641 Rdornier 'OMERO ROIs improvements : filtering visible and adding all' (user: Rdornier)
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-09-29 00:31:50,492 [   scc.merge] INFO  Updating 9cc36cde..baab5c06
2025-09-29 00:31:50,492 [   scc.merge] INFO  Previously merged:
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 612 will-moore 'Script version'
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 616 Rdornier 'Fix labels around border'
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 605 Tom-TBT 'Colorbar feature'
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 638 Rdornier 'Fix arrow opacity'
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-09-29 00:31:50,492 [   scc.merge] INFO  
2025-09-29 00:31:50,492 [   scc.merge] INFO  Merged PRs:
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 600 Rdornier 'Label on rois'
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 610 will-moore 'Add docs/contributing.rst'
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 642 dependabot[bot] 'Bump vite from 6.2.6 to 6.3.6'
2025-09-29 00:31:50,492 [   scc.merge] INFO  
2025-09-29 00:31:50,492 [   scc.merge] INFO  Conflicting PRs (not included):
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 637 Rdornier 'Fix scalebar position'
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 643 Rdornier 'Shape scaling'
2025-09-29 00:31:50,492 [   scc.merge] INFO  
2025-09-29 00:31:50,492 [   scc.merge] INFO  Repository: ome/omero-fpbioimage
2025-09-29 00:31:50,492 [   scc.merge] INFO  Already up to date.
2025-09-29 00:31:50,492 [   scc.merge] INFO  
2025-09-29 00:31:50,492 [   scc.merge] INFO  Merged PRs:
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 18 jburel 'default  size z value'
2025-09-29 00:31:50,492 [   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-09-29 00:31:50,492 [   scc.merge] INFO  
2025-09-29 00:31:50,492 [   scc.merge] INFO  Repository: ome/omero-gallery
2025-09-29 00:31:50,492 [   scc.merge] INFO  Already up to date.
2025-09-29 00:31:50,492 [   scc.merge] INFO  
2025-09-29 00:31:50,492 [   scc.merge] INFO  Merged PRs:
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-09-29 00:31:50,492 [   scc.merge] INFO  
2025-09-29 00:31:50,492 [   scc.merge] INFO  Conflicting PRs (not included):
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-09-29 00:31:50,492 [   scc.merge] INFO    - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-09-29 00:31:50,492 [   scc.merge] INFO  
2025-09-29 00:31:50,492 [   scc.merge] INFO  Repository: ome/omero-iviewer
2025-09-29 00:31:50,492 [   scc.merge] INFO  Excluded PRs:
2025-09-29 00:31:50,493 [   scc.merge] INFO    - PR 508 will-moore 'Broadcast channel demo' (stage: draft)
2025-09-29 00:31:50,493 [   scc.merge] INFO    - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-09-29 00:31:50,493 [   scc.merge] INFO    - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-09-29 00:31:50,493 [   scc.merge] INFO    - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-09-29 00:31:50,493 [   scc.merge] INFO    - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-09-29 00:31:50,493 [   scc.merge] INFO    - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-09-29 00:31:50,493 [   scc.merge] INFO  Updating 7a798ce..bb94cf8
2025-09-29 00:31:50,493 [   scc.merge] INFO  Previously merged:
2025-09-29 00:31:50,493 [   scc.merge] INFO    - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-09-29 00:31:50,493 [   scc.merge] INFO  
2025-09-29 00:31:50,493 [   scc.merge] INFO  Merged PRs:
2025-09-29 00:31:50,493 [   scc.merge] INFO    - PR 460 will-moore 'Channel min spinner fix'
2025-09-29 00:31:50,493 [   scc.merge] INFO    - PR 465 will-moore 'Save as Figure'
2025-09-29 00:31:50,493 [   scc.merge] INFO    - PR 471 will-moore 'Z projection disabled tooltip'
2025-09-29 00:31:50,493 [   scc.merge] INFO    - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-09-29 00:31:50,493 [   scc.merge] INFO  
2025-09-29 00:31:50,493 [   scc.merge] INFO  Conflicting PRs (not included):
2025-09-29 00:31:50,493 [   scc.merge] INFO    - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-09-29 00:31:50,493 [   scc.merge] INFO  
2025-09-29 00:31:50,493 [   scc.merge] INFO  Repository: ome/omero-mapr
2025-09-29 00:31:50,493 [   scc.merge] INFO  Excluded PRs:
2025-09-29 00:31:50,493 [   scc.merge] INFO    - PR 79 will-moore 'Right panel title' (exclude comment)
2025-09-29 00:31:50,493 [   scc.merge] INFO  Already up to date.
2025-09-29 00:31:50,493 [   scc.merge] INFO  
2025-09-29 00:31:50,493 [   scc.merge] INFO  Merged PRs:
2025-09-29 00:31:50,493 [   scc.merge] INFO    - PR 74 will-moore 'mapr extension of webclient'
2025-09-29 00:31:50,493 [   scc.merge] INFO    - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-09-29 00:31:50,493 [   scc.merge] INFO  
2025-09-29 00:31:50,493 [   scc.merge] INFO  Conflicting PRs (not included):
2025-09-29 00:31:50,493 [   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-09-29 00:31:50,493 [   scc.merge] INFO  
2025-09-29 00:31:50,493 [   scc.merge] INFO  Repository: ome/omero-metadata
2025-09-29 00:31:50,493 [   scc.merge] INFO  Updating 3cd120c..55060a2
2025-09-29 00:31:50,493 [   scc.merge] INFO  Previously merged:
2025-09-29 00:31:50,493 [   scc.merge] INFO    - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-09-29 00:31:50,493 [   scc.merge] INFO  
2025-09-29 00:31:50,493 [   scc.merge] INFO  Conflicting PRs (not included):
2025-09-29 00:31:50,493 [   scc.merge] INFO    - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-09-29 00:31:50,493 [   scc.merge] INFO    - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-09-29 00:31:50,493 [   scc.merge] INFO  
2025-09-29 00:31:50,493 [   scc.merge] INFO  Repository: ome/omero-parade
2025-09-29 00:31:50,493 [   scc.merge] INFO  Excluded PRs:
2025-09-29 00:31:50,493 [   scc.merge] INFO    - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-09-29 00:31:50,493 [   scc.merge] INFO    - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-09-29 00:31:50,493 [   scc.merge] INFO    - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-09-29 00:31:50,493 [   scc.merge] INFO    - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-09-29 00:31:50,493 [   scc.merge] INFO  Already up to date.
2025-09-29 00:31:50,493 [   scc.merge] INFO  
2025-09-29 00:31:50,493 [   scc.merge] INFO  Merged PRs:
2025-09-29 00:31:50,493 [   scc.merge] INFO    - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-09-29 00:31:50,494 [   scc.merge] INFO    - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-09-29 00:31:50,494 [   scc.merge] INFO    - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-09-29 00:31:50,494 [   scc.merge] INFO  
2025-09-29 00:31:50,494 [   scc.merge] INFO  Repository: ome/omero-prometheus-tools
2025-09-29 00:31:50,494 [   scc.merge] INFO  Already up to date.
2025-09-29 00:31:50,494 [   scc.merge] INFO  
2025-09-29 00:31:50,494 [   scc.merge] INFO  Merged PRs:
2025-09-29 00:31:50,494 [   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-09-29 00:31:50,494 [   scc.merge] INFO  
2025-09-29 00:31:50,494 [   scc.merge] INFO  Repository: ome/omero-rois
2025-09-29 00:31:50,494 [   scc.merge] INFO  Excluded PRs:
2025-09-29 00:31:50,494 [   scc.merge] INFO    - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-09-29 00:31:50,494 [   scc.merge] INFO  Already up to date.
2025-09-29 00:31:50,494 [   scc.merge] INFO  
2025-09-29 00:31:50,494 [   scc.merge] INFO  Merged PRs:
2025-09-29 00:31:50,494 [   scc.merge] INFO    - PR 33 jo-mueller 'Add roi to array functions'
2025-09-29 00:31:50,494 [   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-09-29 00:31:50,494 [   scc.merge] INFO  
2025-09-29 00:31:50,494 [   scc.merge] INFO  Repository: ome/omero-signup
2025-09-29 00:31:50,494 [   scc.merge] INFO  Already up to date.
2025-09-29 00:31:50,494 [   scc.merge] INFO  
2025-09-29 00:31:50,494 [   scc.merge] INFO  Merged PRs:
2025-09-29 00:31:50,494 [   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-09-29 00:31:50,494 [   scc.merge] INFO  
2025-09-29 00:31:50,494 [   scc.merge] INFO  Conflicting PRs (not included):
2025-09-29 00:31:50,494 [   scc.merge] INFO    - PR 14 manics 'Add pre-commit (black, flake8)'
2025-09-29 00:31:50,494 [   scc.merge] INFO  
2025-09-29 00:31:50,494 [   scc.merge] INFO  Repository: openmicroscopy/omero-test-infra
2025-09-29 00:31:50,494 [   scc.merge] INFO  Excluded PRs:
2025-09-29 00:31:50,494 [   scc.merge] INFO    - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-09-29 00:31:50,494 [   scc.merge] INFO    - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-09-29 00:31:50,494 [   scc.merge] INFO    - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-09-29 00:31:50,494 [   scc.merge] INFO  Already up to date.
2025-09-29 00:31:50,494 [   scc.merge] INFO  
2025-09-29 00:31:50,494 [   scc.merge] INFO  Merged PRs:
2025-09-29 00:31:50,494 [   scc.merge] INFO    - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-09-29 00:31:50,494 [   scc.merge] INFO    - PR 76 will-moore 'Run cli deps'
2025-09-29 00:31:50,494 [   scc.merge] INFO  
2025-09-29 00:31:50,494 [   scc.merge] INFO  Repository: ome/omero-upload
2025-09-29 00:31:50,494 [   scc.merge] INFO  Already up to date.
2025-09-29 00:31:50,494 [   scc.merge] INFO  
2025-09-29 00:31:50,494 [   scc.merge] INFO  Merged PRs:
2025-09-29 00:31:50,494 [   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-09-29 00:31:50,494 [   scc.merge] INFO  
2025-09-29 00:31:50,494 [   scc.merge] INFO  Repository: ome/omero-virtual-microscope
2025-09-29 00:31:50,494 [   scc.merge] INFO  Updating deab817..160d894
2025-09-29 00:31:50,494 [   scc.merge] INFO  Previously merged:
2025-09-29 00:31:50,494 [   scc.merge] INFO    - PR 20 jburel 'Build'
2025-09-29 00:31:50,494 [   scc.merge] INFO  
2025-09-29 00:31:50,494 [   scc.merge] INFO  Merged PRs:
2025-09-29 00:31:50,495 [   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-09-29 00:31:50,495 [   scc.merge] INFO  
2025-09-29 00:31:50,495 [   scc.merge] INFO  Repository: ome/omero-web-zarr
2025-09-29 00:31:50,495 [   scc.merge] INFO  Excluded PRs:
2025-09-29 00:31:50,495 [   scc.merge] INFO    - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-09-29 00:31:50,495 [   scc.merge] INFO  Updating 8f3c313..00e0207
2025-09-29 00:31:50,495 [   scc.merge] INFO  Previously merged:
2025-09-29 00:31:50,495 [   scc.merge] INFO    - PR 20 will-moore 'Use zarr_format=2 for .zarray and chunk endpoints'
2025-09-29 00:31:50,495 [   scc.merge] INFO  
2025-09-29 00:31:50,495 [   scc.merge] INFO  Merged PRs:
2025-09-29 00:31:50,495 [   scc.merge] INFO    - PR 21 will-moore 'Web zarr import'
2025-09-29 00:31:50,495 [   scc.merge] INFO  
2025-09-29 00:31:50,495 [   scc.merge] INFO  Conflicting PRs (not included):
2025-09-29 00:31:50,495 [   scc.merge] INFO    - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-09-29 00:31:50,495 [   scc.merge] INFO  
2025-09-29 00:31:50,495 [   scc.merge] INFO  Repository: openmicroscopy/omero-weberror
2025-09-29 00:31:50,495 [   scc.merge] INFO  Already up to date.
2025-09-29 00:31:50,495 [   scc.merge] INFO  
2025-09-29 00:31:50,495 [   scc.merge] INFO  Merged PRs:
2025-09-29 00:31:50,495 [   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-09-29 00:31:50,495 [   scc.merge] INFO  
2025-09-29 00:31:50,495 [   scc.merge] INFO  Repository: openmicroscopy/omero-webtest
2025-09-29 00:31:50,495 [   scc.merge] INFO  Already up to date.
2025-09-29 00:31:50,495 [   scc.merge] INFO  
2025-09-29 00:31:50,495 [   scc.merge] INFO  Merged PRs:
2025-09-29 00:31:50,495 [   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-09-29 00:31:50,495 [   scc.merge] INFO  
2025-09-29 00:31:50,495 [   scc.merge] INFO  Repository: ome/rOMERO-gateway
2025-09-29 00:31:50,495 [   scc.merge] INFO  Already up to date.
2025-09-29 00:31:50,495 [   scc.merge] INFO  
2025-09-29 00:31:50,495 [   scc.merge] INFO  Conflicting PRs (not included):
2025-09-29 00:31:50,495 [   scc.merge] INFO    - PR 100 dominikl 'Run tests properly'
2025-09-29 00:31:50,495 [   scc.merge] INFO  
2025-09-29 00:31:50,495 [   scc.merge] INFO  Repository: ome/scripts
2025-09-29 00:31:50,495 [   scc.merge] INFO  Excluded PRs:
2025-09-29 00:31:50,495 [   scc.merge] INFO    - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-09-29 00:31:50,495 [   scc.merge] INFO    - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-09-29 00:31:50,495 [   scc.merge] INFO  Updating 4b4c755..03b9116
2025-09-29 00:31:50,495 [   scc.merge] INFO  Previously merged:
2025-09-29 00:31:50,495 [   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-09-29 00:31:50,495 [   scc.merge] INFO    - PR 227 jburel 'Replace tostring by tobytes'
2025-09-29 00:31:50,495 [   scc.merge] INFO    - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-09-29 00:31:50,495 [   scc.merge] INFO  
2025-09-29 00:31:50,495 [   scc.merge] INFO  Merged PRs:
2025-09-29 00:31:50,495 [   scc.merge] INFO    - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-09-29 00:31:50,495 [   scc.merge] INFO  
2025-09-29 00:31:50,495 [   scc.merge] INFO  Conflicting PRs (not included):
2025-09-29 00:31:50,495 [   scc.merge] INFO    - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-09-29 00:31:50,495 [   scc.merge] INFO  
2025-09-29 00:31:50,495 [   scc.merge] DEBUG Cleaning remote branches created for merging
2025-09-29 00:31:50,496 [     scc.git] DEBUG Calling 'git remote'
2025-09-29 00:31:50,498 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-09-29 00:31:50,498 [     scc.git] DEBUG Calling 'git remote'
2025-09-29 00:31:50,499 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:50,500 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-09-29 00:31:50,500 [     scc.git] DEBUG Calling 'git remote'
2025-09-29 00:31:50,501 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:50,501 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-09-29 00:31:50,501 [     scc.git] DEBUG Calling 'git remote'
2025-09-29 00:31:50,503 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:50,503 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-09-29 00:31:50,503 [     scc.git] DEBUG Calling 'git remote'
2025-09-29 00:31:50,505 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:50,505 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-09-29 00:31:50,505 [     scc.git] DEBUG Calling 'git remote'
2025-09-29 00:31:50,507 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:50,507 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-09-29 00:31:50,507 [     scc.git] DEBUG Calling 'git remote'
2025-09-29 00:31:50,509 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:50,509 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-09-29 00:31:50,509 [     scc.git] DEBUG Calling 'git remote'
2025-09-29 00:31:50,511 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:50,511 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-09-29 00:31:50,511 [     scc.git] DEBUG Calling 'git remote'
2025-09-29 00:31:50,513 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:50,513 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-09-29 00:31:50,513 [     scc.git] DEBUG Calling 'git remote'
2025-09-29 00:31:50,515 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:50,515 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-09-29 00:31:50,515 [     scc.git] DEBUG Calling 'git remote'
2025-09-29 00:31:50,517 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:50,517 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-09-29 00:31:50,517 [     scc.git] DEBUG Calling 'git remote'
2025-09-29 00:31:50,519 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:50,519 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-09-29 00:31:50,519 [     scc.git] DEBUG Calling 'git remote'
2025-09-29 00:31:50,521 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:50,521 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-09-29 00:31:50,521 [     scc.git] DEBUG Calling 'git remote'
2025-09-29 00:31:50,523 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:50,523 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-09-29 00:31:50,523 [     scc.git] DEBUG Calling 'git remote'
2025-09-29 00:31:50,525 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:50,525 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-09-29 00:31:50,525 [     scc.git] DEBUG Calling 'git remote'
2025-09-29 00:31:50,527 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:50,527 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-09-29 00:31:50,527 [     scc.git] DEBUG Calling 'git remote'
2025-09-29 00:31:50,529 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:50,529 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-09-29 00:31:50,529 [     scc.git] DEBUG Calling 'git remote'
2025-09-29 00:31:50,531 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:50,531 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-09-29 00:31:50,531 [     scc.git] DEBUG Calling 'git remote'
2025-09-29 00:31:50,533 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:50,533 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-09-29 00:31:50,533 [     scc.git] DEBUG Calling 'git remote'
2025-09-29 00:31:50,535 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:50,535 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-09-29 00:31:50,535 [     scc.git] DEBUG Calling 'git remote'
2025-09-29 00:31:50,537 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:50,537 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-09-29 00:31:50,537 [     scc.git] DEBUG Calling 'git remote'
2025-09-29 00:31:50,539 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-09-29 00:31:50,539 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-09-29 00:31:50,539 [     scc.git] DEBUG Calling 'git remote'
2025-09-29 00:31:50,541 [     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 6d9234f] 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 aa4a24b] Update component versions
 1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-09-29 00:32:36,521 [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-09-29 00:32:45,767 [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-09-29 00:32:48,281 [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-09-29 00:32:52,989 [github.Reque] INFO  Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-09-29 00:33:31,711 [    scc.push] INFO  Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci