Skipping 217 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-07-25 00:41:07,381 [ scc.git] DEBUG Calling 'git merge-base bb94cf8da960e3283090038b04432f301560f5e4 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-07-25 00:41:07,384 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..bb94cf8da960e3283090038b04432f301560f5e4'
2025-07-25 00:41:07,387 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#487](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-07-25 00:41:07,389 [ scc.config] DEBUG Found github.token
2025-07-25 00:41:07,389 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-07-25 00:41:07,390 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-25 00:41:07,431 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:07,431 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:07,433 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-25 00:41:07,474 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-25 00:41:07,481 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa5ec057550> has no local changes
2025-07-25 00:41:07,481 [ 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#487 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/)'
2025-07-25 00:41:07,490 [ scc.git] DEBUG [detached HEAD 25d7640] merge master -Dorg -Ssuccess-only
2025-07-25 00:41:07,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:41:07,491 [ scc.repo] DEBUG ## PRs found:
2025-07-25 00:41:07,632 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:07,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-07-25 00:41:08,145 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:08,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-07-25 00:41:08,642 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:08,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-07-25 00:41:09,168 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:09,418 [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-25 00:41:09,669 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:09,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-07-25 00:41:10,204 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:10,407 [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-25 00:41:10,407 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-25 00:41:10,659 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:10,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-07-25 00:41:11,197 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:11,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-07-25 00:41:11,733 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:12,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-07-25 00:41:12,273 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:12,495 [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-25 00:41:12,746 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:12,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-07-25 00:41:13,224 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:13,418 [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-25 00:41:13,418 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-07-25 00:41:13,418 [ scc.repo] DEBUG ## Branches found:
2025-07-25 00:41:13,418 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-07-25 00:41:13,419 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:13,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:13,421 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-25 00:41:13,424 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-25 00:41:13,424 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-25 00:41:13,427 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-25 00:41:13,430 [ scc.git] DEBUG Already up to date.
2025-07-25 00:41:13,430 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-07-25 00:41:13,709 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-07-25 00:41:13,709 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-07-25 00:41:13,714 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-07-25 00:41:13,996 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-07-25 00:41:13,996 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-07-25 00:41:14,000 [ scc.git] DEBUG ## Unique users: []
2025-07-25 00:41:14,000 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:14,000 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:14,003 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-07-25 00:41:14,007 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:14,009 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-07-25 00:41:14,018 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-25 00:41:14,022 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-07-25 00:41:14,022 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-07-25 00:41:14,022 [ scc.git] DEBUG requirements.txt | 2 +-
2025-07-25 00:41:14,022 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-07-25 00:41:14,022 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-07-25 00:41:14,022 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-07-25 00:41:14,023 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:14,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:41:14,197 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-07-25 00:41:14,202 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:14,204 [ 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-25 00:41:14,213 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-25 00:41:14,216 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-07-25 00:41:14,216 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-07-25 00:41:14,448 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:14,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:41:14,617 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-25 00:41:14,660 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:14,660 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:14,663 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-25 00:41:14,703 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-25 00:41:14,707 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa5eae68290> has no local changes
2025-07-25 00:41:14,707 [ 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#487 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/)'
2025-07-25 00:41:14,714 [ scc.git] DEBUG [detached HEAD 3cd4359] merge master -Dorg -Ssuccess-only
2025-07-25 00:41:14,714 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:41:14,714 [ scc.repo] DEBUG ## PRs found:
2025-07-25 00:41:14,868 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:15,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-07-25 00:41:15,458 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:15,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-07-25 00:41:15,938 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:16,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-07-25 00:41:16,439 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:16,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-07-25 00:41:17,168 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:17,412 [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-25 00:41:17,663 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:17,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-07-25 00:41:18,231 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:18,416 [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-25 00:41:18,417 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-07-25 00:41:18,668 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:18,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-07-25 00:41:19,146 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:19,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-07-25 00:41:19,624 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:19,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-07-25 00:41:20,147 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:20,357 [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-25 00:41:20,609 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:20,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-07-25 00:41:21,080 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:21,285 [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-25 00:41:21,285 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-07-25 00:41:21,285 [ scc.repo] DEBUG ## Branches found:
2025-07-25 00:41:21,285 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-07-25 00:41:21,285 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:21,285 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:21,288 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-25 00:41:21,290 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-25 00:41:21,290 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-25 00:41:21,294 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-25 00:41:21,301 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-07-25 00:41:21,536 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:21,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-07-25 00:41:21,973 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-07-25 00:41:22,253 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-07-25 00:41:22,253 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-07-25 00:41:22,257 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-07-25 00:41:22,551 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-07-25 00:41:22,551 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-07-25 00:41:22,556 [ scc.git] DEBUG ## Unique users: []
2025-07-25 00:41:22,557 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:22,557 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:22,559 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-07-25 00:41:22,564 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:22,566 [ 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-25 00:41:22,580 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-07-25 00:41:22,580 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-07-25 00:41:22,580 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-07-25 00:41:22,580 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-07-25 00:41:22,581 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-25 00:41:22,581 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-25 00:41:22,584 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-25 00:41:22,588 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-07-25 00:41:22,590 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:22,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:41:22,796 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-07-25 00:41:22,801 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-25 00:41:22,804 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#487](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-07-25 00:41:22,806 [ scc.config] DEBUG Found github.token
2025-07-25 00:41:22,806 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-07-25 00:41:22,806 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-07-25 00:41:22,811 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:22,813 [ 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-25 00:41:22,828 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-07-25 00:41:22,828 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-07-25 00:41:22,828 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-07-25 00:41:22,829 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-25 00:41:22,829 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-25 00:41:22,832 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-25 00:41:22,838 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-07-25 00:41:23,047 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:23,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:41:23,232 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-07-25 00:41:23,237 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-25 00:41:23,240 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#487](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/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-25 00:41:23,242 [ scc.config] DEBUG Found github.token
2025-07-25 00:41:23,242 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-07-25 00:41:23,242 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-25 00:41:23,284 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:23,284 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:23,286 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-25 00:41:23,326 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-25 00:41:23,331 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa5eae5add0> has no local changes
2025-07-25 00:41:23,331 [ 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#487 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/)'
2025-07-25 00:41:23,337 [ scc.git] DEBUG [detached HEAD d298bf1] merge master -Dorg -Ssuccess-only
2025-07-25 00:41:23,337 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:41:23,338 [ scc.repo] DEBUG ## PRs found:
2025-07-25 00:41:23,483 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:23,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-07-25 00:41:24,060 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:24,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-07-25 00:41:24,541 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:24,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-07-25 00:41:25,095 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:25,401 [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-25 00:41:25,652 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:25,902 [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-25 00:41:26,153 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:26,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-07-25 00:41:26,689 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:26,866 [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-25 00:41:26,866 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-25 00:41:27,117 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:27,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-07-25 00:41:27,367 [ scc.repo] DEBUG # ... Include label: dependencies
2025-07-25 00:41:27,618 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:27,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-07-25 00:41:28,194 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:28,456 [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-25 00:41:28,708 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:29,009 [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-25 00:41:29,260 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:29,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-07-25 00:41:29,754 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:29,950 [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-25 00:41:29,951 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-07-25 00:41:30,202 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:30,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-07-25 00:41:30,438 [ scc.repo] DEBUG # ... Include label: dependencies
2025-07-25 00:41:30,690 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:31,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-07-25 00:41:31,280 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:31,531 [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-25 00:41:31,782 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:32,086 [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-25 00:41:32,338 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:32,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-07-25 00:41:32,819 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:33,017 [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-25 00:41:33,017 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-07-25 00:41:33,268 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:33,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-07-25 00:41:33,738 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:33,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-07-25 00:41:34,233 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:34,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-07-25 00:41:34,696 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:34,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-07-25 00:41:35,195 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:35,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-07-25 00:41:35,705 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:35,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-07-25 00:41:36,188 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:36,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-07-25 00:41:36,418 [ scc.repo] DEBUG ## Branches found:
2025-07-25 00:41:36,418 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-07-25 00:41:36,418 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:36,418 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:36,421 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-25 00:41:36,424 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-25 00:41:36,424 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-25 00:41:36,427 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-25 00:41:36,430 [ scc.git] DEBUG Already up to date.
2025-07-25 00:41:36,430 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-07-25 00:41:36,718 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-07-25 00:41:36,718 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-07-25 00:41:36,722 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-07-25 00:41:36,995 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-07-25 00:41:36,996 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-07-25 00:41:37,000 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-07-25 00:41:37,280 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-07-25 00:41:37,280 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-07-25 00:41:37,284 [ scc.git] DEBUG ## Unique users: []
2025-07-25 00:41:37,284 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:37,284 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:37,287 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-07-25 00:41:37,290 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:37,292 [ 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-25 00:41:37,301 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-25 00:41:37,305 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-07-25 00:41:37,305 [ scc.git] DEBUG package.json | 2 +-
2025-07-25 00:41:37,305 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-07-25 00:41:37,306 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:37,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:41:37,478 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-07-25 00:41:37,481 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:37,483 [ 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-25 00:41:37,493 [ scc.git] DEBUG Auto-merging package-lock.json
2025-07-25 00:41:37,493 [ scc.git] DEBUG Auto-merging package.json
2025-07-25 00:41:37,494 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-25 00:41:37,498 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-07-25 00:41:37,498 [ scc.git] DEBUG package.json | 2 +-
2025-07-25 00:41:37,498 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-07-25 00:41:37,729 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:37,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:41:37,896 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-07-25 00:41:37,899 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:37,901 [ 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-25 00:41:37,910 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-25 00:41:37,913 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-07-25 00:41:37,914 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-07-25 00:41:38,147 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:38,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:41:38,325 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-25 00:41:38,368 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:38,368 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:38,370 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-25 00:41:38,410 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-25 00:41:38,415 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa5eaf64ad0> has no local changes
2025-07-25 00:41:38,415 [ 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#487 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/)'
2025-07-25 00:41:38,421 [ scc.git] DEBUG [detached HEAD d3971dd] merge master -Dorg -Ssuccess-only
2025-07-25 00:41:38,421 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:41:38,421 [ scc.repo] DEBUG ## PRs found:
2025-07-25 00:41:38,576 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:38,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-07-25 00:41:38,780 [ scc.repo] DEBUG ## Branches found:
2025-07-25 00:41:38,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-07-25 00:41:38,780 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:38,780 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:38,783 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-25 00:41:38,785 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-25 00:41:38,785 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-25 00:41:38,788 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-25 00:41:38,791 [ scc.git] DEBUG Already up to date.
2025-07-25 00:41:38,791 [ scc.git] DEBUG ## Unique users: []
2025-07-25 00:41:38,791 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:38,791 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:38,793 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-25 00:41:38,834 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:38,834 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:38,836 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-25 00:41:38,877 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-25 00:41:38,880 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa5eaf3c9d0> has no local changes
2025-07-25 00:41:38,880 [ 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#487 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/)'
2025-07-25 00:41:38,887 [ scc.git] DEBUG [detached HEAD 2470d6b] merge master -Dorg -Ssuccess-only
2025-07-25 00:41:38,887 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:41:38,887 [ scc.repo] DEBUG ## PRs found:
2025-07-25 00:41:39,031 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:39,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-07-25 00:41:39,551 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:39,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-07-25 00:41:40,088 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:40,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-07-25 00:41:40,561 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:40,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-07-25 00:41:40,799 [ scc.repo] DEBUG ## Branches found:
2025-07-25 00:41:40,799 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-07-25 00:41:40,799 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:40,799 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:40,802 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-25 00:41:40,804 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-25 00:41:40,804 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-25 00:41:40,807 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-25 00:41:40,810 [ scc.git] DEBUG Already up to date.
2025-07-25 00:41:40,810 [ scc.git] DEBUG ## Unique users: []
2025-07-25 00:41:40,810 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:40,810 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:40,813 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-25 00:41:40,854 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:40,854 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:40,856 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-25 00:41:40,897 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-25 00:41:40,900 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa5eae4e6d0> has no local changes
2025-07-25 00:41:40,900 [ 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#487 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/)'
2025-07-25 00:41:40,907 [ scc.git] DEBUG [detached HEAD a2bcf02] merge master -Dorg -Ssuccess-only
2025-07-25 00:41:40,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:41:40,907 [ scc.repo] DEBUG ## PRs found:
2025-07-25 00:41:41,050 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:41,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-07-25 00:41:41,590 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:41,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-07-25 00:41:42,047 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:42,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-07-25 00:41:42,563 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:42,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-07-25 00:41:43,155 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:43,392 [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-25 00:41:43,644 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:43,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-07-25 00:41:44,216 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:44,401 [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-25 00:41:44,401 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-07-25 00:41:44,401 [ scc.repo] DEBUG ## Branches found:
2025-07-25 00:41:44,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-07-25 00:41:44,401 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:44,402 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:44,404 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-25 00:41:44,407 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-25 00:41:44,407 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-25 00:41:44,410 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-25 00:41:44,413 [ scc.git] DEBUG Already up to date.
2025-07-25 00:41:44,413 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-07-25 00:41:44,701 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-07-25 00:41:44,701 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-07-25 00:41:44,706 [ scc.git] DEBUG ## Unique users: []
2025-07-25 00:41:44,706 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:44,706 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:44,708 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-07-25 00:41:44,711 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:44,713 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-07-25 00:41:44,722 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-07-25 00:41:44,722 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-07-25 00:41:44,722 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-07-25 00:41:44,722 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-07-25 00:41:44,722 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-07-25 00:41:44,722 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-07-25 00:41:44,722 [ scc.git] DEBUG Auto-merging setup.py
2025-07-25 00:41:44,722 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-07-25 00:41:44,723 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-25 00:41:44,723 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-25 00:41:44,725 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-07-25 00:41:44,730 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-07-25 00:41:44,731 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:44,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:41:44,896 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-07-25 00:41:44,900 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-07-25 00:41:44,903 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#487](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/views.py
- setup.py
- omero_signup/signup_settings.py
--conflicts
2025-07-25 00:41:44,905 [ scc.config] DEBUG Found github.token
2025-07-25 00:41:44,906 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-07-25 00:41:44,906 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-25 00:41:44,947 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:44,947 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:44,949 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-25 00:41:44,987 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-25 00:41:44,991 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa5e9d46450> has no local changes
2025-07-25 00:41:44,991 [ 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#487 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/)'
2025-07-25 00:41:44,998 [ scc.git] DEBUG [detached HEAD c7dc4b6] merge master -Dorg -Ssuccess-only
2025-07-25 00:41:44,998 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:41:44,998 [ scc.repo] DEBUG ## PRs found:
2025-07-25 00:41:45,148 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:45,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-07-25 00:41:45,724 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:45,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-07-25 00:41:46,183 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:46,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-07-25 00:41:46,746 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:47,060 [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-25 00:41:47,311 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:47,584 [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-25 00:41:47,836 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:48,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-07-25 00:41:48,436 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:48,630 [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-25 00:41:48,630 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-07-25 00:41:48,881 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:49,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-07-25 00:41:49,407 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:49,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-07-25 00:41:49,879 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:50,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-07-25 00:41:50,400 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:50,638 [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-25 00:41:50,889 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:51,143 [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-25 00:41:51,394 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:51,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-07-25 00:41:51,882 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:52,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-07-25 00:41:52,424 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:52,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-07-25 00:41:52,906 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:53,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-07-25 00:41:53,387 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:53,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-07-25 00:41:53,930 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:54,136 [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-25 00:41:54,388 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:54,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-07-25 00:41:54,862 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:55,044 [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-25 00:41:55,045 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-07-25 00:41:55,045 [ scc.repo] DEBUG ## Branches found:
2025-07-25 00:41:55,045 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-07-25 00:41:55,045 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:55,045 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:55,048 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-25 00:41:55,051 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-25 00:41:55,051 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-25 00:41:55,054 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-25 00:41:55,057 [ scc.git] DEBUG Already up to date.
2025-07-25 00:41:55,057 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-07-25 00:41:55,339 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-07-25 00:41:55,339 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-07-25 00:41:55,343 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-07-25 00:41:55,633 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-07-25 00:41:55,633 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-07-25 00:41:55,637 [ scc.git] DEBUG ## Unique users: []
2025-07-25 00:41:55,638 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:55,638 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:55,640 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-07-25 00:41:55,645 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:55,647 [ 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-25 00:41:55,660 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-25 00:41:55,664 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-07-25 00:41:55,664 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-07-25 00:41:55,664 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-07-25 00:41:55,664 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-07-25 00:41:55,664 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-07-25 00:41:55,664 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-07-25 00:41:55,664 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-07-25 00:41:55,665 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-07-25 00:41:55,665 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:55,666 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-07-25 00:41:55,666 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-07-25 00:41:55,666 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-07-25 00:41:55,666 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-07-25 00:41:55,666 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-07-25 00:41:55,666 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-07-25 00:41:55,666 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-07-25 00:41:55,666 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-07-25 00:41:55,666 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-07-25 00:41:55,666 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-07-25 00:41:55,666 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-07-25 00:41:55,666 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-07-25 00:41:55,666 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-07-25 00:41:55,666 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-07-25 00:41:55,666 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-07-25 00:41:55,666 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-07-25 00:41:55,666 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-07-25 00:41:55,666 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-07-25 00:41:55,666 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-07-25 00:41:55,666 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-07-25 00:41:55,666 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-07-25 00:41:55,666 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-07-25 00:41:55,666 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-07-25 00:41:55,666 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-07-25 00:41:55,666 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-07-25 00:41:55,666 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-07-25 00:41:55,666 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-07-25 00:41:55,666 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-07-25 00:41:55,666 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-07-25 00:41:55,666 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-07-25 00:41:55,666 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-07-25 00:41:55,667 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-07-25 00:41:55,667 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-07-25 00:41:55,667 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-07-25 00:41:55,667 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-07-25 00:41:55,667 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-07-25 00:41:55,667 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-07-25 00:41:55,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:41:55,851 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-07-25 00:41:55,855 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:55,858 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-07-25 00:41:55,868 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-25 00:41:55,871 [ scc.git] DEBUG docker | 1 +
2025-07-25 00:41:55,871 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-07-25 00:41:56,102 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:56,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:41:56,267 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-25 00:41:56,308 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:56,308 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:56,311 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-25 00:41:56,349 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-25 00:41:56,353 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa5e9d46350> has no local changes
2025-07-25 00:41:56,353 [ 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#487 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/)'
2025-07-25 00:41:56,360 [ scc.git] DEBUG [detached HEAD 1d3ca88] merge master -Dorg -Ssuccess-only
2025-07-25 00:41:56,360 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:41:56,360 [ scc.repo] DEBUG ## PRs found:
2025-07-25 00:41:56,518 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:56,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-07-25 00:41:56,708 [ scc.repo] DEBUG ## Branches found:
2025-07-25 00:41:56,708 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-07-25 00:41:56,708 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:56,708 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:56,711 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-25 00:41:56,713 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-25 00:41:56,713 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-25 00:41:56,716 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-25 00:41:56,719 [ scc.git] DEBUG Already up to date.
2025-07-25 00:41:56,719 [ scc.git] DEBUG ## Unique users: []
2025-07-25 00:41:56,719 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:56,719 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:56,722 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-25 00:41:56,763 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:56,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:56,765 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-25 00:41:56,805 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-25 00:41:56,808 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa5eae5a190> has no local changes
2025-07-25 00:41:56,808 [ 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#487 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/)'
2025-07-25 00:41:56,815 [ scc.git] DEBUG [detached HEAD fd53c54] merge master -Dorg -Ssuccess-only
2025-07-25 00:41:56,815 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:41:56,815 [ scc.repo] DEBUG ## PRs found:
2025-07-25 00:41:56,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:57,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2025-07-25 00:41:57,141 [ scc.repo] DEBUG ## Branches found:
2025-07-25 00:41:57,141 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-07-25 00:41:57,141 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:57,141 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:57,144 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-25 00:41:57,146 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-25 00:41:57,146 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-25 00:41:57,149 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-25 00:41:57,157 [ scc.git] DEBUG Updating deab817..160d894
2025-07-25 00:41:57,392 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:57,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls/20 HTTP/1.1" 200 None
2025-07-25 00:41:57,819 [ scc.git] DEBUG ## Unique users: []
2025-07-25 00:41:57,819 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:57,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:57,822 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-25 00:41:57,863 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:41:57,863 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:41:57,866 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-25 00:41:57,906 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-25 00:41:57,909 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa5eae32bd0> has no local changes
2025-07-25 00:41:57,909 [ 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#487 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/)'
2025-07-25 00:41:57,916 [ scc.git] DEBUG [detached HEAD 6af7669] merge master -Dorg -Ssuccess-only
2025-07-25 00:41:57,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:41:57,916 [ scc.git] INFO Overriding base-branch from master to main
2025-07-25 00:41:57,916 [ scc.repo] DEBUG ## PRs found:
2025-07-25 00:41:58,069 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:58,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-07-25 00:41:58,596 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:58,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-07-25 00:41:59,160 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:59,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-07-25 00:41:59,635 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:41:59,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-07-25 00:42:00,163 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:00,421 [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-25 00:42:00,673 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:00,951 [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-25 00:42:01,203 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:01,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-07-25 00:42:01,734 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:01,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-07-25 00:42:02,217 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:02,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-07-25 00:42:02,698 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:02,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-07-25 00:42:03,244 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:03,482 [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-25 00:42:03,734 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:03,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-07-25 00:42:04,206 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:04,406 [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-25 00:42:04,407 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-07-25 00:42:04,407 [ scc.repo] DEBUG ## Branches found:
2025-07-25 00:42:04,407 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-07-25 00:42:04,407 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:42:04,407 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:42:04,410 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-07-25 00:42:04,413 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-25 00:42:04,413 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-07-25 00:42:04,416 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-07-25 00:42:04,419 [ scc.git] DEBUG Already up to date.
2025-07-25 00:42:04,419 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-07-25 00:42:04,726 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-07-25 00:42:04,727 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-07-25 00:42:04,731 [ scc.git] DEBUG ## Unique users: []
2025-07-25 00:42:04,731 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:42:04,731 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:42:04,733 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-07-25 00:42:04,736 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:42:04,738 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-07-25 00:42:04,746 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-07-25 00:42:04,746 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-07-25 00:42:04,746 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-25 00:42:04,746 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-25 00:42:04,749 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-07-25 00:42:04,753 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-07-25 00:42:04,755 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:04,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:04,952 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-07-25 00:42:04,955 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-07-25 00:42:04,958 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#487](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-07-25 00:42:04,960 [ scc.config] DEBUG Found github.token
2025-07-25 00:42:04,961 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-07-25 00:42:04,961 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-25 00:42:05,002 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:42:05,002 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:42:05,004 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-25 00:42:05,043 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-25 00:42:05,046 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa5e9d46c10> has no local changes
2025-07-25 00:42:05,046 [ 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#487 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/)'
2025-07-25 00:42:05,052 [ scc.git] DEBUG [detached HEAD 969b9b7] merge master -Dorg -Ssuccess-only
2025-07-25 00:42:05,053 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:05,053 [ scc.repo] DEBUG ## PRs found:
2025-07-25 00:42:05,203 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:05,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-07-25 00:42:05,423 [ scc.repo] DEBUG ## Branches found:
2025-07-25 00:42:05,424 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-07-25 00:42:05,424 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:42:05,424 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:42:05,427 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-25 00:42:05,429 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-25 00:42:05,429 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-25 00:42:05,432 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-25 00:42:05,435 [ scc.git] DEBUG Already up to date.
2025-07-25 00:42:05,435 [ scc.git] DEBUG ## Unique users: []
2025-07-25 00:42:05,435 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:42:05,435 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:42:05,438 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-25 00:42:05,477 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:42:05,477 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:42:05,479 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-25 00:42:05,518 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-25 00:42:05,521 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa5e9dd71d0> has no local changes
2025-07-25 00:42:05,521 [ 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#487 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/)'
2025-07-25 00:42:05,527 [ scc.git] DEBUG [detached HEAD 4840c60] merge master -Dorg -Ssuccess-only
2025-07-25 00:42:05,528 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:05,528 [ scc.repo] DEBUG ## PRs found:
2025-07-25 00:42:05,674 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:05,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-07-25 00:42:05,883 [ scc.repo] DEBUG ## Branches found:
2025-07-25 00:42:05,883 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-07-25 00:42:05,883 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:42:05,883 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:42:05,886 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-25 00:42:05,888 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-25 00:42:05,888 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-25 00:42:05,892 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-25 00:42:05,895 [ scc.git] DEBUG Already up to date.
2025-07-25 00:42:05,895 [ scc.git] DEBUG ## Unique users: []
2025-07-25 00:42:05,895 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:42:05,895 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:42:05,897 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-25 00:42:05,937 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:42:05,937 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:42:05,939 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-25 00:42:05,978 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-25 00:42:05,981 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa5eaf3d4d0> has no local changes
2025-07-25 00:42:05,981 [ 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#487 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/)'
2025-07-25 00:42:05,987 [ scc.git] DEBUG [detached HEAD 367d519] merge master -Dorg -Ssuccess-only
2025-07-25 00:42:05,988 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:05,988 [ scc.repo] DEBUG ## PRs found:
2025-07-25 00:42:06,134 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:06,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-07-25 00:42:06,636 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:06,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-07-25 00:42:07,186 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:07,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-07-25 00:42:07,688 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:07,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-07-25 00:42:08,230 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:08,441 [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-25 00:42:08,692 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:08,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-07-25 00:42:09,138 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:09,337 [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-25 00:42:09,337 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-07-25 00:42:09,337 [ scc.repo] DEBUG ## Branches found:
2025-07-25 00:42:09,337 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-07-25 00:42:09,337 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:42:09,337 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:42:09,340 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-25 00:42:09,343 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-25 00:42:09,343 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-25 00:42:09,346 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-25 00:42:09,349 [ scc.git] DEBUG Already up to date.
2025-07-25 00:42:09,349 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-07-25 00:42:09,630 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-07-25 00:42:09,630 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-07-25 00:42:09,634 [ scc.git] DEBUG ## Unique users: []
2025-07-25 00:42:09,634 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:42:09,634 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:42:09,636 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-07-25 00:42:09,639 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:42:09,642 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-07-25 00:42:09,650 [ scc.git] DEBUG Auto-merging Dockerfile
2025-07-25 00:42:09,650 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-07-25 00:42:09,651 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-25 00:42:09,651 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-25 00:42:09,654 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-07-25 00:42:09,659 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-07-25 00:42:09,660 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:09,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:09,917 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-07-25 00:42:09,920 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-07-25 00:42:09,923 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#487](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-07-25 00:42:09,925 [ scc.config] DEBUG Found github.token
2025-07-25 00:42:09,925 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-07-25 00:42:09,925 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-25 00:42:09,966 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:42:09,966 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:42:09,969 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-25 00:42:10,006 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-25 00:42:10,010 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa5eaf1b2d0> has no local changes
2025-07-25 00:42:10,010 [ 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#487 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/)'
2025-07-25 00:42:10,016 [ scc.git] DEBUG [detached HEAD ab944af] merge master -Dorg -Ssuccess-only
2025-07-25 00:42:10,017 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:10,017 [ scc.git] INFO Overriding base-branch from master to develop
2025-07-25 00:42:10,017 [ scc.repo] DEBUG ## PRs found:
2025-07-25 00:42:10,168 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:10,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-07-25 00:42:10,787 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:11,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-07-25 00:42:11,298 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:11,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-07-25 00:42:11,791 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:12,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-07-25 00:42:12,257 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:12,507 [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-25 00:42:12,759 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:12,999 [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-25 00:42:13,250 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:13,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-07-25 00:42:13,739 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:13,928 [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-25 00:42:13,929 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-07-25 00:42:14,180 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:14,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-07-25 00:42:14,703 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:14,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-07-25 00:42:15,174 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:15,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-07-25 00:42:15,645 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:15,847 [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-25 00:42:16,098 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:16,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-07-25 00:42:16,697 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:16,892 [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-25 00:42:16,892 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-07-25 00:42:17,143 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:17,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-07-25 00:42:17,646 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:17,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-07-25 00:42:18,169 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:18,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-07-25 00:42:18,998 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:19,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-07-25 00:42:19,246 [ scc.repo] DEBUG ## Branches found:
2025-07-25 00:42:19,246 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-07-25 00:42:19,246 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:42:19,247 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:42:19,249 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-07-25 00:42:19,252 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-25 00:42:19,252 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-07-25 00:42:19,255 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-07-25 00:42:19,266 [ scc.git] DEBUG Updating 4b4c755..573db34
2025-07-25 00:42:19,496 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:19,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/227 HTTP/1.1" 200 None
2025-07-25 00:42:20,199 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:20,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-07-25 00:42:20,607 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-07-25 00:42:20,903 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-07-25 00:42:20,903 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-07-25 00:42:20,908 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-07-25 00:42:21,186 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-07-25 00:42:21,186 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-07-25 00:42:21,190 [ scc.git] DEBUG ## Unique users: []
2025-07-25 00:42:21,190 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:42:21,190 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:42:21,193 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-07-25 00:42:21,199 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:42:21,201 [ 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-25 00:42:21,212 [ 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-25 00:42:21,212 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-25 00:42:21,212 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-25 00:42:21,215 [ scc.git] DEBUG Calling 'git reset --hard 573db340d5d1429fa17c7e486206948412a7c150'
2025-07-25 00:42:21,218 [ scc.git] DEBUG HEAD is now at 573db34 Bump version: 5.9.1 → 5.9.2.dev0
2025-07-25 00:42:21,220 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:21,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:21,382 [ scc.git] DEBUG Calling 'git merge-base 573db340d5d1429fa17c7e486206948412a7c150 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-07-25 00:42:21,387 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..573db340d5d1429fa17c7e486206948412a7c150'
2025-07-25 00:42:21,392 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#487](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-07-25 00:42:21,394 [ scc.config] DEBUG Found github.token
2025-07-25 00:42:21,394 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-07-25 00:42:21,394 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-07-25 00:42:21,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:42:21,401 [ 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-25 00:42:21,410 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-25 00:42:21,413 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-07-25 00:42:21,413 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-07-25 00:42:21,633 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:21,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:21,803 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-25 00:42:21,845 [ scc.git] DEBUG Get sha1 of %s
2025-07-25 00:42:21,845 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-25 00:42:21,847 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-25 00:42:21,888 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-25 00:42:21,891 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa5e841eb90> has no local changes
2025-07-25 00:42:21,892 [ 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#487 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/)'
2025-07-25 00:42:21,898 [ scc.git] DEBUG [detached HEAD d390856] merge master -Dorg -Ssuccess-only
2025-07-25 00:42:21,898 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:21,898 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-25 00:42:21,976 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-07-25 00:42:22,054 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:22,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:22,253 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-07-25 00:42:22,256 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-07-25 00:42:22,500 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:22,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:22,674 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-07-25 00:42:22,676 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-07-25 00:42:22,920 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:23,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:23,119 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-07-25 00:42:23,121 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-07-25 00:42:23,366 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:23,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:23,539 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-07-25 00:42:23,784 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:23,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:23,974 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-07-25 00:42:23,976 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-07-25 00:42:24,220 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:24,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:24,388 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-07-25 00:42:24,390 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-07-25 00:42:24,635 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:24,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:24,829 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-07-25 00:42:24,831 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-07-25 00:42:25,075 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:25,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:25,266 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-07-25 00:42:25,268 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-07-25 00:42:25,512 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:25,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:25,710 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-07-25 00:42:25,712 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-07-25 00:42:25,956 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:26,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:26,121 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-07-25 00:42:26,123 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-07-25 00:42:26,367 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:26,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:26,543 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-07-25 00:42:26,545 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-07-25 00:42:26,789 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:26,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:26,985 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-07-25 00:42:26,987 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-07-25 00:42:27,231 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:27,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:27,408 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-07-25 00:42:27,653 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:27,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:27,840 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-07-25 00:42:28,085 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:28,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:28,258 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-07-25 00:42:28,261 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-07-25 00:42:28,505 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:28,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:28,684 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-07-25 00:42:28,928 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:29,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:29,109 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-07-25 00:42:29,353 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:29,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:29,521 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-07-25 00:42:29,523 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-07-25 00:42:29,767 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:29,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:29,937 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-07-25 00:42:29,939 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-07-25 00:42:30,183 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:30,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:30,363 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-07-25 00:42:30,365 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-07-25 00:42:30,609 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:30,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:30,875 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-07-25 00:42:30,877 [ scc.config] DEBUG Found submodule.scripts.url
2025-07-25 00:42:31,121 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-25 00:42:31,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-25 00:42:31,294 [ scc.config] DEBUG Found submodule.scripts.branch
2025-07-25 00:42:31,294 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-25 00:42:31,385 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa5ed725a10> has local changes
2025-07-25 00:42:31,385 [ 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..f7eea7c
Previously merged:
- PR 179 will-moore 'Changelog 0.6.0'
- PR 177 jburel 'Replace fromstring by frombuffer'
- PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
- PR 147 will-moore 'Name option'
- PR 173 will-moore 'Add test_export_plate_polygons()'
- PR 171 will-moore 'Initial addition of integration tests'
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
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#487 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/487/)'
2025-07-25 00:42:31,398 [ scc.git] DEBUG [detached HEAD 28afaaa] merge master -Dorg -Ssuccess-only
2025-07-25 00:42:31,398 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-07-25 00:42:31,398 [ scc.merge] INFO Repository: ome/omero-plugins
2025-07-25 00:42:31,398 [ scc.merge] INFO Already up to date.
2025-07-25 00:42:31,398 [ scc.merge] INFO
2025-07-25 00:42:31,398 [ scc.merge] INFO Merged PRs:
2025-07-25 00:42:31,399 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-07-25 00:42:31,399 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-07-25 00:42:31,399 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-07-25 00:42:31,399 [ scc.merge] INFO
2025-07-25 00:42:31,399 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-07-25 00:42:31,399 [ scc.merge] INFO Already up to date.
2025-07-25 00:42:31,399 [ scc.merge] INFO
2025-07-25 00:42:31,399 [ scc.merge] INFO
2025-07-25 00:42:31,399 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-07-25 00:42:31,399 [ scc.merge] INFO Excluded PRs:
2025-07-25 00:42:31,399 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-07-25 00:42:31,399 [ scc.merge] INFO Already up to date.
2025-07-25 00:42:31,399 [ scc.merge] INFO
2025-07-25 00:42:31,399 [ scc.merge] INFO
2025-07-25 00:42:31,399 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-07-25 00:42:31,399 [ scc.merge] INFO Excluded PRs:
2025-07-25 00:42:31,399 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-07-25 00:42:31,399 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-07-25 00:42:31,399 [ scc.merge] INFO Already up to date.
2025-07-25 00:42:31,399 [ scc.merge] INFO
2025-07-25 00:42:31,399 [ scc.merge] INFO Merged PRs:
2025-07-25 00:42:31,399 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-07-25 00:42:31,399 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-07-25 00:42:31,399 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-07-25 00:42:31,399 [ scc.merge] INFO
2025-07-25 00:42:31,399 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-07-25 00:42:31,399 [ scc.merge] INFO Excluded PRs:
2025-07-25 00:42:31,399 [ scc.merge] INFO - PR 174 will-moore 'Skip wells' (stage: draft)
2025-07-25 00:42:31,399 [ scc.merge] INFO - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
2025-07-25 00:42:31,399 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-07-25 00:42:31,399 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-07-25 00:42:31,399 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-07-25 00:42:31,399 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-07-25 00:42:31,399 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-07-25 00:42:31,399 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-07-25 00:42:31,399 [ scc.merge] INFO Updating 11d3587..f7eea7c
2025-07-25 00:42:31,399 [ scc.merge] INFO Previously merged:
2025-07-25 00:42:31,399 [ scc.merge] INFO - PR 179 will-moore 'Changelog 0.6.0'
2025-07-25 00:42:31,399 [ scc.merge] INFO - PR 177 jburel 'Replace fromstring by frombuffer'
2025-07-25 00:42:31,400 [ scc.merge] INFO - PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
2025-07-25 00:42:31,400 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-07-25 00:42:31,400 [ scc.merge] INFO - PR 173 will-moore 'Add test_export_plate_polygons()'
2025-07-25 00:42:31,400 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-07-25 00:42:31,400 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-25 00:42:31,400 [ scc.merge] INFO
2025-07-25 00:42:31,400 [ scc.merge] INFO Merged PRs:
2025-07-25 00:42:31,400 [ scc.merge] INFO - PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
2025-07-25 00:42:31,400 [ scc.merge] INFO
2025-07-25 00:42:31,400 [ scc.merge] INFO Repository: ome/omero-figure
2025-07-25 00:42:31,400 [ scc.merge] INFO Excluded PRs:
2025-07-25 00:42:31,400 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-07-25 00:42:31,400 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-07-25 00:42:31,400 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-07-25 00:42:31,400 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-07-25 00:42:31,400 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-07-25 00:42:31,400 [ scc.merge] INFO Previously merged:
2025-07-25 00:42:31,400 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-07-25 00:42:31,400 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-07-25 00:42:31,400 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-07-25 00:42:31,400 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-25 00:42:31,400 [ scc.merge] INFO
2025-07-25 00:42:31,400 [ scc.merge] INFO Merged PRs:
2025-07-25 00:42:31,400 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-07-25 00:42:31,400 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-07-25 00:42:31,400 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-07-25 00:42:31,400 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-07-25 00:42:31,400 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-07-25 00:42:31,400 [ scc.merge] INFO
2025-07-25 00:42:31,400 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-25 00:42:31,400 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-07-25 00:42:31,400 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-07-25 00:42:31,400 [ scc.merge] INFO
2025-07-25 00:42:31,400 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-07-25 00:42:31,400 [ scc.merge] INFO Already up to date.
2025-07-25 00:42:31,400 [ scc.merge] INFO
2025-07-25 00:42:31,400 [ scc.merge] INFO Merged PRs:
2025-07-25 00:42:31,400 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-07-25 00:42:31,400 [ scc.merge] INFO
2025-07-25 00:42:31,400 [ scc.merge] INFO Repository: ome/omero-gallery
2025-07-25 00:42:31,400 [ scc.merge] INFO Already up to date.
2025-07-25 00:42:31,401 [ scc.merge] INFO
2025-07-25 00:42:31,401 [ scc.merge] INFO Merged PRs:
2025-07-25 00:42:31,401 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-07-25 00:42:31,401 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-07-25 00:42:31,401 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-07-25 00:42:31,401 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-07-25 00:42:31,401 [ scc.merge] INFO
2025-07-25 00:42:31,401 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-25 00:42:31,401 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-07-25 00:42:31,401 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-07-25 00:42:31,401 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-07-25 00:42:31,401 [ scc.merge] INFO
2025-07-25 00:42:31,401 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-07-25 00:42:31,401 [ scc.merge] INFO Excluded PRs:
2025-07-25 00:42:31,401 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-07-25 00:42:31,401 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-07-25 00:42:31,401 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-07-25 00:42:31,401 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-07-25 00:42:31,401 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-07-25 00:42:31,401 [ scc.merge] INFO Updating 7a798ce..bb94cf8
2025-07-25 00:42:31,401 [ scc.merge] INFO Previously merged:
2025-07-25 00:42:31,401 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-25 00:42:31,401 [ scc.merge] INFO
2025-07-25 00:42:31,401 [ scc.merge] INFO Merged PRs:
2025-07-25 00:42:31,401 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-07-25 00:42:31,401 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-07-25 00:42:31,401 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-07-25 00:42:31,401 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-07-25 00:42:31,401 [ scc.merge] INFO
2025-07-25 00:42:31,401 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-25 00:42:31,401 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-07-25 00:42:31,401 [ scc.merge] INFO
2025-07-25 00:42:31,401 [ scc.merge] INFO Repository: ome/omero-mapr
2025-07-25 00:42:31,401 [ scc.merge] INFO Excluded PRs:
2025-07-25 00:42:31,401 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-07-25 00:42:31,401 [ scc.merge] INFO Already up to date.
2025-07-25 00:42:31,401 [ scc.merge] INFO
2025-07-25 00:42:31,401 [ scc.merge] INFO Merged PRs:
2025-07-25 00:42:31,401 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-07-25 00:42:31,401 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-25 00:42:31,401 [ scc.merge] INFO
2025-07-25 00:42:31,402 [ scc.merge] INFO Repository: ome/omero-metadata
2025-07-25 00:42:31,402 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-07-25 00:42:31,402 [ scc.merge] INFO Previously merged:
2025-07-25 00:42:31,402 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-25 00:42:31,402 [ scc.merge] INFO
2025-07-25 00:42:31,402 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-25 00:42:31,402 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-07-25 00:42:31,402 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-07-25 00:42:31,402 [ scc.merge] INFO
2025-07-25 00:42:31,402 [ scc.merge] INFO Repository: ome/omero-parade
2025-07-25 00:42:31,402 [ scc.merge] INFO Excluded PRs:
2025-07-25 00:42:31,402 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-07-25 00:42:31,402 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-07-25 00:42:31,402 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-07-25 00:42:31,402 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-07-25 00:42:31,402 [ scc.merge] INFO Already up to date.
2025-07-25 00:42:31,402 [ scc.merge] INFO
2025-07-25 00:42:31,402 [ scc.merge] INFO Merged PRs:
2025-07-25 00:42:31,402 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-07-25 00:42:31,402 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-07-25 00:42:31,402 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-25 00:42:31,402 [ scc.merge] INFO
2025-07-25 00:42:31,402 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-07-25 00:42:31,402 [ scc.merge] INFO Already up to date.
2025-07-25 00:42:31,402 [ scc.merge] INFO
2025-07-25 00:42:31,402 [ scc.merge] INFO
2025-07-25 00:42:31,402 [ scc.merge] INFO Repository: ome/omero-rois
2025-07-25 00:42:31,402 [ scc.merge] INFO Excluded PRs:
2025-07-25 00:42:31,402 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-07-25 00:42:31,402 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-07-25 00:42:31,402 [ scc.merge] INFO Already up to date.
2025-07-25 00:42:31,402 [ scc.merge] INFO
2025-07-25 00:42:31,402 [ scc.merge] INFO
2025-07-25 00:42:31,402 [ scc.merge] INFO Repository: ome/omero-signup
2025-07-25 00:42:31,402 [ scc.merge] INFO Already up to date.
2025-07-25 00:42:31,402 [ scc.merge] INFO
2025-07-25 00:42:31,402 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-25 00:42:31,402 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-07-25 00:42:31,402 [ scc.merge] INFO
2025-07-25 00:42:31,402 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-07-25 00:42:31,402 [ scc.merge] INFO Excluded PRs:
2025-07-25 00:42:31,402 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-07-25 00:42:31,403 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-07-25 00:42:31,403 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-07-25 00:42:31,403 [ scc.merge] INFO Already up to date.
2025-07-25 00:42:31,403 [ scc.merge] INFO
2025-07-25 00:42:31,403 [ scc.merge] INFO Merged PRs:
2025-07-25 00:42:31,403 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-07-25 00:42:31,403 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-07-25 00:42:31,403 [ scc.merge] INFO
2025-07-25 00:42:31,403 [ scc.merge] INFO Repository: ome/omero-upload
2025-07-25 00:42:31,403 [ scc.merge] INFO Already up to date.
2025-07-25 00:42:31,403 [ scc.merge] INFO
2025-07-25 00:42:31,403 [ scc.merge] INFO
2025-07-25 00:42:31,403 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-07-25 00:42:31,403 [ scc.merge] INFO Updating deab817..160d894
2025-07-25 00:42:31,403 [ scc.merge] INFO Previously merged:
2025-07-25 00:42:31,403 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-07-25 00:42:31,403 [ scc.merge] INFO
2025-07-25 00:42:31,403 [ scc.merge] INFO
2025-07-25 00:42:31,403 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-07-25 00:42:31,403 [ scc.merge] INFO Excluded PRs:
2025-07-25 00:42:31,403 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-07-25 00:42:31,403 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-07-25 00:42:31,403 [ scc.merge] INFO Already up to date.
2025-07-25 00:42:31,403 [ scc.merge] INFO
2025-07-25 00:42:31,403 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-25 00:42:31,403 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-07-25 00:42:31,403 [ scc.merge] INFO
2025-07-25 00:42:31,403 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-07-25 00:42:31,403 [ scc.merge] INFO Already up to date.
2025-07-25 00:42:31,403 [ scc.merge] INFO
2025-07-25 00:42:31,403 [ scc.merge] INFO
2025-07-25 00:42:31,403 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-07-25 00:42:31,403 [ scc.merge] INFO Already up to date.
2025-07-25 00:42:31,403 [ scc.merge] INFO
2025-07-25 00:42:31,403 [ scc.merge] INFO
2025-07-25 00:42:31,403 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-07-25 00:42:31,403 [ scc.merge] INFO Already up to date.
2025-07-25 00:42:31,403 [ scc.merge] INFO
2025-07-25 00:42:31,403 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-25 00:42:31,403 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-07-25 00:42:31,403 [ scc.merge] INFO
2025-07-25 00:42:31,404 [ scc.merge] INFO Repository: ome/scripts
2025-07-25 00:42:31,404 [ scc.merge] INFO Excluded PRs:
2025-07-25 00:42:31,404 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-07-25 00:42:31,404 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-07-25 00:42:31,404 [ scc.merge] INFO Updating 4b4c755..573db34
2025-07-25 00:42:31,404 [ scc.merge] INFO Previously merged:
2025-07-25 00:42:31,404 [ scc.merge] INFO - PR 227 jburel 'Replace tostring by tobytes'
2025-07-25 00:42:31,404 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-07-25 00:42:31,404 [ scc.merge] INFO
2025-07-25 00:42:31,404 [ scc.merge] INFO Merged PRs:
2025-07-25 00:42:31,404 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-07-25 00:42:31,404 [ scc.merge] INFO
2025-07-25 00:42:31,404 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-25 00:42:31,404 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-07-25 00:42:31,404 [ scc.merge] INFO
2025-07-25 00:42:31,404 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-07-25 00:42:31,404 [ scc.git] DEBUG Calling 'git remote'
2025-07-25 00:42:31,406 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-07-25 00:42:31,406 [ scc.git] DEBUG Calling 'git remote'
2025-07-25 00:42:31,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:31,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-07-25 00:42:31,409 [ scc.git] DEBUG Calling 'git remote'
2025-07-25 00:42:31,411 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:31,411 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-07-25 00:42:31,411 [ scc.git] DEBUG Calling 'git remote'
2025-07-25 00:42:31,413 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:31,413 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-07-25 00:42:31,413 [ scc.git] DEBUG Calling 'git remote'
2025-07-25 00:42:31,415 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:31,415 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-07-25 00:42:31,415 [ scc.git] DEBUG Calling 'git remote'
2025-07-25 00:42:31,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:31,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-07-25 00:42:31,417 [ scc.git] DEBUG Calling 'git remote'
2025-07-25 00:42:31,420 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:31,420 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-07-25 00:42:31,420 [ scc.git] DEBUG Calling 'git remote'
2025-07-25 00:42:31,422 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:31,422 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-07-25 00:42:31,422 [ scc.git] DEBUG Calling 'git remote'
2025-07-25 00:42:31,424 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:31,424 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-07-25 00:42:31,424 [ scc.git] DEBUG Calling 'git remote'
2025-07-25 00:42:31,426 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:31,426 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-07-25 00:42:31,426 [ scc.git] DEBUG Calling 'git remote'
2025-07-25 00:42:31,428 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:31,428 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-07-25 00:42:31,428 [ scc.git] DEBUG Calling 'git remote'
2025-07-25 00:42:31,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:31,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-07-25 00:42:31,431 [ scc.git] DEBUG Calling 'git remote'
2025-07-25 00:42:31,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:31,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-07-25 00:42:31,433 [ scc.git] DEBUG Calling 'git remote'
2025-07-25 00:42:31,435 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:31,435 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-07-25 00:42:31,435 [ scc.git] DEBUG Calling 'git remote'
2025-07-25 00:42:31,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:31,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-07-25 00:42:31,438 [ scc.git] DEBUG Calling 'git remote'
2025-07-25 00:42:31,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:31,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-07-25 00:42:31,440 [ scc.git] DEBUG Calling 'git remote'
2025-07-25 00:42:31,442 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:31,442 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-07-25 00:42:31,442 [ scc.git] DEBUG Calling 'git remote'
2025-07-25 00:42:31,444 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:31,444 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-07-25 00:42:31,444 [ scc.git] DEBUG Calling 'git remote'
2025-07-25 00:42:31,446 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:31,446 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-07-25 00:42:31,446 [ scc.git] DEBUG Calling 'git remote'
2025-07-25 00:42:31,448 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:31,448 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-07-25 00:42:31,448 [ scc.git] DEBUG Calling 'git remote'
2025-07-25 00:42:31,451 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:31,451 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-07-25 00:42:31,451 [ scc.git] DEBUG Calling 'git remote'
2025-07-25 00:42:31,453 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-25 00:42:31,453 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-07-25 00:42:31,453 [ scc.git] DEBUG Calling 'git remote'
2025-07-25 00:42:31,455 [ 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 3f37e1e] 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 782e89e] 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-25 00:43:19,333 [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-25 00:43:28,831 [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-25 00:43:31,411 [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-25 00:43:36,312 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-07-25 00:44:17,260 [ 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
![[Jenkins]](/jenkins/static/daea91b1/images/svgs/logo.svg){kind=logo}
