Skipping 220 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-08-04 00:41:09,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:41:09,879 [ scc.git] DEBUG Calling 'git merge-base bb94cf8da960e3283090038b04432f301560f5e4 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-08-04 00:41:09,882 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..bb94cf8da960e3283090038b04432f301560f5e4'
2025-08-04 00:41:09,885 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#494](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-08-04 00:41:09,887 [ scc.config] DEBUG Found github.token
2025-08-04 00:41:09,887 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-08-04 00:41:09,888 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-04 00:41:09,929 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:41:09,929 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:09,931 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-04 00:41:09,970 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-04 00:41:09,977 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9291b11490> has no local changes
2025-08-04 00:41:09,977 [ 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#494 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/)'
2025-08-04 00:41:09,987 [ scc.git] DEBUG [detached HEAD d763dcf] merge master -Dorg -Ssuccess-only
2025-08-04 00:41:09,987 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:41:09,987 [ scc.repo] DEBUG ## PRs found:
2025-08-04 00:41:10,130 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:10,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-08-04 00:41:10,709 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:10,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-08-04 00:41:11,188 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:11,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-08-04 00:41:11,757 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:11,976 [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-08-04 00:41:12,228 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:12,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-08-04 00:41:12,695 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:12,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-08-04 00:41:12,916 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-04 00:41:13,167 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:13,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-08-04 00:41:13,652 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:13,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-08-04 00:41:14,135 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:14,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-08-04 00:41:14,680 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:14,960 [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-08-04 00:41:15,212 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:15,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-08-04 00:41:15,766 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:15,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-08-04 00:41:15,960 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-08-04 00:41:15,961 [ scc.repo] DEBUG ## Branches found:
2025-08-04 00:41:15,961 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-08-04 00:41:15,961 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:41:15,961 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:15,964 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-04 00:41:15,966 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-04 00:41:15,966 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-04 00:41:15,970 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-04 00:41:15,973 [ scc.git] DEBUG Already up to date.
2025-08-04 00:41:15,973 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-08-04 00:41:16,263 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-08-04 00:41:16,263 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-08-04 00:41:16,268 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-08-04 00:41:16,548 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-08-04 00:41:16,548 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-08-04 00:41:16,553 [ scc.git] DEBUG ## Unique users: []
2025-08-04 00:41:16,553 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:41:16,553 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:16,555 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-08-04 00:41:16,559 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:16,561 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-08-04 00:41:16,571 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-04 00:41:16,575 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-08-04 00:41:16,575 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-08-04 00:41:16,575 [ scc.git] DEBUG requirements.txt | 2 +-
2025-08-04 00:41:16,575 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-08-04 00:41:16,575 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-08-04 00:41:16,575 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-08-04 00:41:16,576 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:17,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:41:17,058 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-08-04 00:41:17,062 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:17,064 [ 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-08-04 00:41:17,074 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-04 00:41:17,077 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-08-04 00:41:17,077 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-08-04 00:41:17,309 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:17,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:41:17,480 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-04 00:41:17,523 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:41:17,523 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:17,525 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-04 00:41:17,566 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-04 00:41:17,570 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9291aed610> has no local changes
2025-08-04 00:41:17,570 [ 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#494 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/)'
2025-08-04 00:41:17,577 [ scc.git] DEBUG [detached HEAD 648e75b] merge master -Dorg -Ssuccess-only
2025-08-04 00:41:17,577 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:41:17,577 [ scc.repo] DEBUG ## PRs found:
2025-08-04 00:41:17,731 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:18,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-08-04 00:41:18,264 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:18,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-08-04 00:41:18,773 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:19,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-08-04 00:41:19,296 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:19,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-08-04 00:41:19,850 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:20,081 [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-08-04 00:41:20,332 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:20,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-08-04 00:41:20,795 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:20,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-08-04 00:41:20,991 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-08-04 00:41:21,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:21,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-08-04 00:41:21,722 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:21,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-08-04 00:41:22,200 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:22,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-08-04 00:41:22,731 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:23,001 [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-08-04 00:41:23,252 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:23,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-08-04 00:41:23,802 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:24,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-08-04 00:41:24,012 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-08-04 00:41:24,012 [ scc.repo] DEBUG ## Branches found:
2025-08-04 00:41:24,012 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-08-04 00:41:24,012 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:41:24,012 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:24,015 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-04 00:41:24,018 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-04 00:41:24,018 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-04 00:41:24,021 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-04 00:41:24,029 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-08-04 00:41:24,263 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:24,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-08-04 00:41:24,698 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-08-04 00:41:24,989 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-08-04 00:41:24,989 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-08-04 00:41:24,993 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-08-04 00:41:25,266 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-08-04 00:41:25,266 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-08-04 00:41:25,270 [ scc.git] DEBUG ## Unique users: []
2025-08-04 00:41:25,271 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:41:25,271 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:25,273 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-08-04 00:41:25,278 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:25,280 [ 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-08-04 00:41:25,293 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-08-04 00:41:25,293 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-08-04 00:41:25,293 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-08-04 00:41:25,293 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-08-04 00:41:25,294 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-04 00:41:25,294 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-04 00:41:25,297 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-08-04 00:41:25,301 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-08-04 00:41:25,302 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:25,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:41:25,474 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-08-04 00:41:25,479 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-08-04 00:41:25,483 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#494](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-08-04 00:41:25,485 [ scc.config] DEBUG Found github.token
2025-08-04 00:41:25,485 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-08-04 00:41:25,485 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-08-04 00:41:25,490 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:25,492 [ 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-08-04 00:41:25,507 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-08-04 00:41:25,507 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-08-04 00:41:25,507 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-08-04 00:41:25,507 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-04 00:41:25,508 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-04 00:41:25,511 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-08-04 00:41:25,516 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-08-04 00:41:25,725 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:26,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:41:26,140 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-08-04 00:41:26,144 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-08-04 00:41:26,147 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#494](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/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-08-04 00:41:26,150 [ scc.config] DEBUG Found github.token
2025-08-04 00:41:26,150 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-08-04 00:41:26,150 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-04 00:41:26,192 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:41:26,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:26,194 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-04 00:41:26,235 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-04 00:41:26,239 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9291be2510> has no local changes
2025-08-04 00:41:26,239 [ 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#494 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/)'
2025-08-04 00:41:26,246 [ scc.git] DEBUG [detached HEAD a44b6ec] merge master -Dorg -Ssuccess-only
2025-08-04 00:41:26,246 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:41:26,246 [ scc.repo] DEBUG ## PRs found:
2025-08-04 00:41:26,391 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:26,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-08-04 00:41:26,974 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:27,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-08-04 00:41:27,463 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:27,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-08-04 00:41:27,986 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:28,235 [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-08-04 00:41:28,486 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:28,767 [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-08-04 00:41:29,018 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:29,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-08-04 00:41:29,517 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:29,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-08-04 00:41:29,711 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-04 00:41:29,962 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:30,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-08-04 00:41:30,225 [ scc.repo] DEBUG # ... Include label: dependencies
2025-08-04 00:41:30,476 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:30,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-08-04 00:41:31,045 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:31,331 [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-08-04 00:41:31,582 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:31,861 [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-08-04 00:41:32,112 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:32,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-08-04 00:41:33,118 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:33,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-08-04 00:41:33,315 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-08-04 00:41:33,566 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:33,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-08-04 00:41:33,891 [ scc.repo] DEBUG # ... Include label: dependencies
2025-08-04 00:41:34,142 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:34,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-08-04 00:41:34,701 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:34,965 [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-08-04 00:41:35,216 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:35,479 [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-08-04 00:41:35,731 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:36,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-08-04 00:41:36,267 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:36,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-08-04 00:41:36,467 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-08-04 00:41:36,718 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:36,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-08-04 00:41:37,231 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:37,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-08-04 00:41:37,720 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:37,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-08-04 00:41:38,247 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:38,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-08-04 00:41:38,727 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:38,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-08-04 00:41:39,199 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:39,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-08-04 00:41:39,676 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:39,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-08-04 00:41:39,933 [ scc.repo] DEBUG ## Branches found:
2025-08-04 00:41:39,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-08-04 00:41:39,933 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:41:39,933 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:39,936 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-04 00:41:39,939 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-04 00:41:39,939 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-04 00:41:39,942 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-04 00:41:39,945 [ scc.git] DEBUG Already up to date.
2025-08-04 00:41:39,945 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-08-04 00:41:40,229 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-08-04 00:41:40,229 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-08-04 00:41:40,233 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-08-04 00:41:40,503 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-08-04 00:41:40,503 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-08-04 00:41:40,508 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-08-04 00:41:40,782 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-08-04 00:41:40,782 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-08-04 00:41:40,787 [ scc.git] DEBUG ## Unique users: []
2025-08-04 00:41:40,787 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:41:40,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:40,789 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-08-04 00:41:40,792 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:40,795 [ 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-08-04 00:41:40,803 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-04 00:41:40,807 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-08-04 00:41:40,807 [ scc.git] DEBUG package.json | 2 +-
2025-08-04 00:41:40,807 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-08-04 00:41:40,808 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:40,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:41:40,990 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-08-04 00:41:40,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:40,996 [ 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-08-04 00:41:41,006 [ scc.git] DEBUG Auto-merging package-lock.json
2025-08-04 00:41:41,006 [ scc.git] DEBUG Auto-merging package.json
2025-08-04 00:41:41,007 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-04 00:41:41,011 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-08-04 00:41:41,011 [ scc.git] DEBUG package.json | 2 +-
2025-08-04 00:41:41,011 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-08-04 00:41:41,241 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:41,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:41:41,427 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-08-04 00:41:41,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:41,433 [ 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-08-04 00:41:41,442 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-04 00:41:41,445 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-08-04 00:41:41,445 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-08-04 00:41:41,678 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:41,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:41:41,874 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-04 00:41:41,916 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:41:41,916 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:41,918 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-04 00:41:41,958 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-04 00:41:41,962 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9291b12410> has no local changes
2025-08-04 00:41:41,962 [ 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#494 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/)'
2025-08-04 00:41:41,969 [ scc.git] DEBUG [detached HEAD 8cf0a40] merge master -Dorg -Ssuccess-only
2025-08-04 00:41:41,970 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:41:41,970 [ scc.repo] DEBUG ## PRs found:
2025-08-04 00:41:42,125 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:42,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-08-04 00:41:42,320 [ scc.repo] DEBUG ## Branches found:
2025-08-04 00:41:42,320 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-08-04 00:41:42,320 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:41:42,320 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:42,322 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-04 00:41:42,325 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-04 00:41:42,325 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-04 00:41:42,328 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-04 00:41:42,331 [ scc.git] DEBUG Already up to date.
2025-08-04 00:41:42,331 [ scc.git] DEBUG ## Unique users: []
2025-08-04 00:41:42,331 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:41:42,331 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:42,333 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-04 00:41:42,375 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:41:42,375 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:42,377 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-04 00:41:42,419 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-04 00:41:42,422 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9291aa4790> has no local changes
2025-08-04 00:41:42,422 [ 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#494 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/)'
2025-08-04 00:41:42,429 [ scc.git] DEBUG [detached HEAD 5fde0fe] merge master -Dorg -Ssuccess-only
2025-08-04 00:41:42,429 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:41:42,429 [ scc.repo] DEBUG ## PRs found:
2025-08-04 00:41:42,571 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:42,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-08-04 00:41:43,090 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:43,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-08-04 00:41:43,611 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:43,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-08-04 00:41:44,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:44,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-08-04 00:41:44,319 [ scc.repo] DEBUG ## Branches found:
2025-08-04 00:41:44,319 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-08-04 00:41:44,319 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:41:44,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:44,322 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-04 00:41:44,325 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-04 00:41:44,325 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-04 00:41:44,328 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-04 00:41:44,331 [ scc.git] DEBUG Already up to date.
2025-08-04 00:41:44,331 [ scc.git] DEBUG ## Unique users: []
2025-08-04 00:41:44,331 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:41:44,331 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:44,333 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-04 00:41:44,375 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:41:44,375 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:44,377 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-04 00:41:44,418 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-04 00:41:44,422 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9291aed490> has no local changes
2025-08-04 00:41:44,422 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Generated by OMERO-plugins-push#494 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/)'
2025-08-04 00:41:44,428 [ scc.git] DEBUG [detached HEAD 0b807f4] merge master -Dorg -Ssuccess-only
2025-08-04 00:41:44,428 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:41:44,428 [ scc.repo] DEBUG ## PRs found:
2025-08-04 00:41:44,570 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:44,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-08-04 00:41:45,100 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:45,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-08-04 00:41:45,571 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:45,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-08-04 00:41:46,064 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:46,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-08-04 00:41:46,638 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:46,865 [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-08-04 00:41:47,116 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:47,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-08-04 00:41:47,675 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:47,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-08-04 00:41:47,860 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-08-04 00:41:47,860 [ scc.repo] DEBUG ## Branches found:
2025-08-04 00:41:47,860 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-08-04 00:41:47,860 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:41:47,860 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:47,862 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-04 00:41:47,865 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-04 00:41:47,865 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-04 00:41:47,868 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-04 00:41:47,871 [ scc.git] DEBUG Already up to date.
2025-08-04 00:41:47,871 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-08-04 00:41:48,156 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-08-04 00:41:48,156 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-08-04 00:41:48,160 [ scc.git] DEBUG ## Unique users: []
2025-08-04 00:41:48,160 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:41:48,160 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:48,162 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-08-04 00:41:48,166 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:48,168 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-08-04 00:41:48,177 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-08-04 00:41:48,177 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-08-04 00:41:48,177 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-08-04 00:41:48,177 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-08-04 00:41:48,177 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-08-04 00:41:48,177 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-08-04 00:41:48,177 [ scc.git] DEBUG Auto-merging setup.py
2025-08-04 00:41:48,177 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-08-04 00:41:48,177 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-04 00:41:48,178 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-04 00:41:48,180 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-08-04 00:41:48,185 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-08-04 00:41:48,186 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:48,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:41:48,369 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-08-04 00:41:48,372 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-08-04 00:41:48,376 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#494](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/signup_settings.py
- setup.py
- omero_signup/urls.py
--conflicts
2025-08-04 00:41:48,378 [ scc.config] DEBUG Found github.token
2025-08-04 00:41:48,378 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-08-04 00:41:48,378 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-04 00:41:48,420 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:41:48,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:48,422 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-04 00:41:48,459 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-04 00:41:48,463 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9290139010> has no local changes
2025-08-04 00:41:48,463 [ 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#494 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/)'
2025-08-04 00:41:48,469 [ scc.git] DEBUG [detached HEAD cc41bd4] merge master -Dorg -Ssuccess-only
2025-08-04 00:41:48,470 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:41:48,470 [ scc.repo] DEBUG ## PRs found:
2025-08-04 00:41:48,621 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:48,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-08-04 00:41:49,189 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:49,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-08-04 00:41:49,705 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:50,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-08-04 00:41:50,276 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:50,574 [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-08-04 00:41:50,825 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:51,102 [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-08-04 00:41:51,353 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:51,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-08-04 00:41:51,968 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:52,168 [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-08-04 00:41:52,169 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-08-04 00:41:52,420 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:52,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-08-04 00:41:52,901 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:53,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-08-04 00:41:53,383 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:53,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-08-04 00:41:53,939 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:54,220 [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-08-04 00:41:54,471 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:54,744 [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-08-04 00:41:54,996 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:55,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-08-04 00:41:55,549 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:55,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-08-04 00:41:56,019 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:56,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-08-04 00:41:56,511 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:56,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-08-04 00:41:57,004 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:57,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-08-04 00:41:57,537 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:57,748 [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-08-04 00:41:57,999 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:58,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-08-04 00:41:58,619 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:58,814 [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-08-04 00:41:58,815 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-08-04 00:41:58,815 [ scc.repo] DEBUG ## Branches found:
2025-08-04 00:41:58,815 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-08-04 00:41:58,815 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:41:58,815 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:58,818 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-04 00:41:58,821 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-04 00:41:58,821 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-04 00:41:58,824 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-04 00:41:58,827 [ scc.git] DEBUG Already up to date.
2025-08-04 00:41:58,827 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-08-04 00:41:59,113 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-08-04 00:41:59,113 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-08-04 00:41:59,117 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-08-04 00:41:59,395 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-08-04 00:41:59,395 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-08-04 00:41:59,400 [ scc.git] DEBUG ## Unique users: []
2025-08-04 00:41:59,400 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:41:59,400 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:59,402 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-08-04 00:41:59,406 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:59,409 [ 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-08-04 00:41:59,421 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-04 00:41:59,425 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-08-04 00:41:59,425 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-08-04 00:41:59,425 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-08-04 00:41:59,425 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-08-04 00:41:59,425 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-08-04 00:41:59,425 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-08-04 00:41:59,425 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-08-04 00:41:59,426 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-08-04 00:41:59,426 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:41:59,426 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-08-04 00:41:59,427 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-08-04 00:41:59,427 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-08-04 00:41:59,427 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-08-04 00:41:59,427 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-08-04 00:41:59,427 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-08-04 00:41:59,427 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-08-04 00:41:59,427 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-08-04 00:41:59,427 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-08-04 00:41:59,427 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-08-04 00:41:59,427 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-08-04 00:41:59,427 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-08-04 00:41:59,427 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-08-04 00:41:59,427 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-08-04 00:41:59,427 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-08-04 00:41:59,427 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-08-04 00:41:59,427 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-08-04 00:41:59,427 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-08-04 00:41:59,427 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-08-04 00:41:59,427 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-08-04 00:41:59,427 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-08-04 00:41:59,427 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-08-04 00:41:59,427 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-08-04 00:41:59,427 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-08-04 00:41:59,427 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-08-04 00:41:59,427 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-08-04 00:41:59,427 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-08-04 00:41:59,427 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-08-04 00:41:59,427 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-08-04 00:41:59,427 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-08-04 00:41:59,427 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-08-04 00:41:59,427 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-08-04 00:41:59,427 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-08-04 00:41:59,427 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-08-04 00:41:59,427 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-08-04 00:41:59,427 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-08-04 00:41:59,427 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-08-04 00:41:59,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:41:59,607 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-08-04 00:41:59,611 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:41:59,614 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-08-04 00:41:59,624 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-04 00:41:59,627 [ scc.git] DEBUG docker | 1 +
2025-08-04 00:41:59,628 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-08-04 00:41:59,858 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:00,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:00,037 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-04 00:42:00,080 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:42:00,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:00,082 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-04 00:42:00,122 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-04 00:42:00,127 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9291bd5010> has no local changes
2025-08-04 00:42:00,127 [ 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#494 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/)'
2025-08-04 00:42:00,133 [ scc.git] DEBUG [detached HEAD ad26ccc] merge master -Dorg -Ssuccess-only
2025-08-04 00:42:00,133 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:00,134 [ scc.repo] DEBUG ## PRs found:
2025-08-04 00:42:00,288 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:00,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-08-04 00:42:00,495 [ scc.repo] DEBUG ## Branches found:
2025-08-04 00:42:00,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-08-04 00:42:00,495 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:42:00,495 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:00,498 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-04 00:42:00,501 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-04 00:42:00,501 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-04 00:42:00,504 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-04 00:42:00,507 [ scc.git] DEBUG Already up to date.
2025-08-04 00:42:00,507 [ scc.git] DEBUG ## Unique users: []
2025-08-04 00:42:00,507 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:42:00,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:00,509 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-04 00:42:00,548 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:42:00,548 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:00,550 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-04 00:42:00,588 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-04 00:42:00,591 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9290125490> has no local changes
2025-08-04 00:42:00,591 [ 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#494 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/)'
2025-08-04 00:42:00,597 [ scc.git] DEBUG [detached HEAD 27454ac] merge master -Dorg -Ssuccess-only
2025-08-04 00:42:00,598 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:00,598 [ scc.repo] DEBUG ## PRs found:
2025-08-04 00:42:00,746 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:00,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2025-08-04 00:42:00,946 [ scc.repo] DEBUG ## Branches found:
2025-08-04 00:42:00,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-08-04 00:42:00,946 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:42:00,946 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:00,949 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-04 00:42:00,951 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-04 00:42:00,951 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-04 00:42:00,954 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-04 00:42:00,963 [ scc.git] DEBUG Updating deab817..160d894
2025-08-04 00:42:01,197 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:01,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls/20 HTTP/1.1" 200 None
2025-08-04 00:42:01,626 [ scc.git] DEBUG ## Unique users: []
2025-08-04 00:42:01,627 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:42:01,627 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:01,629 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-04 00:42:01,670 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:42:01,670 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:01,673 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-04 00:42:01,712 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-04 00:42:01,715 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9290165290> has no local changes
2025-08-04 00:42:01,715 [ 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#494 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/)'
2025-08-04 00:42:01,722 [ scc.git] DEBUG [detached HEAD f8187e4] merge master -Dorg -Ssuccess-only
2025-08-04 00:42:01,722 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:01,722 [ scc.git] INFO Overriding base-branch from master to main
2025-08-04 00:42:01,722 [ scc.repo] DEBUG ## PRs found:
2025-08-04 00:42:01,877 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:02,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-08-04 00:42:02,416 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:02,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-08-04 00:42:02,930 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:03,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-08-04 00:42:03,425 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:03,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-08-04 00:42:03,972 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:04,221 [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-08-04 00:42:04,472 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:04,740 [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-08-04 00:42:04,991 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:05,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-08-04 00:42:05,453 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:05,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-08-04 00:42:05,965 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:06,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-08-04 00:42:06,460 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:06,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-08-04 00:42:07,005 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:07,227 [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-08-04 00:42:07,479 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:07,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-08-04 00:42:07,988 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:08,196 [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-08-04 00:42:08,196 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-08-04 00:42:08,196 [ scc.repo] DEBUG ## Branches found:
2025-08-04 00:42:08,197 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-08-04 00:42:08,197 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:42:08,197 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:08,199 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-08-04 00:42:08,202 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-04 00:42:08,202 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-08-04 00:42:08,205 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-08-04 00:42:08,208 [ scc.git] DEBUG Already up to date.
2025-08-04 00:42:08,208 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-08-04 00:42:08,507 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-08-04 00:42:08,507 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-08-04 00:42:08,511 [ scc.git] DEBUG ## Unique users: []
2025-08-04 00:42:08,511 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:42:08,511 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:08,513 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-08-04 00:42:08,516 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:08,519 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-08-04 00:42:08,528 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-08-04 00:42:08,528 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-08-04 00:42:08,528 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-04 00:42:08,529 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-04 00:42:08,532 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-08-04 00:42:08,536 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-08-04 00:42:08,537 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:08,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:08,710 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-08-04 00:42:08,713 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-08-04 00:42:08,716 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#494](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-08-04 00:42:08,718 [ scc.config] DEBUG Found github.token
2025-08-04 00:42:08,718 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-08-04 00:42:08,718 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-04 00:42:08,758 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:42:08,758 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:08,760 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-04 00:42:08,800 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-04 00:42:08,804 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9291bd4550> has no local changes
2025-08-04 00:42:08,804 [ 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#494 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/)'
2025-08-04 00:42:08,810 [ scc.git] DEBUG [detached HEAD 32541e3] merge master -Dorg -Ssuccess-only
2025-08-04 00:42:08,811 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:08,811 [ scc.repo] DEBUG ## PRs found:
2025-08-04 00:42:08,961 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:09,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-08-04 00:42:09,167 [ scc.repo] DEBUG ## Branches found:
2025-08-04 00:42:09,167 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-08-04 00:42:09,167 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:42:09,168 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:09,170 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-04 00:42:09,172 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-04 00:42:09,172 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-04 00:42:09,175 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-04 00:42:09,179 [ scc.git] DEBUG Already up to date.
2025-08-04 00:42:09,179 [ scc.git] DEBUG ## Unique users: []
2025-08-04 00:42:09,179 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:42:09,179 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:09,181 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-04 00:42:09,223 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:42:09,223 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:09,226 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-04 00:42:09,266 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-04 00:42:09,269 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f92901234d0> has no local changes
2025-08-04 00:42:09,269 [ 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#494 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/)'
2025-08-04 00:42:09,275 [ scc.git] DEBUG [detached HEAD b36e77a] merge master -Dorg -Ssuccess-only
2025-08-04 00:42:09,276 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:09,276 [ scc.repo] DEBUG ## PRs found:
2025-08-04 00:42:09,419 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:09,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-08-04 00:42:09,610 [ scc.repo] DEBUG ## Branches found:
2025-08-04 00:42:09,610 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-08-04 00:42:09,610 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:42:09,610 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:09,612 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-04 00:42:09,614 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-04 00:42:09,614 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-04 00:42:09,617 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-04 00:42:09,620 [ scc.git] DEBUG Already up to date.
2025-08-04 00:42:09,620 [ scc.git] DEBUG ## Unique users: []
2025-08-04 00:42:09,621 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:42:09,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:09,623 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-04 00:42:09,662 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:42:09,662 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:09,664 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-04 00:42:09,703 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-04 00:42:09,707 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9291b01b10> has no local changes
2025-08-04 00:42:09,707 [ 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#494 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/)'
2025-08-04 00:42:09,713 [ scc.git] DEBUG [detached HEAD caa3c94] merge master -Dorg -Ssuccess-only
2025-08-04 00:42:09,714 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:09,714 [ scc.repo] DEBUG ## PRs found:
2025-08-04 00:42:09,861 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:10,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-08-04 00:42:10,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:10,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-08-04 00:42:10,886 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:11,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-08-04 00:42:11,387 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:11,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-08-04 00:42:11,963 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:12,180 [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-08-04 00:42:12,431 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:12,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-08-04 00:42:13,017 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:13,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-08-04 00:42:13,201 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-08-04 00:42:13,201 [ scc.repo] DEBUG ## Branches found:
2025-08-04 00:42:13,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-08-04 00:42:13,201 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:42:13,201 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:13,204 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-04 00:42:13,206 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-04 00:42:13,206 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-04 00:42:13,209 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-04 00:42:13,212 [ scc.git] DEBUG Already up to date.
2025-08-04 00:42:13,212 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-08-04 00:42:13,496 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-08-04 00:42:13,496 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-08-04 00:42:13,500 [ scc.git] DEBUG ## Unique users: []
2025-08-04 00:42:13,500 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:42:13,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:13,502 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-08-04 00:42:13,505 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:13,508 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-08-04 00:42:13,516 [ scc.git] DEBUG Auto-merging Dockerfile
2025-08-04 00:42:13,516 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-08-04 00:42:13,517 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-04 00:42:13,517 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-04 00:42:13,520 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-08-04 00:42:13,525 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-08-04 00:42:13,526 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:13,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:13,699 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-08-04 00:42:13,702 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-08-04 00:42:13,705 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#494](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-08-04 00:42:13,707 [ scc.config] DEBUG Found github.token
2025-08-04 00:42:13,707 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-08-04 00:42:13,707 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-04 00:42:13,749 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:42:13,749 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:13,751 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-04 00:42:13,789 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-04 00:42:13,793 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f92901a4250> has no local changes
2025-08-04 00:42:13,793 [ 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#494 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/)'
2025-08-04 00:42:13,800 [ scc.git] DEBUG [detached HEAD 6547d1f] merge master -Dorg -Ssuccess-only
2025-08-04 00:42:13,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:13,801 [ scc.git] INFO Overriding base-branch from master to develop
2025-08-04 00:42:13,801 [ scc.repo] DEBUG ## PRs found:
2025-08-04 00:42:13,950 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:14,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-08-04 00:42:14,502 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:14,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-08-04 00:42:15,026 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:15,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-08-04 00:42:15,501 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:15,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-08-04 00:42:15,960 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:16,281 [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-08-04 00:42:16,532 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:16,767 [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-08-04 00:42:17,018 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:17,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-08-04 00:42:17,532 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:17,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-08-04 00:42:17,730 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-08-04 00:42:17,981 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:18,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-08-04 00:42:18,450 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:18,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-08-04 00:42:18,924 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:19,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-08-04 00:42:19,451 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:19,669 [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-08-04 00:42:19,921 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:20,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-08-04 00:42:20,423 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:20,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-08-04 00:42:20,638 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-08-04 00:42:20,889 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:21,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-08-04 00:42:21,431 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:21,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-08-04 00:42:21,914 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:22,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-08-04 00:42:22,397 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:22,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-08-04 00:42:22,604 [ scc.repo] DEBUG ## Branches found:
2025-08-04 00:42:22,604 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-08-04 00:42:22,604 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:42:22,604 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:22,607 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-08-04 00:42:22,609 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-04 00:42:22,609 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-08-04 00:42:22,613 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-08-04 00:42:22,624 [ scc.git] DEBUG Updating 4b4c755..573db34
2025-08-04 00:42:22,853 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:23,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/227 HTTP/1.1" 200 None
2025-08-04 00:42:23,543 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:23,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-08-04 00:42:23,946 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-08-04 00:42:24,242 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-08-04 00:42:24,242 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-08-04 00:42:24,246 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-08-04 00:42:24,534 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-08-04 00:42:24,534 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-08-04 00:42:24,539 [ scc.git] DEBUG ## Unique users: []
2025-08-04 00:42:24,539 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:42:24,539 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:24,541 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-08-04 00:42:24,547 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:24,549 [ 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-08-04 00:42:24,560 [ 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-08-04 00:42:24,560 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-04 00:42:24,561 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-04 00:42:24,563 [ scc.git] DEBUG Calling 'git reset --hard 573db340d5d1429fa17c7e486206948412a7c150'
2025-08-04 00:42:24,568 [ scc.git] DEBUG HEAD is now at 573db34 Bump version: 5.9.1 → 5.9.2.dev0
2025-08-04 00:42:24,570 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:24,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:24,749 [ scc.git] DEBUG Calling 'git merge-base 573db340d5d1429fa17c7e486206948412a7c150 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-08-04 00:42:24,755 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..573db340d5d1429fa17c7e486206948412a7c150'
2025-08-04 00:42:24,759 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#494](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-08-04 00:42:24,762 [ scc.config] DEBUG Found github.token
2025-08-04 00:42:24,762 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-08-04 00:42:24,762 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-08-04 00:42:24,767 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:24,769 [ 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-08-04 00:42:24,779 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-04 00:42:24,782 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-08-04 00:42:24,782 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-08-04 00:42:25,000 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:25,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:25,189 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-04 00:42:25,230 [ scc.git] DEBUG Get sha1 of %s
2025-08-04 00:42:25,231 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-04 00:42:25,233 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-04 00:42:25,274 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-04 00:42:25,278 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9291af4510> has no local changes
2025-08-04 00:42:25,278 [ 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#494 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/)'
2025-08-04 00:42:25,285 [ scc.git] DEBUG [detached HEAD 55f8193] merge master -Dorg -Ssuccess-only
2025-08-04 00:42:25,285 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:25,285 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-04 00:42:25,364 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-08-04 00:42:25,440 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:25,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:25,628 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-08-04 00:42:25,630 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-08-04 00:42:25,874 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:26,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:26,075 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-08-04 00:42:26,077 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-08-04 00:42:26,321 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:26,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:26,512 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-08-04 00:42:26,514 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-08-04 00:42:26,758 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:26,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:26,986 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-08-04 00:42:27,231 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:27,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:27,412 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-08-04 00:42:27,414 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-08-04 00:42:27,659 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:27,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:27,838 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-08-04 00:42:27,840 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-08-04 00:42:28,084 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:28,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:28,268 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-08-04 00:42:28,270 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-08-04 00:42:28,514 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:28,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:28,709 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-08-04 00:42:28,711 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-08-04 00:42:28,956 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:29,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:29,131 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-08-04 00:42:29,133 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-08-04 00:42:29,377 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:29,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:29,556 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-08-04 00:42:29,558 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-08-04 00:42:29,802 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:29,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:29,986 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-08-04 00:42:29,988 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-08-04 00:42:30,233 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:30,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:30,420 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-08-04 00:42:30,422 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-08-04 00:42:30,667 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:30,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:30,842 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-08-04 00:42:31,087 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:31,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:31,271 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-08-04 00:42:31,515 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:31,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:31,708 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-08-04 00:42:31,710 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-08-04 00:42:31,955 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:32,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:32,139 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-08-04 00:42:32,384 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:32,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:32,554 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-08-04 00:42:32,799 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:32,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:32,970 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-08-04 00:42:32,972 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-08-04 00:42:33,217 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:33,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:33,393 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-08-04 00:42:33,395 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-08-04 00:42:33,640 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:33,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:33,815 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-08-04 00:42:33,817 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-08-04 00:42:34,062 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:34,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:34,248 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-08-04 00:42:34,250 [ scc.config] DEBUG Found submodule.scripts.url
2025-08-04 00:42:34,494 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-04 00:42:34,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-04 00:42:34,669 [ scc.config] DEBUG Found submodule.scripts.branch
2025-08-04 00:42:34,669 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-04 00:42:34,759 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9291cb6f50> has local changes
2025-08-04 00:42:34,759 [ 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 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..d2c6f5bc
Previously merged:
- PR 638 Rdornier 'Fix arrow opacity'
- PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
- PR 635 dependabot[bot] 'Bump esbuild and vite'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 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'
- PR 637 Rdornier 'Fix scalebar position'
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#494 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/494/)'
2025-08-04 00:42:34,772 [ scc.git] DEBUG [detached HEAD 57d5728] merge master -Dorg -Ssuccess-only
2025-08-04 00:42:34,772 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-08-04 00:42:34,772 [ scc.merge] INFO Repository: ome/omero-plugins
2025-08-04 00:42:34,772 [ scc.merge] INFO Already up to date.
2025-08-04 00:42:34,773 [ scc.merge] INFO
2025-08-04 00:42:34,773 [ scc.merge] INFO Merged PRs:
2025-08-04 00:42:34,773 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-08-04 00:42:34,773 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-08-04 00:42:34,773 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-08-04 00:42:34,773 [ scc.merge] INFO
2025-08-04 00:42:34,773 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-08-04 00:42:34,773 [ scc.merge] INFO Already up to date.
2025-08-04 00:42:34,773 [ scc.merge] INFO
2025-08-04 00:42:34,773 [ scc.merge] INFO
2025-08-04 00:42:34,773 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-08-04 00:42:34,773 [ scc.merge] INFO Excluded PRs:
2025-08-04 00:42:34,773 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-08-04 00:42:34,773 [ scc.merge] INFO Already up to date.
2025-08-04 00:42:34,773 [ scc.merge] INFO
2025-08-04 00:42:34,773 [ scc.merge] INFO
2025-08-04 00:42:34,773 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-08-04 00:42:34,773 [ scc.merge] INFO Excluded PRs:
2025-08-04 00:42:34,773 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-08-04 00:42:34,773 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-08-04 00:42:34,773 [ scc.merge] INFO Already up to date.
2025-08-04 00:42:34,773 [ scc.merge] INFO
2025-08-04 00:42:34,773 [ scc.merge] INFO Merged PRs:
2025-08-04 00:42:34,773 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-08-04 00:42:34,773 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-08-04 00:42:34,773 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-08-04 00:42:34,773 [ scc.merge] INFO
2025-08-04 00:42:34,773 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-08-04 00:42:34,773 [ scc.merge] INFO Excluded PRs:
2025-08-04 00:42:34,773 [ scc.merge] INFO - PR 174 will-moore 'Skip wells' (stage: draft)
2025-08-04 00:42:34,773 [ scc.merge] INFO - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
2025-08-04 00:42:34,773 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-08-04 00:42:34,773 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-08-04 00:42:34,773 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-08-04 00:42:34,773 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-08-04 00:42:34,773 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-08-04 00:42:34,773 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-08-04 00:42:34,774 [ scc.merge] INFO Updating 11d3587..f7eea7c
2025-08-04 00:42:34,774 [ scc.merge] INFO Previously merged:
2025-08-04 00:42:34,774 [ scc.merge] INFO - PR 179 will-moore 'Changelog 0.6.0'
2025-08-04 00:42:34,774 [ scc.merge] INFO - PR 177 jburel 'Replace fromstring by frombuffer'
2025-08-04 00:42:34,774 [ scc.merge] INFO - PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
2025-08-04 00:42:34,774 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-08-04 00:42:34,774 [ scc.merge] INFO - PR 173 will-moore 'Add test_export_plate_polygons()'
2025-08-04 00:42:34,774 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-08-04 00:42:34,774 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-04 00:42:34,774 [ scc.merge] INFO
2025-08-04 00:42:34,774 [ scc.merge] INFO Merged PRs:
2025-08-04 00:42:34,774 [ scc.merge] INFO - PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
2025-08-04 00:42:34,774 [ scc.merge] INFO
2025-08-04 00:42:34,774 [ scc.merge] INFO Repository: ome/omero-figure
2025-08-04 00:42:34,774 [ scc.merge] INFO Excluded PRs:
2025-08-04 00:42:34,774 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-08-04 00:42:34,774 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-08-04 00:42:34,774 [ scc.merge] INFO Updating 9cc36cde..d2c6f5bc
2025-08-04 00:42:34,774 [ scc.merge] INFO Previously merged:
2025-08-04 00:42:34,774 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity'
2025-08-04 00:42:34,774 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-08-04 00:42:34,774 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-08-04 00:42:34,774 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-08-04 00:42:34,774 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-04 00:42:34,774 [ scc.merge] INFO
2025-08-04 00:42:34,774 [ scc.merge] INFO Merged PRs:
2025-08-04 00:42:34,774 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-08-04 00:42:34,774 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-08-04 00:42:34,774 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-08-04 00:42:34,774 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-08-04 00:42:34,774 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-08-04 00:42:34,774 [ scc.merge] INFO
2025-08-04 00:42:34,774 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-04 00:42:34,774 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-08-04 00:42:34,774 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-08-04 00:42:34,774 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position'
2025-08-04 00:42:34,774 [ scc.merge] INFO
2025-08-04 00:42:34,774 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-08-04 00:42:34,774 [ scc.merge] INFO Already up to date.
2025-08-04 00:42:34,775 [ scc.merge] INFO
2025-08-04 00:42:34,775 [ scc.merge] INFO Merged PRs:
2025-08-04 00:42:34,775 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-08-04 00:42:34,775 [ scc.merge] INFO
2025-08-04 00:42:34,775 [ scc.merge] INFO Repository: ome/omero-gallery
2025-08-04 00:42:34,775 [ scc.merge] INFO Already up to date.
2025-08-04 00:42:34,775 [ scc.merge] INFO
2025-08-04 00:42:34,775 [ scc.merge] INFO Merged PRs:
2025-08-04 00:42:34,775 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-08-04 00:42:34,775 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-08-04 00:42:34,775 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-08-04 00:42:34,775 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-08-04 00:42:34,775 [ scc.merge] INFO
2025-08-04 00:42:34,775 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-04 00:42:34,775 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-08-04 00:42:34,775 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-08-04 00:42:34,775 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-08-04 00:42:34,775 [ scc.merge] INFO
2025-08-04 00:42:34,775 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-08-04 00:42:34,775 [ scc.merge] INFO Excluded PRs:
2025-08-04 00:42:34,775 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-08-04 00:42:34,775 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-08-04 00:42:34,775 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-08-04 00:42:34,775 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-08-04 00:42:34,775 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-08-04 00:42:34,775 [ scc.merge] INFO Updating 7a798ce..bb94cf8
2025-08-04 00:42:34,775 [ scc.merge] INFO Previously merged:
2025-08-04 00:42:34,775 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-04 00:42:34,775 [ scc.merge] INFO
2025-08-04 00:42:34,775 [ scc.merge] INFO Merged PRs:
2025-08-04 00:42:34,775 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-08-04 00:42:34,775 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-08-04 00:42:34,775 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-08-04 00:42:34,775 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-08-04 00:42:34,775 [ scc.merge] INFO
2025-08-04 00:42:34,775 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-04 00:42:34,775 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-08-04 00:42:34,775 [ scc.merge] INFO
2025-08-04 00:42:34,775 [ scc.merge] INFO Repository: ome/omero-mapr
2025-08-04 00:42:34,775 [ scc.merge] INFO Excluded PRs:
2025-08-04 00:42:34,776 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-08-04 00:42:34,776 [ scc.merge] INFO Already up to date.
2025-08-04 00:42:34,776 [ scc.merge] INFO
2025-08-04 00:42:34,776 [ scc.merge] INFO Merged PRs:
2025-08-04 00:42:34,776 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-08-04 00:42:34,776 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-04 00:42:34,776 [ scc.merge] INFO
2025-08-04 00:42:34,776 [ scc.merge] INFO Repository: ome/omero-metadata
2025-08-04 00:42:34,776 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-08-04 00:42:34,776 [ scc.merge] INFO Previously merged:
2025-08-04 00:42:34,776 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-04 00:42:34,776 [ scc.merge] INFO
2025-08-04 00:42:34,776 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-04 00:42:34,776 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-08-04 00:42:34,776 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-08-04 00:42:34,776 [ scc.merge] INFO
2025-08-04 00:42:34,776 [ scc.merge] INFO Repository: ome/omero-parade
2025-08-04 00:42:34,776 [ scc.merge] INFO Excluded PRs:
2025-08-04 00:42:34,776 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-08-04 00:42:34,776 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-08-04 00:42:34,776 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-08-04 00:42:34,776 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-08-04 00:42:34,776 [ scc.merge] INFO Already up to date.
2025-08-04 00:42:34,776 [ scc.merge] INFO
2025-08-04 00:42:34,776 [ scc.merge] INFO Merged PRs:
2025-08-04 00:42:34,776 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-08-04 00:42:34,776 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-08-04 00:42:34,776 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-04 00:42:34,776 [ scc.merge] INFO
2025-08-04 00:42:34,776 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-08-04 00:42:34,776 [ scc.merge] INFO Already up to date.
2025-08-04 00:42:34,776 [ scc.merge] INFO
2025-08-04 00:42:34,776 [ scc.merge] INFO
2025-08-04 00:42:34,776 [ scc.merge] INFO Repository: ome/omero-rois
2025-08-04 00:42:34,776 [ scc.merge] INFO Excluded PRs:
2025-08-04 00:42:34,776 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-08-04 00:42:34,776 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-08-04 00:42:34,776 [ scc.merge] INFO Already up to date.
2025-08-04 00:42:34,776 [ scc.merge] INFO
2025-08-04 00:42:34,777 [ scc.merge] INFO
2025-08-04 00:42:34,777 [ scc.merge] INFO Repository: ome/omero-signup
2025-08-04 00:42:34,777 [ scc.merge] INFO Already up to date.
2025-08-04 00:42:34,777 [ scc.merge] INFO
2025-08-04 00:42:34,777 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-04 00:42:34,777 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-08-04 00:42:34,777 [ scc.merge] INFO
2025-08-04 00:42:34,777 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-08-04 00:42:34,777 [ scc.merge] INFO Excluded PRs:
2025-08-04 00:42:34,777 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-08-04 00:42:34,777 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-08-04 00:42:34,777 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-08-04 00:42:34,777 [ scc.merge] INFO Already up to date.
2025-08-04 00:42:34,777 [ scc.merge] INFO
2025-08-04 00:42:34,777 [ scc.merge] INFO Merged PRs:
2025-08-04 00:42:34,777 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-08-04 00:42:34,777 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-08-04 00:42:34,777 [ scc.merge] INFO
2025-08-04 00:42:34,777 [ scc.merge] INFO Repository: ome/omero-upload
2025-08-04 00:42:34,777 [ scc.merge] INFO Already up to date.
2025-08-04 00:42:34,777 [ scc.merge] INFO
2025-08-04 00:42:34,777 [ scc.merge] INFO
2025-08-04 00:42:34,777 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-08-04 00:42:34,777 [ scc.merge] INFO Updating deab817..160d894
2025-08-04 00:42:34,777 [ scc.merge] INFO Previously merged:
2025-08-04 00:42:34,777 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-08-04 00:42:34,777 [ scc.merge] INFO
2025-08-04 00:42:34,777 [ scc.merge] INFO
2025-08-04 00:42:34,777 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-08-04 00:42:34,777 [ scc.merge] INFO Excluded PRs:
2025-08-04 00:42:34,777 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-08-04 00:42:34,777 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-08-04 00:42:34,777 [ scc.merge] INFO Already up to date.
2025-08-04 00:42:34,777 [ scc.merge] INFO
2025-08-04 00:42:34,777 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-04 00:42:34,777 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-08-04 00:42:34,777 [ scc.merge] INFO
2025-08-04 00:42:34,777 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-08-04 00:42:34,777 [ scc.merge] INFO Already up to date.
2025-08-04 00:42:34,778 [ scc.merge] INFO
2025-08-04 00:42:34,778 [ scc.merge] INFO
2025-08-04 00:42:34,778 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-08-04 00:42:34,778 [ scc.merge] INFO Already up to date.
2025-08-04 00:42:34,778 [ scc.merge] INFO
2025-08-04 00:42:34,778 [ scc.merge] INFO
2025-08-04 00:42:34,778 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-08-04 00:42:34,778 [ scc.merge] INFO Already up to date.
2025-08-04 00:42:34,778 [ scc.merge] INFO
2025-08-04 00:42:34,778 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-04 00:42:34,778 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-08-04 00:42:34,778 [ scc.merge] INFO
2025-08-04 00:42:34,778 [ scc.merge] INFO Repository: ome/scripts
2025-08-04 00:42:34,778 [ scc.merge] INFO Excluded PRs:
2025-08-04 00:42:34,778 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-08-04 00:42:34,778 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-08-04 00:42:34,778 [ scc.merge] INFO Updating 4b4c755..573db34
2025-08-04 00:42:34,778 [ scc.merge] INFO Previously merged:
2025-08-04 00:42:34,778 [ scc.merge] INFO - PR 227 jburel 'Replace tostring by tobytes'
2025-08-04 00:42:34,778 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-08-04 00:42:34,778 [ scc.merge] INFO
2025-08-04 00:42:34,778 [ scc.merge] INFO Merged PRs:
2025-08-04 00:42:34,778 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-08-04 00:42:34,778 [ scc.merge] INFO
2025-08-04 00:42:34,778 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-04 00:42:34,778 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-08-04 00:42:34,778 [ scc.merge] INFO
2025-08-04 00:42:34,778 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-08-04 00:42:34,778 [ scc.git] DEBUG Calling 'git remote'
2025-08-04 00:42:34,781 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-08-04 00:42:34,781 [ scc.git] DEBUG Calling 'git remote'
2025-08-04 00:42:34,783 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:34,783 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-08-04 00:42:34,783 [ scc.git] DEBUG Calling 'git remote'
2025-08-04 00:42:34,785 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:34,785 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-08-04 00:42:34,785 [ scc.git] DEBUG Calling 'git remote'
2025-08-04 00:42:34,787 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:34,787 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-08-04 00:42:34,788 [ scc.git] DEBUG Calling 'git remote'
2025-08-04 00:42:34,790 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:34,790 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-08-04 00:42:34,790 [ scc.git] DEBUG Calling 'git remote'
2025-08-04 00:42:34,792 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:34,792 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-08-04 00:42:34,792 [ scc.git] DEBUG Calling 'git remote'
2025-08-04 00:42:34,794 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:34,794 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-08-04 00:42:34,794 [ scc.git] DEBUG Calling 'git remote'
2025-08-04 00:42:34,796 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:34,796 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-08-04 00:42:34,796 [ scc.git] DEBUG Calling 'git remote'
2025-08-04 00:42:34,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:34,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-08-04 00:42:34,798 [ scc.git] DEBUG Calling 'git remote'
2025-08-04 00:42:34,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:34,801 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-08-04 00:42:34,801 [ scc.git] DEBUG Calling 'git remote'
2025-08-04 00:42:34,803 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:34,803 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-08-04 00:42:34,803 [ scc.git] DEBUG Calling 'git remote'
2025-08-04 00:42:34,805 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:34,805 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-08-04 00:42:34,805 [ scc.git] DEBUG Calling 'git remote'
2025-08-04 00:42:34,807 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:34,807 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-08-04 00:42:34,807 [ scc.git] DEBUG Calling 'git remote'
2025-08-04 00:42:34,809 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:34,809 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-08-04 00:42:34,809 [ scc.git] DEBUG Calling 'git remote'
2025-08-04 00:42:34,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:34,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-08-04 00:42:34,812 [ scc.git] DEBUG Calling 'git remote'
2025-08-04 00:42:34,814 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:34,814 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-08-04 00:42:34,814 [ scc.git] DEBUG Calling 'git remote'
2025-08-04 00:42:34,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:34,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-08-04 00:42:34,816 [ scc.git] DEBUG Calling 'git remote'
2025-08-04 00:42:34,819 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:34,819 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-08-04 00:42:34,819 [ scc.git] DEBUG Calling 'git remote'
2025-08-04 00:42:34,821 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:34,821 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-08-04 00:42:34,821 [ scc.git] DEBUG Calling 'git remote'
2025-08-04 00:42:34,823 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:34,823 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-08-04 00:42:34,823 [ scc.git] DEBUG Calling 'git remote'
2025-08-04 00:42:34,825 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:34,825 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-08-04 00:42:34,825 [ scc.git] DEBUG Calling 'git remote'
2025-08-04 00:42:34,828 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-04 00:42:34,828 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-08-04 00:42:34,828 [ scc.git] DEBUG Calling 'git remote'
2025-08-04 00:42:34,830 [ 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 4ed1a49] 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 2ac4f79] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-08-04 00:43:24,342 [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-08-04 00:43:34,044 [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-08-04 00:43:36,578 [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-08-04 00:43:41,449 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-08-04 00:44:22,264 [ 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/9bac06d9/images/svgs/logo.svg){kind=logo}
