Skip to content

Console Output

Skipping 220 KB.. Full Log
2025-07-01 00:28:57,964 [     scc.git] DEBUG Calling 'git merge-base bb94cf8da960e3283090038b04432f301560f5e4 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-07-01 00:28:57,967 [     scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..bb94cf8da960e3283090038b04432f301560f5e4'
2025-07-01 00:28:57,970 [     scc.git] INFO    - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#465](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/consoleText) for more details.
Possible conflicts:
  - PR #499 dependabot[bot] 'Bump nanoid and mocha'
    - package-lock.json

--conflicts

2025-07-01 00:28:57,973 [  scc.config] DEBUG Found github.token
2025-07-01 00:28:57,973 [     scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-07-01 00:28:57,973 [     scc.git] DEBUG Calling 'git submodule update'
2025-07-01 00:28:58,014 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:28:58,014 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:28:58,016 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-01 00:28:58,056 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-07-01 00:28:58,063 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fdaf5743a10> has no local changes
2025-07-01 00:28:58,063 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

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

Generated by OMERO-plugins-push#465 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/)'
2025-07-01 00:28:58,069 [     scc.git] DEBUG [detached HEAD 26c761c] merge master -Dorg -Ssuccess-only
2025-07-01 00:28:58,069 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:28:58,070 [    scc.repo] DEBUG ## PRs found:
2025-07-01 00:28:58,215 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:28:58,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-07-01 00:28:58,724 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:28:59,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-07-01 00:28:59,264 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:28:59,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-07-01 00:28:59,828 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:00,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-01 00:29:00,318 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:00,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-07-01 00:29:00,784 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:00,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-07-01 00:29:00,991 [    scc.repo] DEBUG   - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-01 00:29:01,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:01,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-07-01 00:29:01,753 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:01,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-07-01 00:29:02,243 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:02,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-07-01 00:29:02,795 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:03,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-01 00:29:03,261 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:03,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-07-01 00:29:03,810 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:03,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-07-01 00:29:03,994 [    scc.repo] DEBUG   - PR 74 will-moore 'mapr extension of webclient'
2025-07-01 00:29:03,994 [    scc.repo] DEBUG ## Branches found:
2025-07-01 00:29:03,994 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-07-01 00:29:03,994 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:03,994 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:03,997 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-01 00:29:03,999 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-01 00:29:03,999 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-01 00:29:04,002 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-01 00:29:04,005 [     scc.git] DEBUG Already up to date.

2025-07-01 00:29:04,006 [     scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-07-01 00:29:04,338 [     scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-07-01 00:29:04,338 [     scc.git] DEBUG  * branch            refs/pull/74/head -> FETCH_HEAD
2025-07-01 00:29:04,342 [     scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-07-01 00:29:04,621 [     scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-07-01 00:29:04,621 [     scc.git] DEBUG  * branch            refs/pull/94/head -> FETCH_HEAD
2025-07-01 00:29:04,626 [     scc.git] DEBUG ## Unique users: []
2025-07-01 00:29:04,626 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:04,626 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:04,628 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-07-01 00:29:04,632 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:04,634 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-07-01 00:29:04,643 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-01 00:29:04,647 [     scc.git] DEBUG  .../templates/webclient/base/base_container.html   | 182 +++++++++++++
2025-07-01 00:29:04,647 [     scc.git] DEBUG  .../data/includes/right_plugin.general.js.html     | 290 ---------------------
2025-07-01 00:29:04,647 [     scc.git] DEBUG  requirements.txt                                   |   2 +-
2025-07-01 00:29:04,647 [     scc.git] DEBUG  3 files changed, 183 insertions(+), 291 deletions(-)
2025-07-01 00:29:04,647 [     scc.git] DEBUG  create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-07-01 00:29:04,647 [     scc.git] DEBUG  delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-07-01 00:29:04,648 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:04,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:29:04,815 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-07-01 00:29:04,819 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:04,821 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 94 (Use the release/v1 branch for the PyPA action publishing to PyPI) 1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-07-01 00:29:04,830 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-01 00:29:04,833 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 2 +-
2025-07-01 00:29:04,833 [     scc.git] DEBUG  1 file changed, 1 insertion(+), 1 deletion(-)
2025-07-01 00:29:05,066 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:05,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:29:05,230 [     scc.git] DEBUG Calling 'git submodule update'
2025-07-01 00:29:05,271 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:05,271 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:05,273 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-01 00:29:05,312 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-07-01 00:29:05,316 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fdaf583d450> has no local changes
2025-07-01 00:29:05,316 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

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

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

Generated by OMERO-plugins-push#465 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/)'
2025-07-01 00:29:05,323 [     scc.git] DEBUG [detached HEAD 0063eca] merge master -Dorg -Ssuccess-only
2025-07-01 00:29:05,323 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:29:05,323 [    scc.repo] DEBUG ## PRs found:
2025-07-01 00:29:05,481 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:05,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-07-01 00:29:06,023 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:06,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-07-01 00:29:06,507 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:06,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-07-01 00:29:07,048 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:07,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-07-01 00:29:07,567 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:07,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-01 00:29:08,047 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:08,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-07-01 00:29:08,551 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:08,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-07-01 00:29:08,745 [    scc.repo] DEBUG   - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-07-01 00:29:08,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:09,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-07-01 00:29:09,518 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:09,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-07-01 00:29:10,006 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:10,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-07-01 00:29:10,575 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:10,802 [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-07-01 00:29:11,053 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:11,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-07-01 00:29:11,495 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:11,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-07-01 00:29:11,709 [    scc.repo] DEBUG   - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-07-01 00:29:11,709 [    scc.repo] DEBUG ## Branches found:
2025-07-01 00:29:11,709 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-07-01 00:29:11,709 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:11,709 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:11,712 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-01 00:29:11,714 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-01 00:29:11,714 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-01 00:29:11,717 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-01 00:29:11,725 [     scc.git] DEBUG Updating 3cd120c..55060a2

2025-07-01 00:29:11,960 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:12,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-07-01 00:29:12,372 [     scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-07-01 00:29:12,704 [     scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-07-01 00:29:12,704 [     scc.git] DEBUG  * branch            refs/pull/55/head -> FETCH_HEAD
2025-07-01 00:29:12,709 [     scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-07-01 00:29:12,999 [     scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-07-01 00:29:12,999 [     scc.git] DEBUG  * branch            refs/pull/64/head -> FETCH_HEAD
2025-07-01 00:29:13,003 [     scc.git] DEBUG ## Unique users: []
2025-07-01 00:29:13,003 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:13,003 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:13,006 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-07-01 00:29:13,010 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:13,012 [     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-07-01 00:29:13,026 [     scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-07-01 00:29:13,026 [     scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-07-01 00:29:13,026 [     scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-07-01 00:29:13,026 [     scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-07-01 00:29:13,026 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-01 00:29:13,027 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-01 00:29:13,029 [     scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-01 00:29:13,034 [     scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-07-01 00:29:13,035 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:13,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:29:13,204 [     scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-07-01 00:29:13,208 [     scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-01 00:29:13,211 [     scc.git] INFO    - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#465](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - src/omero_metadata/cli.py
    - src/omero_metadata/populate.py

--conflicts

2025-07-01 00:29:13,213 [  scc.config] DEBUG Found github.token
2025-07-01 00:29:13,213 [     scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-07-01 00:29:13,213 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-07-01 00:29:13,218 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:13,220 [     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-07-01 00:29:13,235 [     scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-07-01 00:29:13,235 [     scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-07-01 00:29:13,235 [     scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-07-01 00:29:13,236 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-01 00:29:13,236 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-01 00:29:13,239 [     scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-01 00:29:13,244 [     scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-07-01 00:29:13,454 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:13,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:29:13,613 [     scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-07-01 00:29:13,617 [     scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-01 00:29:13,620 [     scc.git] INFO    - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#465](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/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-07-01 00:29:13,622 [  scc.config] DEBUG Found github.token
2025-07-01 00:29:13,622 [     scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-07-01 00:29:13,622 [     scc.git] DEBUG Calling 'git submodule update'
2025-07-01 00:29:13,664 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:13,664 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:13,666 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-01 00:29:13,707 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-07-01 00:29:13,711 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fdaf63b2410> has no local changes
2025-07-01 00:29:13,711 [     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#465 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/)'
2025-07-01 00:29:13,718 [     scc.git] DEBUG [detached HEAD 9b6d840] merge master -Dorg -Ssuccess-only
2025-07-01 00:29:13,719 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:29:13,719 [    scc.repo] DEBUG ## PRs found:
2025-07-01 00:29:13,864 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:14,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-07-01 00:29:14,467 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:14,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-07-01 00:29:14,936 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:15,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-07-01 00:29:15,463 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:15,699 [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-07-01 00:29:15,951 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:16,175 [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-07-01 00:29:16,426 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:16,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-07-01 00:29:16,934 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:17,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-07-01 00:29:17,121 [    scc.repo] DEBUG   - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-01 00:29:17,372 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:17,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-07-01 00:29:17,608 [    scc.repo] DEBUG   # ... Include label: dependencies
2025-07-01 00:29:17,859 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:18,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-07-01 00:29:18,419 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:18,723 [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-07-01 00:29:18,974 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:19,274 [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-07-01 00:29:19,526 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:19,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-07-01 00:29:20,093 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:20,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-07-01 00:29:20,285 [    scc.repo] DEBUG   - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-07-01 00:29:20,536 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:20,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-07-01 00:29:20,770 [    scc.repo] DEBUG   # ... Include label: dependencies
2025-07-01 00:29:21,021 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:21,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-07-01 00:29:21,573 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:21,817 [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-07-01 00:29:22,068 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:22,388 [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-07-01 00:29:22,639 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:22,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-07-01 00:29:23,181 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:23,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-07-01 00:29:23,372 [    scc.repo] DEBUG   - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-07-01 00:29:23,623 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:23,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-07-01 00:29:24,109 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:24,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-07-01 00:29:24,596 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:24,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-07-01 00:29:25,050 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:25,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-07-01 00:29:25,539 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:25,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-07-01 00:29:26,006 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:26,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-07-01 00:29:26,493 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:26,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-07-01 00:29:26,739 [    scc.repo] DEBUG ## Branches found:
2025-07-01 00:29:26,739 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-07-01 00:29:26,739 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:26,739 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:26,742 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-01 00:29:26,745 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-01 00:29:26,745 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-01 00:29:26,748 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-01 00:29:26,751 [     scc.git] DEBUG Already up to date.

2025-07-01 00:29:26,751 [     scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-07-01 00:29:27,043 [     scc.git] DEBUG From https://github.com/ome/omero-parade
2025-07-01 00:29:27,043 [     scc.git] DEBUG  * branch            refs/pull/140/head -> FETCH_HEAD
2025-07-01 00:29:27,047 [     scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-07-01 00:29:27,341 [     scc.git] DEBUG From https://github.com/ome/omero-parade
2025-07-01 00:29:27,341 [     scc.git] DEBUG  * branch            refs/pull/141/head -> FETCH_HEAD
2025-07-01 00:29:27,346 [     scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-07-01 00:29:27,666 [     scc.git] DEBUG From https://github.com/ome/omero-parade
2025-07-01 00:29:27,666 [     scc.git] DEBUG  * branch            refs/pull/142/head -> FETCH_HEAD
2025-07-01 00:29:27,671 [     scc.git] DEBUG ## Unique users: []
2025-07-01 00:29:27,671 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:27,671 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:27,674 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-07-01 00:29:27,677 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:27,679 [     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-07-01 00:29:27,687 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-01 00:29:27,690 [     scc.git] DEBUG  package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-07-01 00:29:27,690 [     scc.git] DEBUG  package.json      |   2 +-
2025-07-01 00:29:27,690 [     scc.git] DEBUG  2 files changed, 138 insertions(+), 153 deletions(-)
2025-07-01 00:29:27,692 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:27,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:29:27,857 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-07-01 00:29:27,860 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:27,862 [     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-07-01 00:29:27,872 [     scc.git] DEBUG Auto-merging package-lock.json
2025-07-01 00:29:27,872 [     scc.git] DEBUG Auto-merging package.json
2025-07-01 00:29:27,873 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-01 00:29:27,877 [     scc.git] DEBUG  package-lock.json | 18 ++++++++++--------
2025-07-01 00:29:27,877 [     scc.git] DEBUG  package.json      |  2 +-
2025-07-01 00:29:27,877 [     scc.git] DEBUG  2 files changed, 11 insertions(+), 9 deletions(-)
2025-07-01 00:29:28,108 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:28,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:29:28,275 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-07-01 00:29:28,278 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:28,281 [     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-07-01 00:29:28,290 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-01 00:29:28,293 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 2 +-
2025-07-01 00:29:28,293 [     scc.git] DEBUG  1 file changed, 1 insertion(+), 1 deletion(-)
2025-07-01 00:29:28,526 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:28,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:29:28,691 [     scc.git] DEBUG Calling 'git submodule update'
2025-07-01 00:29:28,732 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:28,732 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:28,735 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-01 00:29:28,774 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-07-01 00:29:28,778 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fdaf4621910> has no local changes
2025-07-01 00:29:28,778 [     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#465 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/)'
2025-07-01 00:29:28,785 [     scc.git] DEBUG [detached HEAD c39bb81] merge master -Dorg -Ssuccess-only
2025-07-01 00:29:28,785 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:29:28,785 [    scc.repo] DEBUG ## PRs found:
2025-07-01 00:29:28,942 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:29,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-07-01 00:29:29,121 [    scc.repo] DEBUG ## Branches found:
2025-07-01 00:29:29,122 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-07-01 00:29:29,122 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:29,122 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:29,124 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-01 00:29:29,127 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-01 00:29:29,127 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-01 00:29:29,130 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-01 00:29:29,133 [     scc.git] DEBUG Already up to date.

2025-07-01 00:29:29,133 [     scc.git] DEBUG ## Unique users: []
2025-07-01 00:29:29,133 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:29,133 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:29,135 [     scc.git] DEBUG Calling 'git submodule update'
2025-07-01 00:29:29,174 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:29,174 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:29,176 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-01 00:29:29,214 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-07-01 00:29:29,217 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fdaf7d09cd0> has no local changes
2025-07-01 00:29:29,217 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

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


Generated by OMERO-plugins-push#465 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/)'
2025-07-01 00:29:29,224 [     scc.git] DEBUG [detached HEAD ce36dde] merge master -Dorg -Ssuccess-only
2025-07-01 00:29:29,224 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:29:29,224 [    scc.repo] DEBUG ## PRs found:
2025-07-01 00:29:29,373 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:29,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-07-01 00:29:29,979 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:30,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-07-01 00:29:30,482 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:30,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-07-01 00:29:30,973 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:31,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-07-01 00:29:31,196 [    scc.repo] DEBUG ## Branches found:
2025-07-01 00:29:31,196 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-07-01 00:29:31,196 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:31,196 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:31,199 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-01 00:29:31,201 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-01 00:29:31,201 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-01 00:29:31,204 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-01 00:29:31,207 [     scc.git] DEBUG Already up to date.

2025-07-01 00:29:31,208 [     scc.git] DEBUG ## Unique users: []
2025-07-01 00:29:31,208 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:31,208 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:31,211 [     scc.git] DEBUG Calling 'git submodule update'
2025-07-01 00:29:31,251 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:31,251 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:31,253 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-01 00:29:31,293 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-07-01 00:29:31,296 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fdaf4670f10> has no local changes
2025-07-01 00:29:31,297 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

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


Generated by OMERO-plugins-push#465 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/)'
2025-07-01 00:29:31,303 [     scc.git] DEBUG [detached HEAD b6737f7] merge master -Dorg -Ssuccess-only
2025-07-01 00:29:31,303 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:29:31,304 [    scc.repo] DEBUG ## PRs found:
2025-07-01 00:29:31,446 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:31,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-07-01 00:29:31,969 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:32,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-07-01 00:29:32,484 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:32,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-07-01 00:29:32,952 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:33,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-07-01 00:29:33,567 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:33,800 [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-07-01 00:29:34,052 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:34,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-07-01 00:29:34,605 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:34,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-07-01 00:29:34,834 [    scc.repo] DEBUG   - PR 14 manics 'Add pre-commit (black, flake8)'
2025-07-01 00:29:34,834 [    scc.repo] DEBUG ## Branches found:
2025-07-01 00:29:34,834 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-07-01 00:29:34,834 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:34,834 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:34,838 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-01 00:29:34,840 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-01 00:29:34,840 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-01 00:29:34,843 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-01 00:29:34,847 [     scc.git] DEBUG Already up to date.

2025-07-01 00:29:34,847 [     scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-07-01 00:29:35,183 [     scc.git] DEBUG From https://github.com/ome/omero-signup
2025-07-01 00:29:35,183 [     scc.git] DEBUG  * branch            refs/pull/14/head -> FETCH_HEAD
2025-07-01 00:29:35,188 [     scc.git] DEBUG ## Unique users: []
2025-07-01 00:29:35,189 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:35,189 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:35,191 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-07-01 00:29:35,194 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:35,197 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-07-01 00:29:35,206 [     scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-07-01 00:29:35,206 [     scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-07-01 00:29:35,206 [     scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-07-01 00:29:35,206 [     scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-07-01 00:29:35,206 [     scc.git] DEBUG Auto-merging omero_signup/views.py
2025-07-01 00:29:35,206 [     scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-07-01 00:29:35,206 [     scc.git] DEBUG Auto-merging setup.py
2025-07-01 00:29:35,206 [     scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-07-01 00:29:35,206 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-01 00:29:35,207 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-01 00:29:35,210 [     scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-07-01 00:29:35,214 [     scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-07-01 00:29:35,215 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:35,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:29:35,380 [     scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-07-01 00:29:35,384 [     scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-07-01 00:29:35,387 [     scc.git] INFO    - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#465](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - omero_signup/views.py
    - setup.py
    - omero_signup/signup_settings.py
    - omero_signup/urls.py

--conflicts

2025-07-01 00:29:35,389 [  scc.config] DEBUG Found github.token
2025-07-01 00:29:35,389 [     scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-07-01 00:29:35,389 [     scc.git] DEBUG Calling 'git submodule update'
2025-07-01 00:29:35,429 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:35,429 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:35,431 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-01 00:29:35,470 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-07-01 00:29:35,473 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fdaf582bcd0> has no local changes
2025-07-01 00:29:35,473 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

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

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

Generated by OMERO-plugins-push#465 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/)'
2025-07-01 00:29:35,480 [     scc.git] DEBUG [detached HEAD b92cddf] merge master -Dorg -Ssuccess-only
2025-07-01 00:29:35,481 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:29:35,481 [    scc.repo] DEBUG ## PRs found:
2025-07-01 00:29:35,631 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:35,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-07-01 00:29:36,208 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:36,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-07-01 00:29:36,697 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:36,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-07-01 00:29:37,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:37,506 [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-07-01 00:29:37,758 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:38,048 [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-07-01 00:29:38,300 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:38,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-07-01 00:29:38,876 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:39,059 [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-07-01 00:29:39,060 [    scc.repo] DEBUG   - PR 76 will-moore 'Run cli deps'
2025-07-01 00:29:39,311 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:39,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-07-01 00:29:39,829 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:40,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-07-01 00:29:40,302 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:40,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-07-01 00:29:40,823 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:41,070 [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-07-01 00:29:41,321 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:41,553 [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-07-01 00:29:41,804 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:42,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-07-01 00:29:42,315 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:42,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-07-01 00:29:42,764 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:42,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-07-01 00:29:43,235 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:43,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-07-01 00:29:43,714 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:44,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-07-01 00:29:44,252 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:44,468 [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-07-01 00:29:44,719 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:44,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-07-01 00:29:45,230 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:45,436 [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-07-01 00:29:45,436 [    scc.repo] DEBUG   - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-07-01 00:29:45,436 [    scc.repo] DEBUG ## Branches found:
2025-07-01 00:29:45,437 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-07-01 00:29:45,437 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:45,437 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:45,439 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-01 00:29:45,442 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-01 00:29:45,442 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-01 00:29:45,446 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-01 00:29:45,449 [     scc.git] DEBUG Already up to date.

2025-07-01 00:29:45,449 [     scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-07-01 00:29:45,777 [     scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-07-01 00:29:45,777 [     scc.git] DEBUG  * branch            refs/pull/12/head -> FETCH_HEAD
2025-07-01 00:29:45,782 [     scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-07-01 00:29:46,085 [     scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-07-01 00:29:46,085 [     scc.git] DEBUG  * branch            refs/pull/76/head -> FETCH_HEAD
2025-07-01 00:29:46,090 [     scc.git] DEBUG ## Unique users: []
2025-07-01 00:29:46,090 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:46,090 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:46,092 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-07-01 00:29:46,097 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:46,099 [     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-07-01 00:29:46,112 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-01 00:29:46,115 [     scc.git] DEBUG  idr-compose.yml                            |  66 ++++++++++++++
2025-07-01 00:29:46,115 [     scc.git] DEBUG  idr-haproxy.yml                            |  58 +++++++++++++
2025-07-01 00:29:46,116 [     scc.git] DEBUG  idr/40-ansible.sh                          |   7 ++
2025-07-01 00:29:46,116 [     scc.git] DEBUG  idr/70-reset-password.sh                   |   1 +
2025-07-01 00:29:46,116 [     scc.git] DEBUG  idr/nginx/conf.d/default.conf              |   1 +
2025-07-01 00:29:46,116 [     scc.git] DEBUG  idr/nginx/conf.d/example_ssl.conf          |   1 +
2025-07-01 00:29:46,116 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-cache.conf          |  53 +++++++++++
2025-07-01 00:29:46,116 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-cachebuster.conf    | 114 ++++++++++++++++++++++++
2025-07-01 00:29:46,117 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:46,117 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-default.conf        | 135 +++++++++++++++++++++++++++++
2025-07-01 00:29:46,117 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-07-01 00:29:46,117 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-redirect.conf       |  15 ++++
2025-07-01 00:29:46,117 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-upstream.conf       |  13 +++
2025-07-01 00:29:46,117 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-v0.conf             |  26 ++++++
2025-07-01 00:29:46,117 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-v1.conf             |  30 +++++++
2025-07-01 00:29:46,117 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-v2.conf             |  30 +++++++
2025-07-01 00:29:46,117 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-websockets.conf     |   6 ++
2025-07-01 00:29:46,117 [     scc.git] DEBUG  idr/nginx/nginx.conf                       |  53 +++++++++++
2025-07-01 00:29:46,117 [     scc.git] DEBUG  idr/omero/Dockerfile                       |   3 +
2025-07-01 00:29:46,117 [     scc.git] DEBUG  idr/omero/playbook.yml                     |  41 +++++++++
2025-07-01 00:29:46,117 [     scc.git] DEBUG  idr/redirect/Dockerfile                    |   6 ++
2025-07-01 00:29:46,117 [     scc.git] DEBUG  idr/web/Dockerfile                         |   5 ++
2025-07-01 00:29:46,117 [     scc.git] DEBUG  idr/web/playbook.yml                       |  45 ++++++++++
2025-07-01 00:29:46,117 [     scc.git] DEBUG  22 files changed, 824 insertions(+)
2025-07-01 00:29:46,117 [     scc.git] DEBUG  create mode 100644 idr-compose.yml
2025-07-01 00:29:46,117 [     scc.git] DEBUG  create mode 100644 idr-haproxy.yml
2025-07-01 00:29:46,117 [     scc.git] DEBUG  create mode 100755 idr/40-ansible.sh
2025-07-01 00:29:46,117 [     scc.git] DEBUG  create mode 100755 idr/70-reset-password.sh
2025-07-01 00:29:46,118 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/default.conf
2025-07-01 00:29:46,118 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-07-01 00:29:46,118 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-07-01 00:29:46,118 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-07-01 00:29:46,118 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-07-01 00:29:46,118 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-07-01 00:29:46,118 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-07-01 00:29:46,118 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-07-01 00:29:46,118 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-07-01 00:29:46,118 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-07-01 00:29:46,118 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-07-01 00:29:46,118 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-07-01 00:29:46,118 [     scc.git] DEBUG  create mode 100644 idr/nginx/nginx.conf
2025-07-01 00:29:46,118 [     scc.git] DEBUG  create mode 100644 idr/omero/Dockerfile
2025-07-01 00:29:46,118 [     scc.git] DEBUG  create mode 100644 idr/omero/playbook.yml
2025-07-01 00:29:46,118 [     scc.git] DEBUG  create mode 100644 idr/redirect/Dockerfile
2025-07-01 00:29:46,118 [     scc.git] DEBUG  create mode 100644 idr/web/Dockerfile
2025-07-01 00:29:46,118 [     scc.git] DEBUG  create mode 100644 idr/web/playbook.yml
2025-07-01 00:29:46,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:29:46,275 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-07-01 00:29:46,280 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:46,283 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-07-01 00:29:46,294 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-01 00:29:46,296 [     scc.git] DEBUG  docker | 1 +
2025-07-01 00:29:46,296 [     scc.git] DEBUG  1 file changed, 1 insertion(+)
2025-07-01 00:29:46,526 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:46,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:29:46,697 [     scc.git] DEBUG Calling 'git submodule update'
2025-07-01 00:29:46,737 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:46,737 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:46,740 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-01 00:29:46,778 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-07-01 00:29:46,782 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fdaf4650210> has no local changes
2025-07-01 00:29:46,782 [     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#465 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/)'
2025-07-01 00:29:46,790 [     scc.git] DEBUG [detached HEAD dc8b14a] merge master -Dorg -Ssuccess-only
2025-07-01 00:29:46,790 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:29:46,790 [    scc.repo] DEBUG ## PRs found:
2025-07-01 00:29:46,948 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:47,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-07-01 00:29:47,142 [    scc.repo] DEBUG ## Branches found:
2025-07-01 00:29:47,142 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-07-01 00:29:47,142 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:47,142 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:47,145 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-01 00:29:47,147 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-01 00:29:47,147 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-01 00:29:47,150 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-01 00:29:47,153 [     scc.git] DEBUG Already up to date.

2025-07-01 00:29:47,153 [     scc.git] DEBUG ## Unique users: []
2025-07-01 00:29:47,153 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:47,153 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:47,155 [     scc.git] DEBUG Calling 'git submodule update'
2025-07-01 00:29:47,194 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:47,194 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:47,196 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-01 00:29:47,233 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-07-01 00:29:47,237 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fdaf468b910> has no local changes
2025-07-01 00:29:47,237 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

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


Generated by OMERO-plugins-push#465 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/)'
2025-07-01 00:29:47,243 [     scc.git] DEBUG [detached HEAD 8678907] merge master -Dorg -Ssuccess-only
2025-07-01 00:29:47,243 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:29:47,243 [    scc.repo] DEBUG ## PRs found:
2025-07-01 00:29:47,393 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:47,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2025-07-01 00:29:47,591 [    scc.repo] DEBUG ## Branches found:
2025-07-01 00:29:47,591 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-07-01 00:29:47,592 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:47,592 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:47,594 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-01 00:29:47,596 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-01 00:29:47,596 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-01 00:29:47,599 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-01 00:29:47,607 [     scc.git] DEBUG Updating deab817..160d894

2025-07-01 00:29:47,842 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:48,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls/20 HTTP/1.1" 200 None
2025-07-01 00:29:48,292 [     scc.git] DEBUG ## Unique users: []
2025-07-01 00:29:48,292 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:48,292 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:48,295 [     scc.git] DEBUG Calling 'git submodule update'
2025-07-01 00:29:48,335 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:48,335 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:48,337 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-01 00:29:48,375 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-07-01 00:29:48,379 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fdaf46a79d0> has no local changes
2025-07-01 00:29:48,379 [     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'


Generated by OMERO-plugins-push#465 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/)'
2025-07-01 00:29:48,385 [     scc.git] DEBUG [detached HEAD 362477f] merge master -Dorg -Ssuccess-only
2025-07-01 00:29:48,386 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:29:48,386 [     scc.git] INFO  Overriding base-branch from master to main
2025-07-01 00:29:48,386 [    scc.repo] DEBUG ## PRs found:
2025-07-01 00:29:48,543 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:48,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-07-01 00:29:49,048 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:49,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-07-01 00:29:49,553 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:49,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-07-01 00:29:50,036 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:50,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-07-01 00:29:50,583 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:50,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-01 00:29:51,087 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:51,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-07-01 00:29:51,614 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:51,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-07-01 00:29:52,066 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:52,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-07-01 00:29:52,610 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:52,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-07-01 00:29:53,055 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:53,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-07-01 00:29:53,646 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:53,900 [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-07-01 00:29:54,152 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:54,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-07-01 00:29:54,675 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:54,857 [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-07-01 00:29:54,858 [    scc.repo] DEBUG   - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-07-01 00:29:54,858 [    scc.repo] DEBUG ## Branches found:
2025-07-01 00:29:54,858 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-07-01 00:29:54,858 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:54,858 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:54,861 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-07-01 00:29:54,863 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-01 00:29:54,863 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-07-01 00:29:54,866 [     scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-07-01 00:29:54,869 [     scc.git] DEBUG Already up to date.

2025-07-01 00:29:54,869 [     scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-07-01 00:29:55,219 [     scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-07-01 00:29:55,219 [     scc.git] DEBUG  * branch            refs/pull/10/head -> FETCH_HEAD
2025-07-01 00:29:55,224 [     scc.git] DEBUG ## Unique users: []
2025-07-01 00:29:55,224 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:55,224 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:55,226 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-07-01 00:29:55,229 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:55,231 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-07-01 00:29:55,239 [     scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-07-01 00:29:55,239 [     scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-07-01 00:29:55,239 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-01 00:29:55,239 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-01 00:29:55,242 [     scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-07-01 00:29:55,246 [     scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-07-01 00:29:55,248 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:55,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:29:55,416 [     scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-07-01 00:29:55,419 [     scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-07-01 00:29:55,422 [     scc.git] INFO    - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#465](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - omero_web_zarr/urls.py

--conflicts

2025-07-01 00:29:55,424 [  scc.config] DEBUG Found github.token
2025-07-01 00:29:55,424 [     scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-07-01 00:29:55,424 [     scc.git] DEBUG Calling 'git submodule update'
2025-07-01 00:29:55,463 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:55,463 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:55,465 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-01 00:29:55,502 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-07-01 00:29:55,506 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fdaf58e2e50> has no local changes
2025-07-01 00:29:55,506 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

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

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

Generated by OMERO-plugins-push#465 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/)'
2025-07-01 00:29:55,512 [     scc.git] DEBUG [detached HEAD a18fe49] merge master -Dorg -Ssuccess-only
2025-07-01 00:29:55,512 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:29:55,513 [    scc.repo] DEBUG ## PRs found:
2025-07-01 00:29:55,666 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:55,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-07-01 00:29:55,843 [    scc.repo] DEBUG ## Branches found:
2025-07-01 00:29:55,843 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-07-01 00:29:55,843 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:55,843 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:55,846 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-01 00:29:55,848 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-01 00:29:55,848 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-01 00:29:55,851 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-01 00:29:55,854 [     scc.git] DEBUG Already up to date.

2025-07-01 00:29:55,854 [     scc.git] DEBUG ## Unique users: []
2025-07-01 00:29:55,854 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:55,854 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:55,856 [     scc.git] DEBUG Calling 'git submodule update'
2025-07-01 00:29:55,896 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:55,896 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:55,898 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-01 00:29:55,936 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-07-01 00:29:55,940 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fdaf5811190> has no local changes
2025-07-01 00:29:55,940 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

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


Generated by OMERO-plugins-push#465 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/)'
2025-07-01 00:29:55,946 [     scc.git] DEBUG [detached HEAD c59335d] merge master -Dorg -Ssuccess-only
2025-07-01 00:29:55,946 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:29:55,946 [    scc.repo] DEBUG ## PRs found:
2025-07-01 00:29:56,094 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:56,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-07-01 00:29:56,295 [    scc.repo] DEBUG ## Branches found:
2025-07-01 00:29:56,295 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-07-01 00:29:56,295 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:56,296 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:56,298 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-01 00:29:56,300 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-01 00:29:56,301 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-01 00:29:56,303 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-01 00:29:56,306 [     scc.git] DEBUG Already up to date.

2025-07-01 00:29:56,306 [     scc.git] DEBUG ## Unique users: []
2025-07-01 00:29:56,306 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:56,306 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:56,309 [     scc.git] DEBUG Calling 'git submodule update'
2025-07-01 00:29:56,346 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:56,346 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:56,348 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-01 00:29:56,387 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-07-01 00:29:56,390 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fdaf8221ed0> has no local changes
2025-07-01 00:29:56,390 [     scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only

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


Generated by OMERO-plugins-push#465 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/)'
2025-07-01 00:29:56,396 [     scc.git] DEBUG [detached HEAD 0c06fce] merge master -Dorg -Ssuccess-only
2025-07-01 00:29:56,396 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:29:56,397 [    scc.repo] DEBUG ## PRs found:
2025-07-01 00:29:56,546 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:56,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-07-01 00:29:57,081 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:57,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-07-01 00:29:57,587 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:57,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-07-01 00:29:58,075 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:58,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-07-01 00:29:58,661 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:58,875 [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-07-01 00:29:59,127 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:59,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-07-01 00:29:59,682 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:29:59,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-07-01 00:29:59,873 [    scc.repo] DEBUG   - PR 100 dominikl 'Run tests properly'
2025-07-01 00:29:59,873 [    scc.repo] DEBUG ## Branches found:
2025-07-01 00:29:59,873 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-07-01 00:29:59,873 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:29:59,873 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:29:59,875 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-01 00:29:59,878 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-01 00:29:59,878 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-01 00:29:59,881 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-01 00:29:59,884 [     scc.git] DEBUG Already up to date.

2025-07-01 00:29:59,884 [     scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-07-01 00:30:00,200 [     scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-07-01 00:30:00,200 [     scc.git] DEBUG  * branch            refs/pull/100/head -> FETCH_HEAD
2025-07-01 00:30:00,204 [     scc.git] DEBUG ## Unique users: []
2025-07-01 00:30:00,204 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:30:00,205 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:30:00,207 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-07-01 00:30:00,211 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:30:00,213 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-07-01 00:30:00,222 [     scc.git] DEBUG Auto-merging Dockerfile
2025-07-01 00:30:00,222 [     scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-07-01 00:30:00,223 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-01 00:30:00,223 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-01 00:30:00,226 [     scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-07-01 00:30:00,231 [     scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-07-01 00:30:00,232 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:00,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:00,435 [     scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-07-01 00:30:00,438 [     scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-07-01 00:30:00,440 [     scc.git] INFO    - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#465](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - Dockerfile

--conflicts

2025-07-01 00:30:00,443 [  scc.config] DEBUG Found github.token
2025-07-01 00:30:00,443 [     scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-07-01 00:30:00,443 [     scc.git] DEBUG Calling 'git submodule update'
2025-07-01 00:30:00,483 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:30:00,483 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:30:00,486 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-01 00:30:00,525 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-07-01 00:30:00,529 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fdaf584c490> has no local changes
2025-07-01 00:30:00,529 [     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#465 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/)'
2025-07-01 00:30:00,536 [     scc.git] DEBUG [detached HEAD 0e4f2ef] merge master -Dorg -Ssuccess-only
2025-07-01 00:30:00,536 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:30:00,536 [     scc.git] INFO  Overriding base-branch from master to develop
2025-07-01 00:30:00,536 [    scc.repo] DEBUG ## PRs found:
2025-07-01 00:30:00,686 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:01,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-07-01 00:30:01,314 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:01,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-07-01 00:30:01,769 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:01,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-07-01 00:30:02,249 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:02,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-07-01 00:30:02,687 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:02,915 [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-07-01 00:30:03,166 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:03,414 [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-07-01 00:30:03,666 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:03,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-07-01 00:30:04,126 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:04,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-07-01 00:30:04,323 [    scc.repo] DEBUG   - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-07-01 00:30:04,574 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:04,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-07-01 00:30:05,059 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:05,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-07-01 00:30:05,519 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:05,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-07-01 00:30:06,038 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:06,315 [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-07-01 00:30:06,566 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:06,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-07-01 00:30:07,089 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:07,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-07-01 00:30:07,278 [    scc.repo] DEBUG   - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-07-01 00:30:07,529 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:07,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-07-01 00:30:08,032 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:08,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-07-01 00:30:08,503 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:08,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-07-01 00:30:08,967 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:09,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-07-01 00:30:09,217 [    scc.repo] DEBUG ## Branches found:
2025-07-01 00:30:09,217 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-07-01 00:30:09,218 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:30:09,218 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:30:09,220 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-07-01 00:30:09,223 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-01 00:30:09,223 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-07-01 00:30:09,226 [     scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-07-01 00:30:09,237 [     scc.git] DEBUG Updating 4b4c755..573db34

2025-07-01 00:30:09,467 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:09,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/227 HTTP/1.1" 200 None
2025-07-01 00:30:10,176 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:10,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-07-01 00:30:10,593 [     scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-07-01 00:30:10,939 [     scc.git] DEBUG From https://github.com/ome/scripts
2025-07-01 00:30:10,939 [     scc.git] DEBUG  * branch            refs/pull/202/head -> FETCH_HEAD
2025-07-01 00:30:10,943 [     scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-07-01 00:30:11,248 [     scc.git] DEBUG From https://github.com/ome/scripts
2025-07-01 00:30:11,248 [     scc.git] DEBUG  * branch            refs/pull/223/head -> FETCH_HEAD
2025-07-01 00:30:11,254 [     scc.git] DEBUG ## Unique users: []
2025-07-01 00:30:11,254 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:30:11,254 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:30:11,256 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-07-01 00:30:11,262 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:30:11,264 [     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-07-01 00:30:11,275 [     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-07-01 00:30:11,275 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-01 00:30:11,275 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-01 00:30:11,278 [     scc.git] DEBUG Calling 'git reset --hard 573db340d5d1429fa17c7e486206948412a7c150'
2025-07-01 00:30:11,282 [     scc.git] DEBUG HEAD is now at 573db34 Bump version: 5.9.1 → 5.9.2.dev0
2025-07-01 00:30:11,283 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:11,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:11,446 [     scc.git] DEBUG Calling 'git merge-base 573db340d5d1429fa17c7e486206948412a7c150 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-07-01 00:30:11,452 [     scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..573db340d5d1429fa17c7e486206948412a7c150'
2025-07-01 00:30:11,456 [     scc.git] INFO    - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#465](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - omero/annotation_scripts/KeyVal_to_csv.py

--conflicts

2025-07-01 00:30:11,458 [  scc.config] DEBUG Found github.token
2025-07-01 00:30:11,458 [     scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-07-01 00:30:11,458 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-07-01 00:30:11,463 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:30:11,465 [     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-07-01 00:30:11,474 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-01 00:30:11,478 [     scc.git] DEBUG  omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-07-01 00:30:11,478 [     scc.git] DEBUG  1 file changed, 8 insertions(+), 1 deletion(-)
2025-07-01 00:30:11,697 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:11,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:11,860 [     scc.git] DEBUG Calling 'git submodule update'
2025-07-01 00:30:11,903 [     scc.git] DEBUG Get sha1 of %s
2025-07-01 00:30:11,903 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-01 00:30:11,905 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-01 00:30:11,945 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-07-01 00:30:11,948 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fdaf46d1c50> has no local changes
2025-07-01 00:30:11,949 [     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..573db34
Previously merged:
  - 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#465 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/)'
2025-07-01 00:30:11,955 [     scc.git] DEBUG [detached HEAD 51f3aac] merge master -Dorg -Ssuccess-only
2025-07-01 00:30:11,955 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:30:11,956 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-01 00:30:12,034 [  scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-07-01 00:30:12,111 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:12,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:12,292 [  scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-07-01 00:30:12,294 [  scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-07-01 00:30:12,538 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:12,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:12,707 [  scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-07-01 00:30:12,709 [  scc.config] DEBUG Found submodule.omero-cli-render.url
2025-07-01 00:30:12,954 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:13,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:13,121 [  scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-07-01 00:30:13,123 [  scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-07-01 00:30:13,367 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:13,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:13,539 [  scc.config] DEBUG Found submodule.omero-figure.url
2025-07-01 00:30:13,784 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:13,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:13,972 [  scc.config] DEBUG Found submodule.omero-figure.branch
2025-07-01 00:30:13,974 [  scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-07-01 00:30:14,218 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:14,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:14,385 [  scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-07-01 00:30:14,387 [  scc.config] DEBUG Found submodule.omero-gallery.url
2025-07-01 00:30:14,631 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:14,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:14,803 [  scc.config] DEBUG Found submodule.omero-gallery.branch
2025-07-01 00:30:14,805 [  scc.config] DEBUG Found submodule.omero-iviewer.url
2025-07-01 00:30:15,049 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:15,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:15,241 [  scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-07-01 00:30:15,243 [  scc.config] DEBUG Found submodule.omero-mapr.url
2025-07-01 00:30:15,488 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:15,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:15,655 [  scc.config] DEBUG Found submodule.omero-mapr.branch
2025-07-01 00:30:15,657 [  scc.config] DEBUG Found submodule.omero-metadata.url
2025-07-01 00:30:15,901 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:16,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:16,066 [  scc.config] DEBUG Found submodule.omero-metadata.branch
2025-07-01 00:30:16,068 [  scc.config] DEBUG Found submodule.omero-parade.url
2025-07-01 00:30:16,312 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:16,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:16,477 [  scc.config] DEBUG Found submodule.omero-parade.branch
2025-07-01 00:30:16,479 [  scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-07-01 00:30:16,723 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:16,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:16,898 [  scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-07-01 00:30:16,900 [  scc.config] DEBUG Found submodule.omero-rois.url
2025-07-01 00:30:17,144 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:17,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:17,315 [  scc.config] DEBUG Found submodule.omero-signup.url
2025-07-01 00:30:17,560 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:17,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:17,738 [  scc.config] DEBUG Found submodule.omero-test-infra.url
2025-07-01 00:30:17,982 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:18,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:18,179 [  scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-07-01 00:30:18,181 [  scc.config] DEBUG Found submodule.omero-upload.url
2025-07-01 00:30:18,426 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:18,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:18,598 [  scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-07-01 00:30:18,841 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:19,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:19,012 [  scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-07-01 00:30:19,256 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:19,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:19,429 [  scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-07-01 00:30:19,431 [  scc.config] DEBUG Found submodule.omero-weberror.url
2025-07-01 00:30:19,675 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:19,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:19,848 [  scc.config] DEBUG Found submodule.omero-weberror.branch
2025-07-01 00:30:19,850 [  scc.config] DEBUG Found submodule.omero-webtest.url
2025-07-01 00:30:20,095 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:20,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:20,270 [  scc.config] DEBUG Found submodule.omero-webtest.branch
2025-07-01 00:30:20,272 [  scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-07-01 00:30:20,516 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:20,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:20,678 [  scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-07-01 00:30:20,680 [  scc.config] DEBUG Found submodule.scripts.url
2025-07-01 00:30:20,924 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-01 00:30:21,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-01 00:30:21,097 [  scc.config] DEBUG Found submodule.scripts.branch
2025-07-01 00:30:21,098 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-07-01 00:30:21,186 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7fdaf57ac0d0> has local changes
2025-07-01 00:30:21,186 [     scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only

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

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

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


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


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

Merged PRs:
  - PR 59 will-moore 'Apply settings to Plate'
  - PR 69 dominikl 'Fix help text for impo/export commands'
  - PR 71 dominikl 'Escape slash character in image names'

Repository: ome/omero-cli-zarr
Excluded PRs:
  - PR 174 will-moore 'Skip wells' (stage: draft)
  - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
  - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
  - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
  - PR 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..d7cad16
Previously merged:
  - 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 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
  - PR 179 will-moore 'Changelog 0.6.0'

Repository: ome/omero-figure
Excluded PRs:
  - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
  - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
  - PR 619 will-moore 'OME-Zarr support' (stage: draft)
  - PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..3e8fa730
Previously merged:
  - 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 605 Tom-TBT 'Colorbar feature'
  - PR 610 will-moore 'Add docs/contributing.rst'
  - PR 612 will-moore 'Script version'
  - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'

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

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

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

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

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

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

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

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

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

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

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

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


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


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

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

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

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

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


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


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

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

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


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


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

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

Repository: ome/scripts
Excluded PRs:
  - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
  - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..573db34
Previously merged:
  - 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#465 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/465/)'
2025-07-01 00:30:21,199 [     scc.git] DEBUG [detached HEAD 221adbe] merge master -Dorg -Ssuccess-only
2025-07-01 00:30:21,200 [   scc.merge] INFO  Repository: ome/omero-plugins
2025-07-01 00:30:21,200 [     scc.git] DEBUG  23 files changed, 44 insertions(+), 44 deletions(-)
2025-07-01 00:30:21,200 [   scc.merge] INFO  Already up to date.
2025-07-01 00:30:21,200 [   scc.merge] INFO  
2025-07-01 00:30:21,200 [   scc.merge] INFO  Merged PRs:
2025-07-01 00:30:21,200 [   scc.merge] INFO    - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-07-01 00:30:21,200 [   scc.merge] INFO    - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-07-01 00:30:21,200 [   scc.merge] INFO    - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-07-01 00:30:21,200 [   scc.merge] INFO  
2025-07-01 00:30:21,200 [   scc.merge] INFO  Repository: ome/minimal-omero-client
2025-07-01 00:30:21,200 [   scc.merge] INFO  Already up to date.
2025-07-01 00:30:21,200 [   scc.merge] INFO  
2025-07-01 00:30:21,200 [   scc.merge] INFO  
2025-07-01 00:30:21,200 [   scc.merge] INFO  Repository: ome/omero-cli-duplicate
2025-07-01 00:30:21,200 [   scc.merge] INFO  Excluded PRs:
2025-07-01 00:30:21,200 [   scc.merge] INFO    - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-07-01 00:30:21,200 [   scc.merge] INFO  Already up to date.
2025-07-01 00:30:21,200 [   scc.merge] INFO  
2025-07-01 00:30:21,200 [   scc.merge] INFO  
2025-07-01 00:30:21,200 [   scc.merge] INFO  Repository: ome/omero-cli-render
2025-07-01 00:30:21,200 [   scc.merge] INFO  Excluded PRs:
2025-07-01 00:30:21,200 [   scc.merge] INFO    - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-07-01 00:30:21,201 [   scc.merge] INFO    - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-07-01 00:30:21,201 [   scc.merge] INFO  Already up to date.
2025-07-01 00:30:21,201 [   scc.merge] INFO  
2025-07-01 00:30:21,201 [   scc.merge] INFO  Merged PRs:
2025-07-01 00:30:21,201 [   scc.merge] INFO    - PR 59 will-moore 'Apply settings to Plate'
2025-07-01 00:30:21,201 [   scc.merge] INFO    - PR 69 dominikl 'Fix help text for impo/export commands'
2025-07-01 00:30:21,201 [   scc.merge] INFO    - PR 71 dominikl 'Escape slash character in image names'
2025-07-01 00:30:21,201 [   scc.merge] INFO  
2025-07-01 00:30:21,201 [   scc.merge] INFO  Repository: ome/omero-cli-zarr
2025-07-01 00:30:21,201 [   scc.merge] INFO  Excluded PRs:
2025-07-01 00:30:21,201 [   scc.merge] INFO    - PR 174 will-moore 'Skip wells' (stage: draft)
2025-07-01 00:30:21,201 [   scc.merge] INFO    - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
2025-07-01 00:30:21,201 [   scc.merge] INFO    - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-07-01 00:30:21,201 [   scc.merge] INFO    - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-07-01 00:30:21,201 [   scc.merge] INFO    - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-07-01 00:30:21,201 [   scc.merge] INFO    - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-07-01 00:30:21,201 [   scc.merge] INFO    - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-07-01 00:30:21,201 [   scc.merge] INFO    - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-07-01 00:30:21,201 [   scc.merge] INFO  Updating 11d3587..d7cad16
2025-07-01 00:30:21,201 [   scc.merge] INFO  Previously merged:
2025-07-01 00:30:21,201 [   scc.merge] INFO    - PR 177 jburel 'Replace fromstring by frombuffer'
2025-07-01 00:30:21,201 [   scc.merge] INFO    - PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
2025-07-01 00:30:21,201 [   scc.merge] INFO    - PR 147 will-moore 'Name option'
2025-07-01 00:30:21,201 [   scc.merge] INFO    - PR 173 will-moore 'Add test_export_plate_polygons()'
2025-07-01 00:30:21,201 [   scc.merge] INFO    - PR 171 will-moore 'Initial addition of integration tests'
2025-07-01 00:30:21,201 [   scc.merge] INFO    - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-01 00:30:21,201 [   scc.merge] INFO  
2025-07-01 00:30:21,201 [   scc.merge] INFO  Merged PRs:
2025-07-01 00:30:21,201 [   scc.merge] INFO    - PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
2025-07-01 00:30:21,201 [   scc.merge] INFO    - PR 179 will-moore 'Changelog 0.6.0'
2025-07-01 00:30:21,201 [   scc.merge] INFO  
2025-07-01 00:30:21,201 [   scc.merge] INFO  Repository: ome/omero-figure
2025-07-01 00:30:21,201 [   scc.merge] INFO  Excluded PRs:
2025-07-01 00:30:21,201 [   scc.merge] INFO    - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-07-01 00:30:21,201 [   scc.merge] INFO    - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-07-01 00:30:21,201 [   scc.merge] INFO    - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-07-01 00:30:21,201 [   scc.merge] INFO    - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-07-01 00:30:21,201 [   scc.merge] INFO  Updating 9cc36cde..3e8fa730
2025-07-01 00:30:21,202 [   scc.merge] INFO  Previously merged:
2025-07-01 00:30:21,202 [   scc.merge] INFO    - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-07-01 00:30:21,202 [   scc.merge] INFO    - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-07-01 00:30:21,202 [   scc.merge] INFO    - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-07-01 00:30:21,202 [   scc.merge] INFO    - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-01 00:30:21,202 [   scc.merge] INFO  
2025-07-01 00:30:21,202 [   scc.merge] INFO  Merged PRs:
2025-07-01 00:30:21,202 [   scc.merge] INFO    - PR 600 Rdornier 'Label on rois'
2025-07-01 00:30:21,202 [   scc.merge] INFO    - PR 605 Tom-TBT 'Colorbar feature'
2025-07-01 00:30:21,202 [   scc.merge] INFO    - PR 610 will-moore 'Add docs/contributing.rst'
2025-07-01 00:30:21,202 [   scc.merge] INFO    - PR 612 will-moore 'Script version'
2025-07-01 00:30:21,202 [   scc.merge] INFO    - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-07-01 00:30:21,202 [   scc.merge] INFO  
2025-07-01 00:30:21,202 [   scc.merge] INFO  Conflicting PRs (not included):
2025-07-01 00:30:21,202 [   scc.merge] INFO    - PR 616 Rdornier 'Fix labels around border'
2025-07-01 00:30:21,202 [   scc.merge] INFO    - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-07-01 00:30:21,202 [   scc.merge] INFO  
2025-07-01 00:30:21,202 [   scc.merge] INFO  Repository: ome/omero-fpbioimage
2025-07-01 00:30:21,202 [   scc.merge] INFO  Already up to date.
2025-07-01 00:30:21,202 [   scc.merge] INFO  
2025-07-01 00:30:21,202 [   scc.merge] INFO  Merged PRs:
2025-07-01 00:30:21,202 [   scc.merge] INFO    - PR 18 jburel 'default  size z value'
2025-07-01 00:30:21,202 [   scc.merge] INFO  
2025-07-01 00:30:21,202 [   scc.merge] INFO  Repository: ome/omero-gallery
2025-07-01 00:30:21,202 [   scc.merge] INFO  Already up to date.
2025-07-01 00:30:21,202 [   scc.merge] INFO  
2025-07-01 00:30:21,202 [   scc.merge] INFO  Merged PRs:
2025-07-01 00:30:21,202 [   scc.merge] INFO    - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-07-01 00:30:21,202 [   scc.merge] INFO    - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-07-01 00:30:21,202 [   scc.merge] INFO    - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-07-01 00:30:21,202 [   scc.merge] INFO    - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-07-01 00:30:21,202 [   scc.merge] INFO  
2025-07-01 00:30:21,202 [   scc.merge] INFO  Conflicting PRs (not included):
2025-07-01 00:30:21,202 [   scc.merge] INFO    - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-07-01 00:30:21,202 [   scc.merge] INFO    - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-07-01 00:30:21,202 [   scc.merge] INFO    - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-07-01 00:30:21,202 [   scc.merge] INFO  
2025-07-01 00:30:21,202 [   scc.merge] INFO  Repository: ome/omero-iviewer
2025-07-01 00:30:21,203 [   scc.merge] INFO  Excluded PRs:
2025-07-01 00:30:21,203 [   scc.merge] INFO    - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-07-01 00:30:21,203 [   scc.merge] INFO    - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-07-01 00:30:21,203 [   scc.merge] INFO    - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-07-01 00:30:21,203 [   scc.merge] INFO    - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-07-01 00:30:21,203 [   scc.merge] INFO    - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-07-01 00:30:21,203 [   scc.merge] INFO  Updating 7a798ce..bb94cf8
2025-07-01 00:30:21,203 [   scc.merge] INFO  Previously merged:
2025-07-01 00:30:21,203 [   scc.merge] INFO    - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-01 00:30:21,203 [   scc.merge] INFO  
2025-07-01 00:30:21,203 [   scc.merge] INFO  Merged PRs:
2025-07-01 00:30:21,203 [   scc.merge] INFO    - PR 460 will-moore 'Channel min spinner fix'
2025-07-01 00:30:21,203 [   scc.merge] INFO    - PR 465 will-moore 'Save as Figure'
2025-07-01 00:30:21,203 [   scc.merge] INFO    - PR 471 will-moore 'Z projection disabled tooltip'
2025-07-01 00:30:21,203 [   scc.merge] INFO    - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-07-01 00:30:21,203 [   scc.merge] INFO  
2025-07-01 00:30:21,203 [   scc.merge] INFO  Conflicting PRs (not included):
2025-07-01 00:30:21,203 [   scc.merge] INFO    - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-07-01 00:30:21,203 [   scc.merge] INFO  
2025-07-01 00:30:21,203 [   scc.merge] INFO  Repository: ome/omero-mapr
2025-07-01 00:30:21,203 [   scc.merge] INFO  Excluded PRs:
2025-07-01 00:30:21,203 [   scc.merge] INFO    - PR 79 will-moore 'Right panel title' (exclude comment)
2025-07-01 00:30:21,203 [   scc.merge] INFO  Already up to date.
2025-07-01 00:30:21,203 [   scc.merge] INFO  
2025-07-01 00:30:21,203 [   scc.merge] INFO  Merged PRs:
2025-07-01 00:30:21,203 [   scc.merge] INFO    - PR 74 will-moore 'mapr extension of webclient'
2025-07-01 00:30:21,203 [   scc.merge] INFO    - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-01 00:30:21,203 [   scc.merge] INFO  
2025-07-01 00:30:21,203 [   scc.merge] INFO  Repository: ome/omero-metadata
2025-07-01 00:30:21,203 [   scc.merge] INFO  Updating 3cd120c..55060a2
2025-07-01 00:30:21,203 [   scc.merge] INFO  Previously merged:
2025-07-01 00:30:21,203 [   scc.merge] INFO    - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-01 00:30:21,203 [   scc.merge] INFO  
2025-07-01 00:30:21,203 [   scc.merge] INFO  Conflicting PRs (not included):
2025-07-01 00:30:21,203 [   scc.merge] INFO    - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-07-01 00:30:21,203 [   scc.merge] INFO    - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-07-01 00:30:21,203 [   scc.merge] INFO  
2025-07-01 00:30:21,203 [   scc.merge] INFO  Repository: ome/omero-parade
2025-07-01 00:30:21,204 [   scc.merge] INFO  Excluded PRs:
2025-07-01 00:30:21,204 [   scc.merge] INFO    - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-07-01 00:30:21,204 [   scc.merge] INFO    - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-07-01 00:30:21,204 [   scc.merge] INFO    - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-07-01 00:30:21,204 [   scc.merge] INFO    - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-07-01 00:30:21,204 [   scc.merge] INFO  Already up to date.
2025-07-01 00:30:21,204 [   scc.merge] INFO  
2025-07-01 00:30:21,204 [   scc.merge] INFO  Merged PRs:
2025-07-01 00:30:21,204 [   scc.merge] INFO    - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-07-01 00:30:21,204 [   scc.merge] INFO    - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-07-01 00:30:21,204 [   scc.merge] INFO    - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-01 00:30:21,204 [   scc.merge] INFO  
2025-07-01 00:30:21,204 [   scc.merge] INFO  Repository: ome/omero-prometheus-tools
2025-07-01 00:30:21,204 [   scc.merge] INFO  Already up to date.
2025-07-01 00:30:21,204 [   scc.merge] INFO  
2025-07-01 00:30:21,204 [   scc.merge] INFO  
2025-07-01 00:30:21,204 [   scc.merge] INFO  Repository: ome/omero-rois
2025-07-01 00:30:21,204 [   scc.merge] INFO  Excluded PRs:
2025-07-01 00:30:21,204 [   scc.merge] INFO    - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-07-01 00:30:21,204 [   scc.merge] INFO    - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-07-01 00:30:21,204 [   scc.merge] INFO  Already up to date.
2025-07-01 00:30:21,204 [   scc.merge] INFO  
2025-07-01 00:30:21,204 [   scc.merge] INFO  
2025-07-01 00:30:21,204 [   scc.merge] INFO  Repository: ome/omero-signup
2025-07-01 00:30:21,204 [   scc.merge] INFO  Already up to date.
2025-07-01 00:30:21,204 [   scc.merge] INFO  
2025-07-01 00:30:21,204 [   scc.merge] INFO  Conflicting PRs (not included):
2025-07-01 00:30:21,204 [   scc.merge] INFO    - PR 14 manics 'Add pre-commit (black, flake8)'
2025-07-01 00:30:21,204 [   scc.merge] INFO  
2025-07-01 00:30:21,204 [   scc.merge] INFO  Repository: openmicroscopy/omero-test-infra
2025-07-01 00:30:21,204 [   scc.merge] INFO  Excluded PRs:
2025-07-01 00:30:21,204 [   scc.merge] INFO    - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-07-01 00:30:21,204 [   scc.merge] INFO    - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-07-01 00:30:21,204 [   scc.merge] INFO    - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-07-01 00:30:21,204 [   scc.merge] INFO  Already up to date.
2025-07-01 00:30:21,204 [   scc.merge] INFO  
2025-07-01 00:30:21,204 [   scc.merge] INFO  Merged PRs:
2025-07-01 00:30:21,204 [   scc.merge] INFO    - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-07-01 00:30:21,205 [   scc.merge] INFO    - PR 76 will-moore 'Run cli deps'
2025-07-01 00:30:21,205 [   scc.merge] INFO  
2025-07-01 00:30:21,205 [   scc.merge] INFO  Repository: ome/omero-upload
2025-07-01 00:30:21,205 [   scc.merge] INFO  Already up to date.
2025-07-01 00:30:21,205 [   scc.merge] INFO  
2025-07-01 00:30:21,205 [   scc.merge] INFO  
2025-07-01 00:30:21,205 [   scc.merge] INFO  Repository: ome/omero-virtual-microscope
2025-07-01 00:30:21,205 [   scc.merge] INFO  Updating deab817..160d894
2025-07-01 00:30:21,205 [   scc.merge] INFO  Previously merged:
2025-07-01 00:30:21,205 [   scc.merge] INFO    - PR 20 jburel 'Build'
2025-07-01 00:30:21,205 [   scc.merge] INFO  
2025-07-01 00:30:21,205 [   scc.merge] INFO  
2025-07-01 00:30:21,205 [   scc.merge] INFO  Repository: ome/omero-web-zarr
2025-07-01 00:30:21,205 [   scc.merge] INFO  Excluded PRs:
2025-07-01 00:30:21,205 [   scc.merge] INFO    - PR 18 will-moore 'Build' (status: failure)
2025-07-01 00:30:21,205 [   scc.merge] INFO    - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-07-01 00:30:21,205 [   scc.merge] INFO  Already up to date.
2025-07-01 00:30:21,205 [   scc.merge] INFO  
2025-07-01 00:30:21,205 [   scc.merge] INFO  Conflicting PRs (not included):
2025-07-01 00:30:21,205 [   scc.merge] INFO    - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-07-01 00:30:21,205 [   scc.merge] INFO  
2025-07-01 00:30:21,205 [   scc.merge] INFO  Repository: openmicroscopy/omero-weberror
2025-07-01 00:30:21,205 [   scc.merge] INFO  Already up to date.
2025-07-01 00:30:21,205 [   scc.merge] INFO  
2025-07-01 00:30:21,205 [   scc.merge] INFO  
2025-07-01 00:30:21,205 [   scc.merge] INFO  Repository: openmicroscopy/omero-webtest
2025-07-01 00:30:21,205 [   scc.merge] INFO  Already up to date.
2025-07-01 00:30:21,205 [   scc.merge] INFO  
2025-07-01 00:30:21,205 [   scc.merge] INFO  
2025-07-01 00:30:21,205 [   scc.merge] INFO  Repository: ome/rOMERO-gateway
2025-07-01 00:30:21,205 [   scc.merge] INFO  Already up to date.
2025-07-01 00:30:21,205 [   scc.merge] INFO  
2025-07-01 00:30:21,205 [   scc.merge] INFO  Conflicting PRs (not included):
2025-07-01 00:30:21,205 [   scc.merge] INFO    - PR 100 dominikl 'Run tests properly'
2025-07-01 00:30:21,205 [   scc.merge] INFO  
2025-07-01 00:30:21,205 [   scc.merge] INFO  Repository: ome/scripts
2025-07-01 00:30:21,205 [   scc.merge] INFO  Excluded PRs:
2025-07-01 00:30:21,205 [   scc.merge] INFO    - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-07-01 00:30:21,206 [   scc.merge] INFO    - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-07-01 00:30:21,206 [   scc.merge] INFO  Updating 4b4c755..573db34
2025-07-01 00:30:21,206 [   scc.merge] INFO  Previously merged:
2025-07-01 00:30:21,206 [   scc.merge] INFO    - PR 227 jburel 'Replace tostring by tobytes'
2025-07-01 00:30:21,206 [   scc.merge] INFO    - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-07-01 00:30:21,206 [   scc.merge] INFO  
2025-07-01 00:30:21,206 [   scc.merge] INFO  Merged PRs:
2025-07-01 00:30:21,206 [   scc.merge] INFO    - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-07-01 00:30:21,206 [   scc.merge] INFO  
2025-07-01 00:30:21,206 [   scc.merge] INFO  Conflicting PRs (not included):
2025-07-01 00:30:21,206 [   scc.merge] INFO    - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-07-01 00:30:21,206 [   scc.merge] INFO  
2025-07-01 00:30:21,206 [   scc.merge] DEBUG Cleaning remote branches created for merging
2025-07-01 00:30:21,206 [     scc.git] DEBUG Calling 'git remote'
2025-07-01 00:30:21,208 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-07-01 00:30:21,208 [     scc.git] DEBUG Calling 'git remote'
2025-07-01 00:30:21,210 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:30:21,210 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-07-01 00:30:21,210 [     scc.git] DEBUG Calling 'git remote'
2025-07-01 00:30:21,212 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:30:21,212 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-07-01 00:30:21,213 [     scc.git] DEBUG Calling 'git remote'
2025-07-01 00:30:21,215 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:30:21,215 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-07-01 00:30:21,215 [     scc.git] DEBUG Calling 'git remote'
2025-07-01 00:30:21,217 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:30:21,217 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-07-01 00:30:21,217 [     scc.git] DEBUG Calling 'git remote'
2025-07-01 00:30:21,219 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:30:21,219 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-07-01 00:30:21,219 [     scc.git] DEBUG Calling 'git remote'
2025-07-01 00:30:21,221 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:30:21,222 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-07-01 00:30:21,222 [     scc.git] DEBUG Calling 'git remote'
2025-07-01 00:30:21,224 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:30:21,224 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-07-01 00:30:21,224 [     scc.git] DEBUG Calling 'git remote'
2025-07-01 00:30:21,226 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:30:21,226 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-07-01 00:30:21,226 [     scc.git] DEBUG Calling 'git remote'
2025-07-01 00:30:21,228 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:30:21,228 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-07-01 00:30:21,228 [     scc.git] DEBUG Calling 'git remote'
2025-07-01 00:30:21,230 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:30:21,230 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-07-01 00:30:21,230 [     scc.git] DEBUG Calling 'git remote'
2025-07-01 00:30:21,233 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:30:21,233 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-07-01 00:30:21,233 [     scc.git] DEBUG Calling 'git remote'
2025-07-01 00:30:21,235 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:30:21,235 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-07-01 00:30:21,235 [     scc.git] DEBUG Calling 'git remote'
2025-07-01 00:30:21,237 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:30:21,237 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-07-01 00:30:21,237 [     scc.git] DEBUG Calling 'git remote'
2025-07-01 00:30:21,239 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:30:21,239 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-07-01 00:30:21,239 [     scc.git] DEBUG Calling 'git remote'
2025-07-01 00:30:21,241 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:30:21,242 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-07-01 00:30:21,242 [     scc.git] DEBUG Calling 'git remote'
2025-07-01 00:30:21,244 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:30:21,244 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-07-01 00:30:21,244 [     scc.git] DEBUG Calling 'git remote'
2025-07-01 00:30:21,246 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:30:21,246 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-07-01 00:30:21,246 [     scc.git] DEBUG Calling 'git remote'
2025-07-01 00:30:21,248 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:30:21,248 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-07-01 00:30:21,248 [     scc.git] DEBUG Calling 'git remote'
2025-07-01 00:30:21,251 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:30:21,251 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-07-01 00:30:21,251 [     scc.git] DEBUG Calling 'git remote'
2025-07-01 00:30:21,253 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:30:21,253 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-07-01 00:30:21,253 [     scc.git] DEBUG Calling 'git remote'
2025-07-01 00:30:21,255 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-01 00:30:21,255 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-07-01 00:30:21,255 [     scc.git] DEBUG Calling 'git remote'
2025-07-01 00:30:21,257 [     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 56bb04c] 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 7468e38] Update component versions
 1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-07-01 00:31:09,438 [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-07-01 00:31:19,041 [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-07-01 00:31:21,612 [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-07-01 00:31:26,511 [github.Reque] INFO  Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-07-01 00:32:07,440 [    scc.push] INFO  Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS