Console Output
Skipping 198 KB..
Full Logurllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:28:42,598 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-07-11 00:28:42,604 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:28:42,607 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-07-11 00:28:42,645 [ scc.git] DEBUG Auto-merging package-lock.json
2025-07-11 00:28:42,645 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-07-11 00:28:42,646 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-11 00:28:42,646 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-11 00:28:42,649 [ scc.git] DEBUG Calling 'git reset --hard e7a8f42203babb1751aad1db5e428e9eec5637d1'
2025-07-11 00:28:42,657 [ scc.git] DEBUG HEAD is now at e7a8f42 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-07-11 00:28:42,849 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:43,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:28:43,014 [ scc.git] DEBUG Calling 'git merge-base bb94cf8da960e3283090038b04432f301560f5e4 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-07-11 00:28:43,017 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..bb94cf8da960e3283090038b04432f301560f5e4'
2025-07-11 00:28:43,020 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#474](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-07-11 00:28:43,023 [ scc.config] DEBUG Found github.token
2025-07-11 00:28:43,023 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-07-11 00:28:43,023 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-11 00:28:43,063 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:28:43,063 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:28:43,065 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-11 00:28:43,105 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-11 00:28:43,112 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f374950db10> has no local changes
2025-07-11 00:28:43,112 [ 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#474 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/)'
2025-07-11 00:28:43,119 [ scc.git] DEBUG [detached HEAD 8e42336] merge master -Dorg -Ssuccess-only
2025-07-11 00:28:43,119 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:28:43,119 [ scc.repo] DEBUG ## PRs found:
2025-07-11 00:28:43,265 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:43,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-07-11 00:28:43,802 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:44,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-07-11 00:28:44,262 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:44,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-07-11 00:28:44,824 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:45,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-11 00:28:45,308 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:45,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-07-11 00:28:45,838 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:46,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-07-11 00:28:46,022 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-11 00:28:46,273 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:46,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-07-11 00:28:46,756 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:46,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-07-11 00:28:47,247 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:47,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-07-11 00:28:47,777 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:47,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-11 00:28:48,232 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:48,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-07-11 00:28:48,761 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:48,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-07-11 00:28:48,940 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-07-11 00:28:48,940 [ scc.repo] DEBUG ## Branches found:
2025-07-11 00:28:48,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-07-11 00:28:48,940 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:28:48,940 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:28:48,943 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-11 00:28:48,946 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-11 00:28:48,946 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-11 00:28:48,949 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-11 00:28:48,952 [ scc.git] DEBUG Already up to date.
2025-07-11 00:28:48,952 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-07-11 00:28:49,244 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-07-11 00:28:49,244 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-07-11 00:28:49,248 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-07-11 00:28:49,541 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-07-11 00:28:49,542 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-07-11 00:28:49,546 [ scc.git] DEBUG ## Unique users: []
2025-07-11 00:28:49,546 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:28:49,546 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:28:49,548 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-07-11 00:28:49,553 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:28:49,555 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-07-11 00:28:49,565 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-11 00:28:49,568 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-07-11 00:28:49,568 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-07-11 00:28:49,568 [ scc.git] DEBUG requirements.txt | 2 +-
2025-07-11 00:28:49,568 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-07-11 00:28:49,568 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-07-11 00:28:49,568 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-07-11 00:28:49,569 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:49,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:28:49,739 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-07-11 00:28:49,743 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:28:49,745 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 94 (Use the release/v1 branch for the PyPA action publishing to PyPI) 1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-07-11 00:28:49,755 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-11 00:28:49,758 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-07-11 00:28:49,758 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-07-11 00:28:49,990 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:50,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:28:50,163 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-11 00:28:50,203 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:28:50,203 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:28:50,205 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-11 00:28:50,243 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-11 00:28:50,247 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f374925f0d0> has no local changes
2025-07-11 00:28:50,247 [ 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#474 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/)'
2025-07-11 00:28:50,253 [ scc.git] DEBUG [detached HEAD 0d3af4a] merge master -Dorg -Ssuccess-only
2025-07-11 00:28:50,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:28:50,254 [ scc.repo] DEBUG ## PRs found:
2025-07-11 00:28:50,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:50,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-07-11 00:28:51,012 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:51,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-07-11 00:28:51,504 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:51,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-07-11 00:28:52,004 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:52,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-07-11 00:28:52,560 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:52,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-11 00:28:53,042 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:53,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-07-11 00:28:53,566 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:53,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-07-11 00:28:53,754 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-07-11 00:28:54,005 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:54,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-07-11 00:28:54,500 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:54,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-07-11 00:28:55,043 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:55,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-07-11 00:28:55,593 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:55,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-11 00:28:56,065 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:56,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-07-11 00:28:56,609 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:56,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-07-11 00:28:56,868 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-07-11 00:28:56,868 [ scc.repo] DEBUG ## Branches found:
2025-07-11 00:28:56,868 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-07-11 00:28:56,868 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:28:56,868 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:28:56,871 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-11 00:28:56,873 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-11 00:28:56,873 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-11 00:28:56,877 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-11 00:28:56,885 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-07-11 00:28:57,119 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:57,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-07-11 00:28:57,536 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-07-11 00:28:57,813 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-07-11 00:28:57,814 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-07-11 00:28:57,818 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-07-11 00:28:58,090 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-07-11 00:28:58,090 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-07-11 00:28:58,094 [ scc.git] DEBUG ## Unique users: []
2025-07-11 00:28:58,095 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:28:58,095 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:28:58,097 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-07-11 00:28:58,102 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:28:58,104 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-07-11 00:28:58,118 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-07-11 00:28:58,118 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-07-11 00:28:58,118 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-07-11 00:28:58,118 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-07-11 00:28:58,118 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-11 00:28:58,118 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-11 00:28:58,121 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-11 00:28:58,126 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-07-11 00:28:58,127 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:58,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:28:58,305 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-07-11 00:28:58,310 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-11 00:28:58,313 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#474](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-07-11 00:28:58,315 [ scc.config] DEBUG Found github.token
2025-07-11 00:28:58,315 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-07-11 00:28:58,316 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-07-11 00:28:58,320 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:28:58,322 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2025-07-11 00:28:58,338 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-07-11 00:28:58,338 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-07-11 00:28:58,338 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-07-11 00:28:58,338 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-11 00:28:58,338 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-11 00:28:58,341 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-11 00:28:58,346 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-07-11 00:28:58,556 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:58,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:28:58,718 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-07-11 00:28:58,722 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-11 00:28:58,725 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#474](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2025-07-11 00:28:58,728 [ scc.config] DEBUG Found github.token
2025-07-11 00:28:58,728 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-07-11 00:28:58,728 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-11 00:28:58,768 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:28:58,768 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:28:58,770 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-11 00:28:58,810 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-11 00:28:58,814 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f374950da90> has no local changes
2025-07-11 00:28:58,815 [ 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#474 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/)'
2025-07-11 00:28:58,822 [ scc.git] DEBUG [detached HEAD 9f4ae98] merge master -Dorg -Ssuccess-only
2025-07-11 00:28:58,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:28:58,822 [ scc.repo] DEBUG ## PRs found:
2025-07-11 00:28:58,969 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:59,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-07-11 00:28:59,541 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:28:59,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-07-11 00:29:00,006 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:00,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-07-11 00:29:00,552 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:00,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-11 00:29:01,069 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:01,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-07-11 00:29:01,645 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:01,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-07-11 00:29:02,159 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:02,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-07-11 00:29:02,338 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-11 00:29:02,589 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:02,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-07-11 00:29:02,837 [ scc.repo] DEBUG # ... Include label: dependencies
2025-07-11 00:29:03,088 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:03,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-07-11 00:29:03,665 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:03,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-11 00:29:04,177 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:04,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-07-11 00:29:04,716 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:05,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-07-11 00:29:05,301 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:05,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-07-11 00:29:05,487 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-07-11 00:29:05,738 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:06,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-07-11 00:29:06,001 [ scc.repo] DEBUG # ... Include label: dependencies
2025-07-11 00:29:06,252 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:06,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-07-11 00:29:06,821 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:07,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-11 00:29:07,370 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:07,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-07-11 00:29:07,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:08,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-07-11 00:29:08,485 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:08,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-07-11 00:29:08,678 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-07-11 00:29:08,929 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:09,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-07-11 00:29:09,423 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:09,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-07-11 00:29:09,915 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:10,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-07-11 00:29:10,426 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:10,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-07-11 00:29:10,920 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:11,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-07-11 00:29:11,400 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:11,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-07-11 00:29:11,907 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:12,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-07-11 00:29:12,141 [ scc.repo] DEBUG ## Branches found:
2025-07-11 00:29:12,141 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-07-11 00:29:12,141 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:12,141 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:12,144 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-11 00:29:12,147 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-11 00:29:12,147 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-11 00:29:12,150 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-11 00:29:12,153 [ scc.git] DEBUG Already up to date.
2025-07-11 00:29:12,153 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-07-11 00:29:12,428 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-07-11 00:29:12,429 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-07-11 00:29:12,433 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-07-11 00:29:12,704 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-07-11 00:29:12,704 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-07-11 00:29:12,709 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-07-11 00:29:12,979 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-07-11 00:29:12,979 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-07-11 00:29:12,984 [ scc.git] DEBUG ## Unique users: []
2025-07-11 00:29:12,984 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:12,984 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:12,986 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-07-11 00:29:12,989 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:12,992 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 140 (Bump vite from 4.2.3 to 4.5.9) 6301bc61b0a877104173846d526382bf15cc70a0'
2025-07-11 00:29:13,001 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-11 00:29:13,004 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-07-11 00:29:13,004 [ scc.git] DEBUG package.json | 2 +-
2025-07-11 00:29:13,004 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-07-11 00:29:13,006 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:13,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:29:13,174 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-07-11 00:29:13,178 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:13,180 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 141 (Bump axios from 1.6.0 to 1.8.2) de7db17cd62b498179713df276cff151a1f36d80'
2025-07-11 00:29:13,191 [ scc.git] DEBUG Auto-merging package-lock.json
2025-07-11 00:29:13,191 [ scc.git] DEBUG Auto-merging package.json
2025-07-11 00:29:13,192 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-11 00:29:13,195 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-07-11 00:29:13,196 [ scc.git] DEBUG package.json | 2 +-
2025-07-11 00:29:13,196 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-07-11 00:29:13,425 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:13,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:29:13,585 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-07-11 00:29:13,588 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:13,590 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 142 (Use the release/v1 branch for the PyPA action publishing to PyPI) 16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-07-11 00:29:13,599 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-11 00:29:13,602 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-07-11 00:29:13,603 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-07-11 00:29:13,836 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:14,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:29:14,012 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-11 00:29:14,052 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:14,052 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:14,054 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-11 00:29:14,093 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-11 00:29:14,097 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3748147f90> has no local changes
2025-07-11 00:29:14,097 [ 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#474 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/)'
2025-07-11 00:29:14,104 [ scc.git] DEBUG [detached HEAD 09acad2] merge master -Dorg -Ssuccess-only
2025-07-11 00:29:14,104 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:29:14,104 [ scc.repo] DEBUG ## PRs found:
2025-07-11 00:29:14,263 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:14,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-07-11 00:29:14,452 [ scc.repo] DEBUG ## Branches found:
2025-07-11 00:29:14,452 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-07-11 00:29:14,452 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:14,452 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:14,455 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-11 00:29:14,457 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-11 00:29:14,457 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-11 00:29:14,460 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-11 00:29:14,463 [ scc.git] DEBUG Already up to date.
2025-07-11 00:29:14,463 [ scc.git] DEBUG ## Unique users: []
2025-07-11 00:29:14,463 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:14,463 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:14,465 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-11 00:29:14,504 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:14,504 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:14,507 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-11 00:29:14,545 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-11 00:29:14,549 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3749360850> has no local changes
2025-07-11 00:29:14,549 [ 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#474 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/)'
2025-07-11 00:29:14,555 [ scc.git] DEBUG [detached HEAD 1c34127] merge master -Dorg -Ssuccess-only
2025-07-11 00:29:14,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:29:14,556 [ scc.repo] DEBUG ## PRs found:
2025-07-11 00:29:14,703 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:14,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-07-11 00:29:15,217 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:15,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-07-11 00:29:15,695 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:15,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-07-11 00:29:16,163 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:16,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-07-11 00:29:16,412 [ scc.repo] DEBUG ## Branches found:
2025-07-11 00:29:16,412 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-07-11 00:29:16,413 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:16,413 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:16,415 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-11 00:29:16,418 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-11 00:29:16,418 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-11 00:29:16,421 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-11 00:29:16,424 [ scc.git] DEBUG Already up to date.
2025-07-11 00:29:16,424 [ scc.git] DEBUG ## Unique users: []
2025-07-11 00:29:16,424 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:16,424 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:16,426 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-11 00:29:16,466 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:16,466 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:16,469 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-11 00:29:16,508 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-11 00:29:16,512 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3748139a90> has no local changes
2025-07-11 00:29:16,512 [ 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#474 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/)'
2025-07-11 00:29:16,519 [ scc.git] DEBUG [detached HEAD 886ea54] merge master -Dorg -Ssuccess-only
2025-07-11 00:29:16,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:29:16,519 [ scc.repo] DEBUG ## PRs found:
2025-07-11 00:29:16,663 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:16,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-07-11 00:29:17,228 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:17,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-07-11 00:29:17,709 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:17,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-07-11 00:29:18,179 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:18,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-07-11 00:29:18,788 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:19,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-11 00:29:19,296 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:19,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-07-11 00:29:19,886 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:20,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-07-11 00:29:20,071 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-07-11 00:29:20,071 [ scc.repo] DEBUG ## Branches found:
2025-07-11 00:29:20,071 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-07-11 00:29:20,071 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:20,071 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:20,074 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-11 00:29:20,077 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-11 00:29:20,077 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-11 00:29:20,080 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-11 00:29:20,083 [ scc.git] DEBUG Already up to date.
2025-07-11 00:29:20,083 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-07-11 00:29:20,367 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-07-11 00:29:20,367 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-07-11 00:29:20,371 [ scc.git] DEBUG ## Unique users: []
2025-07-11 00:29:20,372 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:20,372 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:20,374 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-07-11 00:29:20,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:20,380 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-07-11 00:29:20,389 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-07-11 00:29:20,389 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-07-11 00:29:20,389 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-07-11 00:29:20,389 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-07-11 00:29:20,389 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-07-11 00:29:20,390 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-07-11 00:29:20,390 [ scc.git] DEBUG Auto-merging setup.py
2025-07-11 00:29:20,390 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-07-11 00:29:20,390 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-11 00:29:20,390 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-11 00:29:20,393 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-07-11 00:29:20,397 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-07-11 00:29:20,399 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:20,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:29:20,566 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-07-11 00:29:20,569 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-07-11 00:29:20,572 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#474](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- setup.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
--conflicts
2025-07-11 00:29:20,574 [ scc.config] DEBUG Found github.token
2025-07-11 00:29:20,574 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-07-11 00:29:20,575 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-11 00:29:20,615 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:20,615 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:20,617 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-11 00:29:20,657 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-11 00:29:20,661 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f374812ffd0> has no local changes
2025-07-11 00:29:20,661 [ 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#474 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/)'
2025-07-11 00:29:20,668 [ scc.git] DEBUG [detached HEAD 9e98a19] merge master -Dorg -Ssuccess-only
2025-07-11 00:29:20,668 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:29:20,668 [ scc.repo] DEBUG ## PRs found:
2025-07-11 00:29:20,817 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:21,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-07-11 00:29:21,368 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:21,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-07-11 00:29:21,892 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:22,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-07-11 00:29:22,437 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:22,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-11 00:29:22,955 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:23,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-07-11 00:29:23,467 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:23,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-07-11 00:29:23,915 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:24,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6?per_page=1 HTTP/1.1" 200 2
2025-07-11 00:29:24,115 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-07-11 00:29:24,367 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:24,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-07-11 00:29:24,894 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:25,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-07-11 00:29:25,374 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:25,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-07-11 00:29:25,907 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:26,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-11 00:29:26,429 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:26,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-07-11 00:29:26,904 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:27,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-07-11 00:29:27,820 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:28,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-07-11 00:29:28,292 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:28,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-07-11 00:29:28,749 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:28,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-07-11 00:29:29,211 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:29,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-07-11 00:29:29,727 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:29,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-11 00:29:30,207 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:30,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-07-11 00:29:30,682 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:30,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2025-07-11 00:29:30,868 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-07-11 00:29:30,868 [ scc.repo] DEBUG ## Branches found:
2025-07-11 00:29:30,868 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-07-11 00:29:30,868 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:30,868 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:30,871 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-11 00:29:30,873 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-11 00:29:30,873 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-11 00:29:30,876 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-11 00:29:30,880 [ scc.git] DEBUG Already up to date.
2025-07-11 00:29:30,880 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-07-11 00:29:31,165 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-07-11 00:29:31,166 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-07-11 00:29:31,170 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-07-11 00:29:31,447 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-07-11 00:29:31,447 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-07-11 00:29:31,451 [ scc.git] DEBUG ## Unique users: []
2025-07-11 00:29:31,451 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:31,451 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:31,454 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-07-11 00:29:31,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:31,460 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2025-07-11 00:29:31,473 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-11 00:29:31,477 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-07-11 00:29:31,477 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-07-11 00:29:31,477 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-07-11 00:29:31,477 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-07-11 00:29:31,477 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-07-11 00:29:31,477 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-07-11 00:29:31,477 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-07-11 00:29:31,478 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:31,478 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-07-11 00:29:31,478 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-07-11 00:29:31,478 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-07-11 00:29:31,478 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-07-11 00:29:31,478 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-07-11 00:29:31,478 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-07-11 00:29:31,478 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-07-11 00:29:31,478 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-07-11 00:29:31,479 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-07-11 00:29:31,479 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-07-11 00:29:31,479 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-07-11 00:29:31,479 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-07-11 00:29:31,479 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-07-11 00:29:31,479 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-07-11 00:29:31,479 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-07-11 00:29:31,479 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-07-11 00:29:31,479 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-07-11 00:29:31,479 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-07-11 00:29:31,479 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-07-11 00:29:31,479 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-07-11 00:29:31,479 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-07-11 00:29:31,479 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-07-11 00:29:31,479 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-07-11 00:29:31,479 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-07-11 00:29:31,479 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-07-11 00:29:31,479 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-07-11 00:29:31,479 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-07-11 00:29:31,479 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-07-11 00:29:31,479 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-07-11 00:29:31,479 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-07-11 00:29:31,479 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-07-11 00:29:31,479 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-07-11 00:29:31,479 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-07-11 00:29:31,479 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-07-11 00:29:31,479 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-07-11 00:29:31,479 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-07-11 00:29:31,479 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-07-11 00:29:31,479 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-07-11 00:29:31,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:29:31,646 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-07-11 00:29:31,650 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:31,652 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-07-11 00:29:31,663 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-11 00:29:31,666 [ scc.git] DEBUG docker | 1 +
2025-07-11 00:29:31,666 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-07-11 00:29:31,897 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:32,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:29:32,062 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-11 00:29:32,104 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:32,104 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:32,106 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-11 00:29:32,147 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-11 00:29:32,151 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f374950e650> has no local changes
2025-07-11 00:29:32,151 [ 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#474 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/)'
2025-07-11 00:29:32,157 [ scc.git] DEBUG [detached HEAD aa17240] merge master -Dorg -Ssuccess-only
2025-07-11 00:29:32,158 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:29:32,158 [ scc.repo] DEBUG ## PRs found:
2025-07-11 00:29:32,313 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:32,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-07-11 00:29:32,501 [ scc.repo] DEBUG ## Branches found:
2025-07-11 00:29:32,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-07-11 00:29:32,501 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:32,501 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:32,504 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-11 00:29:32,506 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-11 00:29:32,506 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-11 00:29:32,509 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-11 00:29:32,512 [ scc.git] DEBUG Already up to date.
2025-07-11 00:29:32,512 [ scc.git] DEBUG ## Unique users: []
2025-07-11 00:29:32,512 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:32,512 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:32,515 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-11 00:29:32,555 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:32,555 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:32,557 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-11 00:29:32,597 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-11 00:29:32,600 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f374934cbd0> has no local changes
2025-07-11 00:29:32,600 [ 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#474 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/)'
2025-07-11 00:29:32,606 [ scc.git] DEBUG [detached HEAD d7534ad] merge master -Dorg -Ssuccess-only
2025-07-11 00:29:32,607 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:29:32,607 [ scc.repo] DEBUG ## PRs found:
2025-07-11 00:29:32,752 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:32,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2025-07-11 00:29:32,961 [ scc.repo] DEBUG ## Branches found:
2025-07-11 00:29:32,961 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-07-11 00:29:32,961 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:32,961 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:32,963 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-11 00:29:32,966 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-11 00:29:32,966 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-11 00:29:32,969 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-11 00:29:32,977 [ scc.git] DEBUG Updating deab817..160d894
2025-07-11 00:29:33,212 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:33,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls/20 HTTP/1.1" 200 None
2025-07-11 00:29:33,638 [ scc.git] DEBUG ## Unique users: []
2025-07-11 00:29:33,638 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:33,638 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:33,641 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-11 00:29:33,681 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:33,681 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:33,684 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-11 00:29:33,725 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-11 00:29:33,729 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3749337990> has no local changes
2025-07-11 00:29:33,729 [ 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#474 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/)'
2025-07-11 00:29:33,735 [ scc.git] DEBUG [detached HEAD d1a3bbd] merge master -Dorg -Ssuccess-only
2025-07-11 00:29:33,736 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:29:33,736 [ scc.git] INFO Overriding base-branch from master to main
2025-07-11 00:29:33,736 [ scc.repo] DEBUG ## PRs found:
2025-07-11 00:29:33,889 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:34,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-07-11 00:29:34,431 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:34,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-07-11 00:29:34,966 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:35,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-07-11 00:29:35,460 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:35,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-07-11 00:29:36,011 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:36,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-11 00:29:36,526 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:36,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-07-11 00:29:37,094 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:37,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-07-11 00:29:37,623 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:37,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-07-11 00:29:38,097 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:38,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-07-11 00:29:38,559 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:38,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-07-11 00:29:39,073 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:39,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-11 00:29:39,534 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:39,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-07-11 00:29:40,090 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:40,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-07-11 00:29:40,375 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-07-11 00:29:40,375 [ scc.repo] DEBUG ## Branches found:
2025-07-11 00:29:40,375 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-07-11 00:29:40,375 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:40,375 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:40,378 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-07-11 00:29:40,380 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-11 00:29:40,381 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-07-11 00:29:40,384 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-07-11 00:29:40,387 [ scc.git] DEBUG Already up to date.
2025-07-11 00:29:40,387 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-07-11 00:29:40,680 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-07-11 00:29:40,680 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-07-11 00:29:40,685 [ scc.git] DEBUG ## Unique users: []
2025-07-11 00:29:40,685 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:40,685 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:40,687 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-07-11 00:29:40,691 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:40,693 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-07-11 00:29:40,701 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-07-11 00:29:40,701 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-07-11 00:29:40,701 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-11 00:29:40,701 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-11 00:29:40,704 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-07-11 00:29:40,709 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-07-11 00:29:40,710 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:40,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:29:40,868 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-07-11 00:29:40,872 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-07-11 00:29:40,874 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#474](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-07-11 00:29:40,877 [ scc.config] DEBUG Found github.token
2025-07-11 00:29:40,877 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-07-11 00:29:40,877 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-11 00:29:40,917 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:40,917 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:40,919 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-11 00:29:40,958 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-11 00:29:40,962 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f374818e190> has no local changes
2025-07-11 00:29:40,962 [ 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#474 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/)'
2025-07-11 00:29:40,969 [ scc.git] DEBUG [detached HEAD a8fed1c] merge master -Dorg -Ssuccess-only
2025-07-11 00:29:40,969 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:29:40,969 [ scc.repo] DEBUG ## PRs found:
2025-07-11 00:29:41,120 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:41,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-07-11 00:29:41,298 [ scc.repo] DEBUG ## Branches found:
2025-07-11 00:29:41,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-07-11 00:29:41,298 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:41,298 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:41,301 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-11 00:29:41,303 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-11 00:29:41,303 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-11 00:29:41,306 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-11 00:29:41,309 [ scc.git] DEBUG Already up to date.
2025-07-11 00:29:41,309 [ scc.git] DEBUG ## Unique users: []
2025-07-11 00:29:41,309 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:41,309 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:41,312 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-11 00:29:41,351 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:41,351 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:41,353 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-11 00:29:41,390 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-11 00:29:41,393 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3749337a50> has no local changes
2025-07-11 00:29:41,393 [ 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#474 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/)'
2025-07-11 00:29:41,400 [ scc.git] DEBUG [detached HEAD 0a4c3eb] merge master -Dorg -Ssuccess-only
2025-07-11 00:29:41,400 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:29:41,400 [ scc.repo] DEBUG ## PRs found:
2025-07-11 00:29:41,549 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:41,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-07-11 00:29:41,740 [ scc.repo] DEBUG ## Branches found:
2025-07-11 00:29:41,740 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-07-11 00:29:41,740 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:41,740 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:41,742 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-11 00:29:41,744 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-11 00:29:41,744 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-11 00:29:41,747 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-11 00:29:41,751 [ scc.git] DEBUG Already up to date.
2025-07-11 00:29:41,751 [ scc.git] DEBUG ## Unique users: []
2025-07-11 00:29:41,751 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:41,751 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:41,753 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-11 00:29:41,795 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:41,795 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:41,797 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-11 00:29:41,836 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-11 00:29:41,840 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f37481cdb90> has no local changes
2025-07-11 00:29:41,840 [ 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#474 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/)'
2025-07-11 00:29:41,847 [ scc.git] DEBUG [detached HEAD afaf2a9] merge master -Dorg -Ssuccess-only
2025-07-11 00:29:41,847 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:29:41,847 [ scc.repo] DEBUG ## PRs found:
2025-07-11 00:29:41,991 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:42,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-07-11 00:29:42,482 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:42,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-07-11 00:29:42,955 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:43,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-07-11 00:29:43,408 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:43,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-07-11 00:29:44,026 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:44,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-11 00:29:44,492 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:44,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-07-11 00:29:45,010 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:45,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-07-11 00:29:45,204 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-07-11 00:29:45,204 [ scc.repo] DEBUG ## Branches found:
2025-07-11 00:29:45,204 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-07-11 00:29:45,204 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:45,204 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:45,207 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-11 00:29:45,209 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-11 00:29:45,209 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-11 00:29:45,212 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-11 00:29:45,215 [ scc.git] DEBUG Already up to date.
2025-07-11 00:29:45,215 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-07-11 00:29:45,493 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-07-11 00:29:45,493 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-07-11 00:29:45,497 [ scc.git] DEBUG ## Unique users: []
2025-07-11 00:29:45,497 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:45,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:45,500 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-07-11 00:29:45,502 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:45,505 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-07-11 00:29:45,514 [ scc.git] DEBUG Auto-merging Dockerfile
2025-07-11 00:29:45,514 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-07-11 00:29:45,514 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-11 00:29:45,515 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-11 00:29:45,518 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-07-11 00:29:45,522 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-07-11 00:29:45,524 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:45,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:29:45,690 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-07-11 00:29:45,693 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-07-11 00:29:45,696 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#474](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-07-11 00:29:45,698 [ scc.config] DEBUG Found github.token
2025-07-11 00:29:45,698 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-07-11 00:29:45,698 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-11 00:29:45,738 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:45,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:45,740 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-11 00:29:45,781 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-11 00:29:45,785 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f37481c2a90> has no local changes
2025-07-11 00:29:45,785 [ 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#474 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/)'
2025-07-11 00:29:45,792 [ scc.git] DEBUG [detached HEAD 2747d2c] merge master -Dorg -Ssuccess-only
2025-07-11 00:29:45,792 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:29:45,792 [ scc.git] INFO Overriding base-branch from master to develop
2025-07-11 00:29:45,792 [ scc.repo] DEBUG ## PRs found:
2025-07-11 00:29:45,941 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:46,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-07-11 00:29:46,486 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:46,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-07-11 00:29:46,954 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:47,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-07-11 00:29:47,428 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:47,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-07-11 00:29:47,897 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:48,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-11 00:29:48,381 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:48,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-07-11 00:29:48,877 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:49,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-07-11 00:29:49,353 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:49,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-07-11 00:29:49,536 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-07-11 00:29:49,787 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:50,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-07-11 00:29:50,271 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:50,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-07-11 00:29:50,761 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:51,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-07-11 00:29:51,298 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:51,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-11 00:29:51,767 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:51,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-07-11 00:29:52,224 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:52,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-07-11 00:29:52,408 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-07-11 00:29:52,659 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:52,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-07-11 00:29:53,155 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:53,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-07-11 00:29:53,656 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:53,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-07-11 00:29:54,127 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:54,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-07-11 00:29:54,341 [ scc.repo] DEBUG ## Branches found:
2025-07-11 00:29:54,341 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-07-11 00:29:54,341 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:54,341 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:54,344 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-07-11 00:29:54,347 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-11 00:29:54,347 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-07-11 00:29:54,350 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-07-11 00:29:54,362 [ scc.git] DEBUG Updating 4b4c755..573db34
2025-07-11 00:29:54,591 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:55,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/227 HTTP/1.1" 200 None
2025-07-11 00:29:55,277 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:55,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-07-11 00:29:55,741 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-07-11 00:29:56,045 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-07-11 00:29:56,045 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-07-11 00:29:56,050 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-07-11 00:29:56,338 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-07-11 00:29:56,338 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-07-11 00:29:56,342 [ scc.git] DEBUG ## Unique users: []
2025-07-11 00:29:56,342 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:56,342 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:56,344 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-07-11 00:29:56,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:56,353 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-07-11 00:29:56,364 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-07-11 00:29:56,364 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-11 00:29:56,365 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-11 00:29:56,367 [ scc.git] DEBUG Calling 'git reset --hard 573db340d5d1429fa17c7e486206948412a7c150'
2025-07-11 00:29:56,372 [ scc.git] DEBUG HEAD is now at 573db34 Bump version: 5.9.1 → 5.9.2.dev0
2025-07-11 00:29:56,373 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:56,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:29:56,545 [ scc.git] DEBUG Calling 'git merge-base 573db340d5d1429fa17c7e486206948412a7c150 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-07-11 00:29:56,551 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..573db340d5d1429fa17c7e486206948412a7c150'
2025-07-11 00:29:56,555 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#474](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-07-11 00:29:56,557 [ scc.config] DEBUG Found github.token
2025-07-11 00:29:56,557 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-07-11 00:29:56,557 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-07-11 00:29:56,562 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:56,564 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-07-11 00:29:56,574 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-11 00:29:56,578 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-07-11 00:29:56,578 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-07-11 00:29:56,796 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:56,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:29:56,959 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-11 00:29:56,999 [ scc.git] DEBUG Get sha1 of %s
2025-07-11 00:29:56,999 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-11 00:29:57,002 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-11 00:29:57,042 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-11 00:29:57,046 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f374934cd90> has no local changes
2025-07-11 00:29:57,046 [ 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#474 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/)'
2025-07-11 00:29:57,052 [ scc.git] DEBUG [detached HEAD c29c624] merge master -Dorg -Ssuccess-only
2025-07-11 00:29:57,053 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:29:57,053 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-11 00:29:57,130 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-07-11 00:29:57,210 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:57,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:29:57,374 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-07-11 00:29:57,376 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-07-11 00:29:57,620 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:57,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:29:57,794 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-07-11 00:29:57,796 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-07-11 00:29:58,041 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:58,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:29:58,214 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-07-11 00:29:58,216 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-07-11 00:29:58,461 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:58,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:29:58,639 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-07-11 00:29:58,884 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:59,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:29:59,045 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-07-11 00:29:59,047 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-07-11 00:29:59,292 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:59,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:29:59,453 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-07-11 00:29:59,455 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-07-11 00:29:59,699 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:29:59,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:29:59,877 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-07-11 00:29:59,879 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-07-11 00:30:00,124 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:30:00,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:30:00,324 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-07-11 00:30:00,326 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-07-11 00:30:00,570 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:30:00,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:30:00,733 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-07-11 00:30:00,735 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-07-11 00:30:00,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:30:01,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:30:01,158 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-07-11 00:30:01,159 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-07-11 00:30:01,404 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:30:01,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:30:01,574 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-07-11 00:30:01,576 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-07-11 00:30:01,821 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:30:01,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:30:01,990 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-07-11 00:30:01,992 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-07-11 00:30:02,237 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:30:02,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:30:02,400 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-07-11 00:30:02,645 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:30:02,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:30:02,813 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-07-11 00:30:03,057 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:30:03,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:30:03,232 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-07-11 00:30:03,234 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-07-11 00:30:03,479 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:30:03,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:30:03,645 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-07-11 00:30:03,889 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:30:04,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:30:04,070 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-07-11 00:30:04,314 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:30:04,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:30:04,484 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-07-11 00:30:04,486 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-07-11 00:30:04,730 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:30:04,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:30:04,912 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-07-11 00:30:04,914 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-07-11 00:30:05,158 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:30:05,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:30:05,324 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-07-11 00:30:05,326 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-07-11 00:30:05,571 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:30:05,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:30:05,735 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-07-11 00:30:05,737 [ scc.config] DEBUG Found submodule.scripts.url
2025-07-11 00:30:05,982 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-11 00:30:06,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-11 00:30:06,244 [ scc.config] DEBUG Found submodule.scripts.branch
2025-07-11 00:30:06,245 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-11 00:30:06,333 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f374b99a050> has local changes
2025-07-11 00:30:06,333 [ 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..8ba7e71
Previously merged:
- PR 179 will-moore 'Changelog 0.6.0'
- PR 177 jburel 'Replace fromstring by frombuffer'
- PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
- PR 147 will-moore 'Name option'
- PR 173 will-moore 'Add test_export_plate_polygons()'
- PR 171 will-moore 'Initial addition of integration tests'
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
Repository: ome/omero-figure
Excluded PRs:
- PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
- PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..3e8fa730
Previously merged:
- PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
- PR 635 dependabot[bot] 'Bump esbuild and vite'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Updating 7a798ce..bb94cf8
Previously merged:
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
- PR 76 will-moore 'Run cli deps'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Updating deab817..160d894
Previously merged:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..573db34
Previously merged:
- PR 227 jburel 'Replace tostring by tobytes'
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#474 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/474/)'
2025-07-11 00:30:06,346 [ scc.git] DEBUG [detached HEAD 9a00063] merge master -Dorg -Ssuccess-only
2025-07-11 00:30:06,346 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-07-11 00:30:06,346 [ scc.merge] INFO Repository: ome/omero-plugins
2025-07-11 00:30:06,346 [ scc.merge] INFO Already up to date.
2025-07-11 00:30:06,346 [ scc.merge] INFO
2025-07-11 00:30:06,347 [ scc.merge] INFO Merged PRs:
2025-07-11 00:30:06,347 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-07-11 00:30:06,347 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-07-11 00:30:06,347 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-07-11 00:30:06,347 [ scc.merge] INFO
2025-07-11 00:30:06,347 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-07-11 00:30:06,347 [ scc.merge] INFO Already up to date.
2025-07-11 00:30:06,347 [ scc.merge] INFO
2025-07-11 00:30:06,347 [ scc.merge] INFO
2025-07-11 00:30:06,347 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-07-11 00:30:06,347 [ scc.merge] INFO Excluded PRs:
2025-07-11 00:30:06,347 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-07-11 00:30:06,347 [ scc.merge] INFO Already up to date.
2025-07-11 00:30:06,347 [ scc.merge] INFO
2025-07-11 00:30:06,347 [ scc.merge] INFO
2025-07-11 00:30:06,347 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-07-11 00:30:06,347 [ scc.merge] INFO Excluded PRs:
2025-07-11 00:30:06,347 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-07-11 00:30:06,347 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-07-11 00:30:06,347 [ scc.merge] INFO Already up to date.
2025-07-11 00:30:06,347 [ scc.merge] INFO
2025-07-11 00:30:06,347 [ scc.merge] INFO Merged PRs:
2025-07-11 00:30:06,347 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-07-11 00:30:06,347 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-07-11 00:30:06,347 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-07-11 00:30:06,347 [ scc.merge] INFO
2025-07-11 00:30:06,347 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-07-11 00:30:06,347 [ scc.merge] INFO Excluded PRs:
2025-07-11 00:30:06,347 [ scc.merge] INFO - PR 174 will-moore 'Skip wells' (stage: draft)
2025-07-11 00:30:06,347 [ scc.merge] INFO - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
2025-07-11 00:30:06,347 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-07-11 00:30:06,347 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-07-11 00:30:06,347 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-07-11 00:30:06,347 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-07-11 00:30:06,347 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-07-11 00:30:06,347 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-07-11 00:30:06,347 [ scc.merge] INFO Updating 11d3587..8ba7e71
2025-07-11 00:30:06,348 [ scc.merge] INFO Previously merged:
2025-07-11 00:30:06,348 [ scc.merge] INFO - PR 179 will-moore 'Changelog 0.6.0'
2025-07-11 00:30:06,348 [ scc.merge] INFO - PR 177 jburel 'Replace fromstring by frombuffer'
2025-07-11 00:30:06,348 [ scc.merge] INFO - PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
2025-07-11 00:30:06,348 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-07-11 00:30:06,348 [ scc.merge] INFO - PR 173 will-moore 'Add test_export_plate_polygons()'
2025-07-11 00:30:06,348 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-07-11 00:30:06,348 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-11 00:30:06,348 [ scc.merge] INFO
2025-07-11 00:30:06,348 [ scc.merge] INFO Merged PRs:
2025-07-11 00:30:06,348 [ scc.merge] INFO - PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
2025-07-11 00:30:06,348 [ scc.merge] INFO
2025-07-11 00:30:06,348 [ scc.merge] INFO Repository: ome/omero-figure
2025-07-11 00:30:06,348 [ scc.merge] INFO Excluded PRs:
2025-07-11 00:30:06,348 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-07-11 00:30:06,348 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-07-11 00:30:06,348 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-07-11 00:30:06,348 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-07-11 00:30:06,348 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-07-11 00:30:06,348 [ scc.merge] INFO Previously merged:
2025-07-11 00:30:06,348 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-07-11 00:30:06,348 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-07-11 00:30:06,348 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-07-11 00:30:06,348 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-11 00:30:06,348 [ scc.merge] INFO
2025-07-11 00:30:06,348 [ scc.merge] INFO Merged PRs:
2025-07-11 00:30:06,348 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-07-11 00:30:06,348 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-07-11 00:30:06,348 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-07-11 00:30:06,348 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-07-11 00:30:06,348 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-07-11 00:30:06,348 [ scc.merge] INFO
2025-07-11 00:30:06,348 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-11 00:30:06,348 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-07-11 00:30:06,348 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-07-11 00:30:06,348 [ scc.merge] INFO
2025-07-11 00:30:06,348 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-07-11 00:30:06,348 [ scc.merge] INFO Already up to date.
2025-07-11 00:30:06,349 [ scc.merge] INFO
2025-07-11 00:30:06,349 [ scc.merge] INFO Merged PRs:
2025-07-11 00:30:06,349 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-07-11 00:30:06,349 [ scc.merge] INFO
2025-07-11 00:30:06,349 [ scc.merge] INFO Repository: ome/omero-gallery
2025-07-11 00:30:06,349 [ scc.merge] INFO Already up to date.
2025-07-11 00:30:06,349 [ scc.merge] INFO
2025-07-11 00:30:06,349 [ scc.merge] INFO Merged PRs:
2025-07-11 00:30:06,349 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-07-11 00:30:06,349 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-07-11 00:30:06,349 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-07-11 00:30:06,349 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-07-11 00:30:06,349 [ scc.merge] INFO
2025-07-11 00:30:06,349 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-11 00:30:06,349 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-07-11 00:30:06,349 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-07-11 00:30:06,349 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-07-11 00:30:06,349 [ scc.merge] INFO
2025-07-11 00:30:06,349 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-07-11 00:30:06,349 [ scc.merge] INFO Excluded PRs:
2025-07-11 00:30:06,349 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-07-11 00:30:06,349 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-07-11 00:30:06,349 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-07-11 00:30:06,349 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-07-11 00:30:06,349 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-07-11 00:30:06,349 [ scc.merge] INFO Updating 7a798ce..bb94cf8
2025-07-11 00:30:06,349 [ scc.merge] INFO Previously merged:
2025-07-11 00:30:06,349 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-11 00:30:06,349 [ scc.merge] INFO
2025-07-11 00:30:06,349 [ scc.merge] INFO Merged PRs:
2025-07-11 00:30:06,349 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-07-11 00:30:06,349 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-07-11 00:30:06,349 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-07-11 00:30:06,349 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-07-11 00:30:06,349 [ scc.merge] INFO
2025-07-11 00:30:06,349 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-11 00:30:06,349 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-07-11 00:30:06,350 [ scc.merge] INFO
2025-07-11 00:30:06,350 [ scc.merge] INFO Repository: ome/omero-mapr
2025-07-11 00:30:06,350 [ scc.merge] INFO Excluded PRs:
2025-07-11 00:30:06,350 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-07-11 00:30:06,350 [ scc.merge] INFO Already up to date.
2025-07-11 00:30:06,350 [ scc.merge] INFO
2025-07-11 00:30:06,350 [ scc.merge] INFO Merged PRs:
2025-07-11 00:30:06,350 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-07-11 00:30:06,350 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-11 00:30:06,350 [ scc.merge] INFO
2025-07-11 00:30:06,350 [ scc.merge] INFO Repository: ome/omero-metadata
2025-07-11 00:30:06,350 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-07-11 00:30:06,350 [ scc.merge] INFO Previously merged:
2025-07-11 00:30:06,350 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-11 00:30:06,350 [ scc.merge] INFO
2025-07-11 00:30:06,350 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-11 00:30:06,350 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-07-11 00:30:06,350 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-07-11 00:30:06,350 [ scc.merge] INFO
2025-07-11 00:30:06,350 [ scc.merge] INFO Repository: ome/omero-parade
2025-07-11 00:30:06,350 [ scc.merge] INFO Excluded PRs:
2025-07-11 00:30:06,350 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-07-11 00:30:06,350 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-07-11 00:30:06,350 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-07-11 00:30:06,350 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-07-11 00:30:06,350 [ scc.merge] INFO Already up to date.
2025-07-11 00:30:06,350 [ scc.merge] INFO
2025-07-11 00:30:06,350 [ scc.merge] INFO Merged PRs:
2025-07-11 00:30:06,350 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-07-11 00:30:06,350 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-07-11 00:30:06,350 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-11 00:30:06,350 [ scc.merge] INFO
2025-07-11 00:30:06,350 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-07-11 00:30:06,350 [ scc.merge] INFO Already up to date.
2025-07-11 00:30:06,350 [ scc.merge] INFO
2025-07-11 00:30:06,350 [ scc.merge] INFO
2025-07-11 00:30:06,350 [ scc.merge] INFO Repository: ome/omero-rois
2025-07-11 00:30:06,350 [ scc.merge] INFO Excluded PRs:
2025-07-11 00:30:06,351 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-07-11 00:30:06,351 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-07-11 00:30:06,351 [ scc.merge] INFO Already up to date.
2025-07-11 00:30:06,351 [ scc.merge] INFO
2025-07-11 00:30:06,351 [ scc.merge] INFO
2025-07-11 00:30:06,351 [ scc.merge] INFO Repository: ome/omero-signup
2025-07-11 00:30:06,351 [ scc.merge] INFO Already up to date.
2025-07-11 00:30:06,351 [ scc.merge] INFO
2025-07-11 00:30:06,351 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-11 00:30:06,351 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-07-11 00:30:06,351 [ scc.merge] INFO
2025-07-11 00:30:06,351 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-07-11 00:30:06,351 [ scc.merge] INFO Excluded PRs:
2025-07-11 00:30:06,351 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-07-11 00:30:06,351 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-07-11 00:30:06,351 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-07-11 00:30:06,351 [ scc.merge] INFO Already up to date.
2025-07-11 00:30:06,351 [ scc.merge] INFO
2025-07-11 00:30:06,351 [ scc.merge] INFO Merged PRs:
2025-07-11 00:30:06,351 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-07-11 00:30:06,351 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-07-11 00:30:06,351 [ scc.merge] INFO
2025-07-11 00:30:06,351 [ scc.merge] INFO Repository: ome/omero-upload
2025-07-11 00:30:06,351 [ scc.merge] INFO Already up to date.
2025-07-11 00:30:06,351 [ scc.merge] INFO
2025-07-11 00:30:06,351 [ scc.merge] INFO
2025-07-11 00:30:06,351 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-07-11 00:30:06,351 [ scc.merge] INFO Updating deab817..160d894
2025-07-11 00:30:06,351 [ scc.merge] INFO Previously merged:
2025-07-11 00:30:06,351 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-07-11 00:30:06,351 [ scc.merge] INFO
2025-07-11 00:30:06,351 [ scc.merge] INFO
2025-07-11 00:30:06,351 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-07-11 00:30:06,351 [ scc.merge] INFO Excluded PRs:
2025-07-11 00:30:06,351 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-07-11 00:30:06,351 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-07-11 00:30:06,351 [ scc.merge] INFO Already up to date.
2025-07-11 00:30:06,351 [ scc.merge] INFO
2025-07-11 00:30:06,352 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-11 00:30:06,352 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-07-11 00:30:06,352 [ scc.merge] INFO
2025-07-11 00:30:06,352 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-07-11 00:30:06,352 [ scc.merge] INFO Already up to date.
2025-07-11 00:30:06,352 [ scc.merge] INFO
2025-07-11 00:30:06,352 [ scc.merge] INFO
2025-07-11 00:30:06,352 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-07-11 00:30:06,352 [ scc.merge] INFO Already up to date.
2025-07-11 00:30:06,352 [ scc.merge] INFO
2025-07-11 00:30:06,352 [ scc.merge] INFO
2025-07-11 00:30:06,352 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-07-11 00:30:06,352 [ scc.merge] INFO Already up to date.
2025-07-11 00:30:06,352 [ scc.merge] INFO
2025-07-11 00:30:06,352 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-11 00:30:06,352 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-07-11 00:30:06,352 [ scc.merge] INFO
2025-07-11 00:30:06,352 [ scc.merge] INFO Repository: ome/scripts
2025-07-11 00:30:06,352 [ scc.merge] INFO Excluded PRs:
2025-07-11 00:30:06,352 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-07-11 00:30:06,352 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-07-11 00:30:06,352 [ scc.merge] INFO Updating 4b4c755..573db34
2025-07-11 00:30:06,352 [ scc.merge] INFO Previously merged:
2025-07-11 00:30:06,352 [ scc.merge] INFO - PR 227 jburel 'Replace tostring by tobytes'
2025-07-11 00:30:06,352 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-07-11 00:30:06,352 [ scc.merge] INFO
2025-07-11 00:30:06,352 [ scc.merge] INFO Merged PRs:
2025-07-11 00:30:06,352 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-07-11 00:30:06,352 [ scc.merge] INFO
2025-07-11 00:30:06,352 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-11 00:30:06,352 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-07-11 00:30:06,352 [ scc.merge] INFO
2025-07-11 00:30:06,352 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-07-11 00:30:06,352 [ scc.git] DEBUG Calling 'git remote'
2025-07-11 00:30:06,355 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-07-11 00:30:06,355 [ scc.git] DEBUG Calling 'git remote'
2025-07-11 00:30:06,357 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:30:06,357 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-07-11 00:30:06,357 [ scc.git] DEBUG Calling 'git remote'
2025-07-11 00:30:06,359 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:30:06,359 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-07-11 00:30:06,359 [ scc.git] DEBUG Calling 'git remote'
2025-07-11 00:30:06,361 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:30:06,361 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-07-11 00:30:06,362 [ scc.git] DEBUG Calling 'git remote'
2025-07-11 00:30:06,364 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:30:06,364 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-07-11 00:30:06,364 [ scc.git] DEBUG Calling 'git remote'
2025-07-11 00:30:06,366 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:30:06,366 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-07-11 00:30:06,366 [ scc.git] DEBUG Calling 'git remote'
2025-07-11 00:30:06,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:30:06,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-07-11 00:30:06,368 [ scc.git] DEBUG Calling 'git remote'
2025-07-11 00:30:06,370 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:30:06,370 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-07-11 00:30:06,370 [ scc.git] DEBUG Calling 'git remote'
2025-07-11 00:30:06,373 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:30:06,373 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-07-11 00:30:06,373 [ scc.git] DEBUG Calling 'git remote'
2025-07-11 00:30:06,375 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:30:06,375 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-07-11 00:30:06,375 [ scc.git] DEBUG Calling 'git remote'
2025-07-11 00:30:06,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:30:06,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-07-11 00:30:06,378 [ scc.git] DEBUG Calling 'git remote'
2025-07-11 00:30:06,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:30:06,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-07-11 00:30:06,380 [ scc.git] DEBUG Calling 'git remote'
2025-07-11 00:30:06,382 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:30:06,382 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-07-11 00:30:06,382 [ scc.git] DEBUG Calling 'git remote'
2025-07-11 00:30:06,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:30:06,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-07-11 00:30:06,385 [ scc.git] DEBUG Calling 'git remote'
2025-07-11 00:30:06,387 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:30:06,387 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-07-11 00:30:06,387 [ scc.git] DEBUG Calling 'git remote'
2025-07-11 00:30:06,389 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:30:06,389 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-07-11 00:30:06,389 [ scc.git] DEBUG Calling 'git remote'
2025-07-11 00:30:06,391 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:30:06,391 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-07-11 00:30:06,391 [ scc.git] DEBUG Calling 'git remote'
2025-07-11 00:30:06,394 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:30:06,394 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-07-11 00:30:06,394 [ scc.git] DEBUG Calling 'git remote'
2025-07-11 00:30:06,396 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:30:06,396 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-07-11 00:30:06,396 [ scc.git] DEBUG Calling 'git remote'
2025-07-11 00:30:06,398 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:30:06,398 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-07-11 00:30:06,398 [ scc.git] DEBUG Calling 'git remote'
2025-07-11 00:30:06,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:30:06,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-07-11 00:30:06,401 [ scc.git] DEBUG Calling 'git remote'
2025-07-11 00:30:06,403 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-11 00:30:06,403 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-07-11 00:30:06,403 [ scc.git] DEBUG Calling 'git remote'
2025-07-11 00:30:06,405 [ 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 9ad84f0] 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 f7a0662] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-07-11 00:30:54,347 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2025-07-11 00:31:03,902 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2025-07-11 00:31:06,375 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-07-11 00:31:11,236 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-07-11 00:31:51,918 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/fb75e5c0/images/svgs/logo.svg){kind=logo}
