Skipping 223 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
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)
Already up to date.
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'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#420 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/)'
2025-05-14 05:33:42,950 [ scc.git] DEBUG [detached HEAD 9a31079] merge master -Dorg -Ssuccess-only
2025-05-14 05:33:42,950 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:33:42,950 [ scc.repo] DEBUG ## PRs found:
2025-05-14 05:33:43,109 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:43,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-05-14 05:33:43,691 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:43,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-05-14 05:33:44,225 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:44,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-14 05:33:44,764 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:45,002 [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-05-14 05:33:45,254 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:45,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-14 05:33:45,709 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:45,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-05-14 05:33:45,890 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-14 05:33:46,141 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:46,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-05-14 05:33:46,629 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:46,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-05-14 05:33:47,184 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:47,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-14 05:33:47,737 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:47,955 [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-05-14 05:33:48,206 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:48,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-14 05:33:48,706 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:48,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-05-14 05:33:48,901 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-05-14 05:33:48,901 [ scc.repo] DEBUG ## Branches found:
2025-05-14 05:33:48,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-14 05:33:48,901 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:33:48,901 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:33:48,904 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-14 05:33:48,906 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 05:33:48,906 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-14 05:33:48,909 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-14 05:33:48,912 [ scc.git] DEBUG Already up to date.
2025-05-14 05:33:48,912 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-05-14 05:33:49,273 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-14 05:33:49,273 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-05-14 05:33:49,277 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-05-14 05:33:49,540 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-14 05:33:49,540 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-05-14 05:33:49,544 [ scc.git] DEBUG ## Unique users: []
2025-05-14 05:33:49,544 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:33:49,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:33:49,546 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-14 05:33:49,550 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:33:49,552 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-14 05:33:49,561 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-14 05:33:49,564 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-05-14 05:33:49,565 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-05-14 05:33:49,565 [ scc.git] DEBUG requirements.txt | 2 +-
2025-05-14 05:33:49,565 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-05-14 05:33:49,565 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-05-14 05:33:49,565 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-05-14 05:33:49,566 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:49,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:33:49,743 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-05-14 05:33:49,747 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:33:49,749 [ 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-05-14 05:33:49,758 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-14 05:33:49,761 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-14 05:33:49,761 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-14 05:33:49,994 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:50,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:33:50,162 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 05:33:50,199 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:33:50,199 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:33:50,201 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 05:33:50,237 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 05:33:50,241 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1c98c4c990> has no local changes
2025-05-14 05:33:50,241 [ 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#420 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/)'
2025-05-14 05:33:50,247 [ scc.git] DEBUG [detached HEAD c562a8a] merge master -Dorg -Ssuccess-only
2025-05-14 05:33:50,247 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:33:50,248 [ scc.repo] DEBUG ## PRs found:
2025-05-14 05:33:50,413 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:50,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-05-14 05:33:50,999 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:51,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-05-14 05:33:51,675 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:51,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-05-14 05:33:52,250 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:52,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-14 05:33:52,791 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:53,000 [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-05-14 05:33:53,251 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:53,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-14 05:33:53,713 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:53,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-05-14 05:33:53,905 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-14 05:33:54,156 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:54,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-05-14 05:33:54,637 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:54,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-05-14 05:33:55,179 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:55,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-14 05:33:55,727 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:56,015 [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-05-14 05:33:56,266 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:56,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-14 05:33:56,795 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:57,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-05-14 05:33:57,025 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-14 05:33:57,025 [ scc.repo] DEBUG ## Branches found:
2025-05-14 05:33:57,025 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-14 05:33:57,026 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:33:57,026 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:33:57,028 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-14 05:33:57,031 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 05:33:57,031 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-14 05:33:57,033 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-14 05:33:57,041 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-05-14 05:33:57,276 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:57,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-05-14 05:33:57,774 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-05-14 05:33:58,137 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-14 05:33:58,137 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-05-14 05:33:58,141 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-05-14 05:33:58,405 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-14 05:33:58,405 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-05-14 05:33:58,409 [ scc.git] DEBUG ## Unique users: []
2025-05-14 05:33:58,409 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:33:58,409 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:33:58,411 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-14 05:33:58,416 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:33:58,418 [ 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-05-14 05:33:58,431 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-05-14 05:33:58,431 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-05-14 05:33:58,431 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-14 05:33:58,431 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-14 05:33:58,432 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-14 05:33:58,432 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-14 05:33:58,435 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-14 05:33:58,439 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-14 05:33:58,440 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:58,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:33:58,612 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-14 05:33:58,616 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-14 05:33:58,619 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#420](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-05-14 05:33:58,621 [ scc.config] DEBUG Found github.token
2025-05-14 05:33:58,621 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-05-14 05:33:58,621 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-14 05:33:58,625 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:33:58,628 [ 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-05-14 05:33:58,643 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-14 05:33:58,643 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-14 05:33:58,643 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-05-14 05:33:58,643 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-14 05:33:58,643 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-14 05:33:58,646 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-14 05:33:58,651 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-14 05:33:58,862 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:59,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:33:59,057 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-14 05:33:59,061 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-14 05:33:59,064 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#420](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/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-05-14 05:33:59,066 [ scc.config] DEBUG Found github.token
2025-05-14 05:33:59,066 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-05-14 05:33:59,066 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 05:33:59,103 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:33:59,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:33:59,105 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 05:33:59,143 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 05:33:59,148 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1c98d29790> has no local changes
2025-05-14 05:33:59,148 [ 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#420 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/)'
2025-05-14 05:33:59,154 [ scc.git] DEBUG [detached HEAD 7c1ee2f] merge master -Dorg -Ssuccess-only
2025-05-14 05:33:59,154 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:33:59,154 [ scc.repo] DEBUG ## PRs found:
2025-05-14 05:33:59,308 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:33:59,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-05-14 05:33:59,905 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:00,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-05-14 05:34:00,400 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:00,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-14 05:34:00,961 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:01,206 [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-05-14 05:34:01,458 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:01,837 [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-05-14 05:34:02,089 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:02,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-14 05:34:02,536 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:02,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-05-14 05:34:02,758 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-14 05:34:03,009 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:03,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-05-14 05:34:03,234 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-14 05:34:03,485 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:03,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-14 05:34:04,151 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:04,408 [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-05-14 05:34:04,659 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:04,941 [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-05-14 05:34:05,193 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:05,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-14 05:34:05,752 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:05,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-05-14 05:34:05,943 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-14 05:34:06,194 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:06,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-05-14 05:34:06,431 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-14 05:34:06,682 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:07,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-14 05:34:07,280 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:07,529 [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-05-14 05:34:07,781 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:08,069 [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-05-14 05:34:08,320 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:08,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-14 05:34:08,870 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:09,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-05-14 05:34:09,055 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-14 05:34:09,306 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:09,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-05-14 05:34:09,806 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:10,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-05-14 05:34:10,309 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:10,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-05-14 05:34:11,051 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:11,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-05-14 05:34:11,511 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:11,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-05-14 05:34:12,064 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:12,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-05-14 05:34:12,544 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:13,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-05-14 05:34:13,017 [ scc.repo] DEBUG ## Branches found:
2025-05-14 05:34:13,017 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-14 05:34:13,017 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:13,017 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:13,019 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-14 05:34:13,022 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 05:34:13,022 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-14 05:34:13,025 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-14 05:34:13,028 [ scc.git] DEBUG Already up to date.
2025-05-14 05:34:13,028 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-05-14 05:34:13,298 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-14 05:34:13,298 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-05-14 05:34:13,302 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-05-14 05:34:13,607 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-14 05:34:13,607 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-05-14 05:34:13,611 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-05-14 05:34:13,908 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-14 05:34:13,908 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-05-14 05:34:13,912 [ scc.git] DEBUG ## Unique users: []
2025-05-14 05:34:13,912 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:13,912 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:13,914 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-05-14 05:34:13,917 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:13,920 [ 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-05-14 05:34:13,928 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-14 05:34:13,931 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-05-14 05:34:13,931 [ scc.git] DEBUG package.json | 2 +-
2025-05-14 05:34:13,932 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-05-14 05:34:13,933 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:14,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:34:14,099 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-05-14 05:34:14,102 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:14,104 [ 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-05-14 05:34:14,114 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-14 05:34:14,114 [ scc.git] DEBUG Auto-merging package.json
2025-05-14 05:34:14,115 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-14 05:34:14,118 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-05-14 05:34:14,118 [ scc.git] DEBUG package.json | 2 +-
2025-05-14 05:34:14,118 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-05-14 05:34:14,350 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:14,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:34:14,522 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-05-14 05:34:14,525 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:14,527 [ 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-05-14 05:34:14,536 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-14 05:34:14,539 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-14 05:34:14,539 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-14 05:34:14,773 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:14,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:34:14,963 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 05:34:15,000 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:15,000 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:15,002 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 05:34:15,038 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 05:34:15,043 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1c98d41a50> has no local changes
2025-05-14 05:34:15,043 [ 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#420 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/)'
2025-05-14 05:34:15,049 [ scc.git] DEBUG [detached HEAD 11af89f] merge master -Dorg -Ssuccess-only
2025-05-14 05:34:15,049 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:34:15,049 [ scc.repo] DEBUG ## PRs found:
2025-05-14 05:34:15,214 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:15,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-05-14 05:34:15,419 [ scc.repo] DEBUG ## Branches found:
2025-05-14 05:34:15,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-14 05:34:15,419 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:15,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:15,421 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-14 05:34:15,424 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 05:34:15,424 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-14 05:34:15,427 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-14 05:34:15,430 [ scc.git] DEBUG Already up to date.
2025-05-14 05:34:15,430 [ scc.git] DEBUG ## Unique users: []
2025-05-14 05:34:15,430 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:15,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:15,432 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 05:34:15,470 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:15,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:15,472 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 05:34:15,509 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 05:34:15,512 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1c98c45710> has no local changes
2025-05-14 05:34:15,512 [ 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#420 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/)'
2025-05-14 05:34:15,518 [ scc.git] DEBUG [detached HEAD d40fd95] merge master -Dorg -Ssuccess-only
2025-05-14 05:34:15,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:34:15,518 [ scc.repo] DEBUG ## PRs found:
2025-05-14 05:34:15,670 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:15,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-05-14 05:34:16,243 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:16,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-05-14 05:34:16,779 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:17,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-05-14 05:34:17,294 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:17,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-05-14 05:34:17,552 [ scc.repo] DEBUG ## Branches found:
2025-05-14 05:34:17,552 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-14 05:34:17,552 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:17,552 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:17,554 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-14 05:34:17,557 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 05:34:17,557 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-14 05:34:17,560 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-14 05:34:17,563 [ scc.git] DEBUG Already up to date.
2025-05-14 05:34:17,563 [ scc.git] DEBUG ## Unique users: []
2025-05-14 05:34:17,563 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:17,563 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:17,565 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 05:34:17,602 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:17,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:17,605 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 05:34:17,640 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 05:34:17,644 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1c98c479d0> has no local changes
2025-05-14 05:34:17,644 [ 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#420 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/)'
2025-05-14 05:34:17,650 [ scc.git] DEBUG [detached HEAD 5fe8f3d] merge master -Dorg -Ssuccess-only
2025-05-14 05:34:17,650 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:34:17,650 [ scc.repo] DEBUG ## PRs found:
2025-05-14 05:34:17,802 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:18,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-05-14 05:34:18,352 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:18,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-05-14 05:34:18,851 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:19,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-05-14 05:34:19,313 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:19,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-14 05:34:19,896 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:20,186 [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-05-14 05:34:20,437 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:20,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-14 05:34:21,033 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:21,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-05-14 05:34:21,246 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-14 05:34:21,246 [ scc.repo] DEBUG ## Branches found:
2025-05-14 05:34:21,246 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-14 05:34:21,246 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:21,246 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:21,249 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-14 05:34:21,251 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 05:34:21,251 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-14 05:34:21,254 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-14 05:34:21,257 [ scc.git] DEBUG Already up to date.
2025-05-14 05:34:21,257 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-05-14 05:34:21,584 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-05-14 05:34:21,585 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-05-14 05:34:21,588 [ scc.git] DEBUG ## Unique users: []
2025-05-14 05:34:21,589 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:21,589 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:21,591 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-14 05:34:21,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:21,596 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-14 05:34:21,606 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-05-14 05:34:21,606 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-05-14 05:34:21,606 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-05-14 05:34:21,606 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-05-14 05:34:21,606 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-05-14 05:34:21,606 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-05-14 05:34:21,606 [ scc.git] DEBUG Auto-merging setup.py
2025-05-14 05:34:21,606 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-05-14 05:34:21,606 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-14 05:34:21,606 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-14 05:34:21,609 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-14 05:34:21,613 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-05-14 05:34:21,614 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:21,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:34:21,792 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-14 05:34:21,795 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-14 05:34:21,798 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#420](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
--conflicts
2025-05-14 05:34:21,800 [ scc.config] DEBUG Found github.token
2025-05-14 05:34:21,800 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-05-14 05:34:21,800 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 05:34:21,837 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:21,837 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:21,839 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 05:34:21,877 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 05:34:21,880 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1c98c97990> has no local changes
2025-05-14 05:34:21,881 [ 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#420 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/)'
2025-05-14 05:34:21,887 [ scc.git] DEBUG [detached HEAD db8935a] merge master -Dorg -Ssuccess-only
2025-05-14 05:34:21,887 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:34:21,887 [ scc.repo] DEBUG ## PRs found:
2025-05-14 05:34:22,043 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:22,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-05-14 05:34:22,764 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:22,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-05-14 05:34:23,247 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:23,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-14 05:34:23,844 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:24,147 [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-05-14 05:34:24,398 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:24,653 [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-05-14 05:34:24,904 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:25,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-14 05:34:25,462 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:25,679 [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-05-14 05:34:25,679 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-05-14 05:34:25,930 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:26,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-05-14 05:34:26,438 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:26,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-05-14 05:34:26,918 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:27,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-05-14 05:34:27,523 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:27,806 [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-05-14 05:34:28,057 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:28,370 [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-05-14 05:34:28,622 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:28,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-05-14 05:34:29,136 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:29,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-05-14 05:34:29,612 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:29,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-05-14 05:34:30,149 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:30,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-05-14 05:34:30,654 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:30,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-14 05:34:31,241 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:31,446 [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-05-14 05:34:31,697 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:31,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-14 05:34:32,231 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:32,419 [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-05-14 05:34:32,420 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-14 05:34:32,420 [ scc.repo] DEBUG ## Branches found:
2025-05-14 05:34:32,420 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-14 05:34:32,420 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:32,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:32,423 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-14 05:34:32,425 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 05:34:32,425 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-14 05:34:32,428 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-14 05:34:32,431 [ scc.git] DEBUG Already up to date.
2025-05-14 05:34:32,431 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-05-14 05:34:32,731 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-14 05:34:32,731 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-05-14 05:34:32,735 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-05-14 05:34:33,015 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-14 05:34:33,015 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-05-14 05:34:33,020 [ scc.git] DEBUG ## Unique users: []
2025-05-14 05:34:33,020 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:33,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:33,022 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-05-14 05:34:33,027 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:33,029 [ 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-05-14 05:34:33,042 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-14 05:34:33,045 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-05-14 05:34:33,045 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-05-14 05:34:33,045 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-05-14 05:34:33,045 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-05-14 05:34:33,045 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-05-14 05:34:33,045 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-05-14 05:34:33,045 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-05-14 05:34:33,046 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-05-14 05:34:33,047 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:33,047 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-05-14 05:34:33,047 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-05-14 05:34:33,047 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-05-14 05:34:33,047 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-05-14 05:34:33,047 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-05-14 05:34:33,047 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-05-14 05:34:33,047 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-05-14 05:34:33,047 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-05-14 05:34:33,047 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-05-14 05:34:33,047 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-05-14 05:34:33,047 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-05-14 05:34:33,047 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-05-14 05:34:33,047 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-05-14 05:34:33,047 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-05-14 05:34:33,047 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-05-14 05:34:33,047 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-05-14 05:34:33,047 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-05-14 05:34:33,047 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-05-14 05:34:33,047 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-05-14 05:34:33,047 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-05-14 05:34:33,047 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-05-14 05:34:33,047 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-05-14 05:34:33,047 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-05-14 05:34:33,047 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-05-14 05:34:33,047 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-05-14 05:34:33,047 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-05-14 05:34:33,047 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-05-14 05:34:33,047 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-05-14 05:34:33,047 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-05-14 05:34:33,047 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-05-14 05:34:33,047 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-05-14 05:34:33,048 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-05-14 05:34:33,048 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-05-14 05:34:33,048 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-05-14 05:34:33,048 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-05-14 05:34:33,048 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-05-14 05:34:33,048 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-05-14 05:34:33,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:34:33,351 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-14 05:34:33,356 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:33,358 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-14 05:34:33,368 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-14 05:34:33,371 [ scc.git] DEBUG docker | 1 +
2025-05-14 05:34:33,371 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-05-14 05:34:33,602 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:33,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:34:33,780 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 05:34:33,818 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:33,818 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:33,820 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 05:34:33,856 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 05:34:33,860 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1c98327d50> has no local changes
2025-05-14 05:34:33,860 [ 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#420 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/)'
2025-05-14 05:34:33,868 [ scc.git] DEBUG [detached HEAD 88f34a4] merge master -Dorg -Ssuccess-only
2025-05-14 05:34:33,868 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:34:33,868 [ scc.repo] DEBUG ## PRs found:
2025-05-14 05:34:34,031 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:34,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-05-14 05:34:34,240 [ scc.repo] DEBUG ## Branches found:
2025-05-14 05:34:34,240 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-14 05:34:34,240 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:34,240 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:34,243 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-14 05:34:34,245 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 05:34:34,245 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-14 05:34:34,248 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-14 05:34:34,250 [ scc.git] DEBUG Already up to date.
2025-05-14 05:34:34,250 [ scc.git] DEBUG ## Unique users: []
2025-05-14 05:34:34,250 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:34,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:34,253 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 05:34:34,290 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:34,290 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:34,292 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 05:34:34,328 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 05:34:34,331 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1c98364110> has no local changes
2025-05-14 05:34:34,331 [ 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#420 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/)'
2025-05-14 05:34:34,337 [ scc.git] DEBUG [detached HEAD 786c72b] merge master -Dorg -Ssuccess-only
2025-05-14 05:34:34,337 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:34:34,337 [ scc.repo] DEBUG ## PRs found:
2025-05-14 05:34:34,491 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:34,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-05-14 05:34:35,021 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:35,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-05-14 05:34:35,514 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:35,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-05-14 05:34:35,986 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:36,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-14 05:34:36,523 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:36,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-14 05:34:37,119 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:37,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-14 05:34:37,634 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:37,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-14 05:34:38,164 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:38,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-05-14 05:34:38,350 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-05-14 05:34:38,350 [ scc.repo] DEBUG ## Branches found:
2025-05-14 05:34:38,350 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-14 05:34:38,350 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:38,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:38,352 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-14 05:34:38,355 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 05:34:38,355 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-14 05:34:38,358 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-14 05:34:38,361 [ scc.git] DEBUG Already up to date.
2025-05-14 05:34:38,361 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-05-14 05:34:38,696 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-05-14 05:34:38,696 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-05-14 05:34:38,700 [ scc.git] DEBUG ## Unique users: []
2025-05-14 05:34:38,701 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:38,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:38,703 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-05-14 05:34:38,706 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:38,708 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-05-14 05:34:38,716 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-14 05:34:38,718 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-05-14 05:34:38,718 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-05-14 05:34:38,718 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-05-14 05:34:38,718 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-05-14 05:34:38,718 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-05-14 05:34:38,719 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:38,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:34:38,893 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 05:34:38,930 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:38,930 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:38,932 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 05:34:38,970 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 05:34:38,973 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1c983636d0> has no local changes
2025-05-14 05:34:38,973 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Generated by OMERO-plugins-push#420 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/)'
2025-05-14 05:34:38,980 [ scc.git] DEBUG [detached HEAD 7a39fc3] merge master -Dorg -Ssuccess-only
2025-05-14 05:34:38,980 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:34:38,980 [ scc.git] INFO Overriding base-branch from master to main
2025-05-14 05:34:38,980 [ scc.repo] DEBUG ## PRs found:
2025-05-14 05:34:39,144 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:39,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-05-14 05:34:39,752 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:39,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-05-14 05:34:40,241 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:40,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-05-14 05:34:40,755 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:41,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-05-14 05:34:41,296 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:41,544 [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-05-14 05:34:41,796 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:42,057 [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-05-14 05:34:42,309 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:42,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-05-14 05:34:42,792 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:43,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-05-14 05:34:43,312 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:43,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-05-14 05:34:43,818 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:44,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-14 05:34:44,354 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:44,565 [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-05-14 05:34:44,816 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:45,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-14 05:34:45,326 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:45,523 [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-05-14 05:34:45,524 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-14 05:34:45,524 [ scc.repo] DEBUG ## Branches found:
2025-05-14 05:34:45,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-14 05:34:45,524 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:45,524 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:45,527 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-05-14 05:34:45,529 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 05:34:45,529 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-05-14 05:34:45,532 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-05-14 05:34:45,535 [ scc.git] DEBUG Already up to date.
2025-05-14 05:34:45,535 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-05-14 05:34:45,810 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-05-14 05:34:45,811 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-05-14 05:34:45,814 [ scc.git] DEBUG ## Unique users: []
2025-05-14 05:34:45,814 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:45,815 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:45,817 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-14 05:34:45,820 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:45,822 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-14 05:34:45,830 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-05-14 05:34:45,830 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-05-14 05:34:45,830 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-14 05:34:45,830 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-14 05:34:45,833 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-14 05:34:45,837 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-05-14 05:34:45,839 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:46,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:34:46,045 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-14 05:34:46,048 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-14 05:34:46,051 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#420](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-05-14 05:34:46,053 [ scc.config] DEBUG Found github.token
2025-05-14 05:34:46,053 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-05-14 05:34:46,053 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 05:34:46,090 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:46,090 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:46,092 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 05:34:46,128 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 05:34:46,132 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1c98c47a90> has no local changes
2025-05-14 05:34:46,132 [ 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#420 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/)'
2025-05-14 05:34:46,138 [ scc.git] DEBUG [detached HEAD fbb790b] merge master -Dorg -Ssuccess-only
2025-05-14 05:34:46,138 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:34:46,138 [ scc.repo] DEBUG ## PRs found:
2025-05-14 05:34:46,296 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:46,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-05-14 05:34:46,478 [ scc.repo] DEBUG ## Branches found:
2025-05-14 05:34:46,478 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-14 05:34:46,478 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:46,478 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:46,480 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-14 05:34:46,482 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 05:34:46,483 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-14 05:34:46,485 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-14 05:34:46,488 [ scc.git] DEBUG Already up to date.
2025-05-14 05:34:46,488 [ scc.git] DEBUG ## Unique users: []
2025-05-14 05:34:46,488 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:46,488 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:46,491 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 05:34:46,527 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:46,527 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:46,529 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 05:34:46,565 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 05:34:46,569 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1c9835ded0> has no local changes
2025-05-14 05:34:46,569 [ 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#420 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/)'
2025-05-14 05:34:46,575 [ scc.git] DEBUG [detached HEAD 2cca9a6] merge master -Dorg -Ssuccess-only
2025-05-14 05:34:46,575 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:34:46,575 [ scc.repo] DEBUG ## PRs found:
2025-05-14 05:34:46,729 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:46,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-05-14 05:34:46,916 [ scc.repo] DEBUG ## Branches found:
2025-05-14 05:34:46,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-14 05:34:46,916 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:46,916 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:46,919 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-14 05:34:46,921 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 05:34:46,921 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-14 05:34:46,924 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-14 05:34:46,927 [ scc.git] DEBUG Already up to date.
2025-05-14 05:34:46,927 [ scc.git] DEBUG ## Unique users: []
2025-05-14 05:34:46,927 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:46,927 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:46,929 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 05:34:46,966 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:46,966 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:46,969 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 05:34:47,006 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 05:34:47,009 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1c983ed290> has no local changes
2025-05-14 05:34:47,010 [ 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#420 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/)'
2025-05-14 05:34:47,016 [ scc.git] DEBUG [detached HEAD 565c8c6] merge master -Dorg -Ssuccess-only
2025-05-14 05:34:47,016 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:34:47,016 [ scc.repo] DEBUG ## PRs found:
2025-05-14 05:34:47,167 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:47,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-05-14 05:34:47,697 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:48,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-05-14 05:34:48,308 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:48,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-05-14 05:34:48,761 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:49,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-14 05:34:49,339 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:49,543 [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-05-14 05:34:49,794 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:50,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-14 05:34:50,279 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:50,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-05-14 05:34:50,461 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-05-14 05:34:50,461 [ scc.repo] DEBUG ## Branches found:
2025-05-14 05:34:50,461 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-14 05:34:50,461 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:50,461 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:50,464 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-14 05:34:50,466 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 05:34:50,466 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-14 05:34:50,469 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-14 05:34:50,472 [ scc.git] DEBUG Already up to date.
2025-05-14 05:34:50,472 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-05-14 05:34:50,764 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-05-14 05:34:50,764 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-05-14 05:34:50,768 [ scc.git] DEBUG ## Unique users: []
2025-05-14 05:34:50,768 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:50,768 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:50,771 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-14 05:34:50,773 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:50,776 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-14 05:34:50,784 [ scc.git] DEBUG Auto-merging Dockerfile
2025-05-14 05:34:50,784 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-05-14 05:34:50,785 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-14 05:34:50,785 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-14 05:34:50,788 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-14 05:34:50,793 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-05-14 05:34:50,794 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:50,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:34:50,962 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-14 05:34:50,965 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-14 05:34:50,967 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#420](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-05-14 05:34:50,969 [ scc.config] DEBUG Found github.token
2025-05-14 05:34:50,969 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-05-14 05:34:50,969 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 05:34:51,007 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:34:51,008 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:34:51,010 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 05:34:51,046 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 05:34:51,050 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1c98cd5c10> has no local changes
2025-05-14 05:34:51,050 [ 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#420 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/)'
2025-05-14 05:34:51,056 [ scc.git] DEBUG [detached HEAD ffaa58f] merge master -Dorg -Ssuccess-only
2025-05-14 05:34:51,056 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:34:51,056 [ scc.git] INFO Overriding base-branch from master to develop
2025-05-14 05:34:51,056 [ scc.repo] DEBUG ## PRs found:
2025-05-14 05:34:51,213 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:51,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-05-14 05:34:51,778 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:52,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-05-14 05:34:52,291 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:52,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-05-14 05:34:52,781 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:53,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-14 05:34:53,300 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:53,564 [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-05-14 05:34:53,818 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:54,042 [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-05-14 05:34:54,294 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:54,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-14 05:34:54,782 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:54,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-05-14 05:34:54,980 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-14 05:34:55,231 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:55,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-05-14 05:34:55,716 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:56,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-05-14 05:34:56,371 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:56,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-14 05:34:56,919 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:57,117 [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-05-14 05:34:57,368 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:57,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-14 05:34:57,903 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:58,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-05-14 05:34:58,087 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-14 05:34:58,338 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:58,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-05-14 05:34:58,845 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:59,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-05-14 05:34:59,402 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:34:59,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-05-14 05:34:59,912 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:00,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-05-14 05:35:00,272 [ scc.repo] DEBUG ## Branches found:
2025-05-14 05:35:00,272 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-14 05:35:00,272 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:35:00,272 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:35:00,275 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-05-14 05:35:00,277 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 05:35:00,277 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-05-14 05:35:00,280 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-05-14 05:35:00,288 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-05-14 05:35:00,522 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:01,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-05-14 05:35:01,014 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-05-14 05:35:01,362 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-14 05:35:01,362 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-05-14 05:35:01,367 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-05-14 05:35:01,655 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-14 05:35:01,655 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-05-14 05:35:01,659 [ scc.git] DEBUG ## Unique users: []
2025-05-14 05:35:01,659 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:35:01,659 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:35:01,661 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-14 05:35:01,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:35:01,669 [ 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-05-14 05:35:01,680 [ 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-05-14 05:35:01,680 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-14 05:35:01,680 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-14 05:35:01,683 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-14 05:35:01,687 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-05-14 05:35:01,688 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:01,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:35:01,851 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-14 05:35:01,857 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-14 05:35:01,860 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#420](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-05-14 05:35:01,862 [ scc.config] DEBUG Found github.token
2025-05-14 05:35:01,862 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-05-14 05:35:01,863 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-05-14 05:35:01,867 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:35:01,869 [ 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-05-14 05:35:01,879 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-14 05:35:01,882 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-05-14 05:35:01,882 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-05-14 05:35:02,102 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:02,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:35:02,278 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 05:35:02,317 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 05:35:02,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 05:35:02,320 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 05:35:02,357 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 05:35:02,361 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1c9aa51390> has no local changes
2025-05-14 05:35:02,361 [ 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..950b28b
Previously merged:
- 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#420 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/)'
2025-05-14 05:35:02,368 [ scc.git] DEBUG [detached HEAD cf37bb9] merge master -Dorg -Ssuccess-only
2025-05-14 05:35:02,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:35:02,368 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 05:35:02,441 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-05-14 05:35:02,529 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:02,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:35:02,723 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-05-14 05:35:02,725 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-05-14 05:35:02,970 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:03,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:35:03,158 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-05-14 05:35:03,159 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-05-14 05:35:03,403 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:03,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:35:03,595 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-05-14 05:35:03,597 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-05-14 05:35:03,841 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:04,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:35:04,026 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-05-14 05:35:04,270 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:04,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:35:04,455 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-05-14 05:35:04,457 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-05-14 05:35:04,702 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:04,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:35:04,871 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-05-14 05:35:04,873 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-05-14 05:35:05,118 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:05,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:35:05,290 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-05-14 05:35:05,292 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-05-14 05:35:05,537 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:05,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:35:05,757 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-05-14 05:35:05,759 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-05-14 05:35:06,004 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:06,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:35:06,175 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-05-14 05:35:06,177 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-05-14 05:35:06,422 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:06,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:35:06,611 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-05-14 05:35:06,613 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-05-14 05:35:06,858 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:07,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:35:07,037 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-05-14 05:35:07,039 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-05-14 05:35:07,284 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:07,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:35:07,471 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-05-14 05:35:07,473 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-05-14 05:35:07,718 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:07,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:35:07,904 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-05-14 05:35:08,148 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:08,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:35:08,475 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-05-14 05:35:08,720 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:08,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:35:08,913 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-05-14 05:35:08,915 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-05-14 05:35:09,159 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:09,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:35:09,357 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-05-14 05:35:09,601 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:09,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:35:09,764 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-05-14 05:35:10,009 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:10,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:35:10,170 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-05-14 05:35:10,172 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-05-14 05:35:10,416 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:10,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:35:10,692 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-05-14 05:35:10,694 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-05-14 05:35:10,938 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:11,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:35:11,118 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-05-14 05:35:11,120 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-05-14 05:35:11,364 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:11,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:35:11,548 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-05-14 05:35:11,550 [ scc.config] DEBUG Found submodule.scripts.url
2025-05-14 05:35:11,795 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 05:35:11,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 05:35:11,955 [ scc.config] DEBUG Found submodule.scripts.branch
2025-05-14 05:35:11,955 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 05:35:12,047 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1c98d2bed0> has local changes
2025-05-14 05:35:12,048 [ 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 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (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..5b2ca82
Previously merged:
- 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 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 167 dominikl 'Add extinfo command'
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)
Already up to date.
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'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
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
Already up to date.
Merged PRs:
- 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..950b28b
Previously merged:
- 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#420 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/420/)'
2025-05-14 05:35:12,062 [ scc.git] DEBUG [detached HEAD 84a7d8d] merge master -Dorg -Ssuccess-only
2025-05-14 05:35:12,062 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-05-14 05:35:12,062 [ scc.merge] INFO Repository: ome/omero-plugins
2025-05-14 05:35:12,062 [ scc.merge] INFO Already up to date.
2025-05-14 05:35:12,062 [ scc.merge] INFO
2025-05-14 05:35:12,062 [ scc.merge] INFO Merged PRs:
2025-05-14 05:35:12,062 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-05-14 05:35:12,062 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-05-14 05:35:12,062 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-05-14 05:35:12,062 [ scc.merge] INFO
2025-05-14 05:35:12,062 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-05-14 05:35:12,062 [ scc.merge] INFO Already up to date.
2025-05-14 05:35:12,062 [ scc.merge] INFO
2025-05-14 05:35:12,062 [ scc.merge] INFO
2025-05-14 05:35:12,062 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-05-14 05:35:12,062 [ scc.merge] INFO Excluded PRs:
2025-05-14 05:35:12,062 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-05-14 05:35:12,062 [ scc.merge] INFO Already up to date.
2025-05-14 05:35:12,062 [ scc.merge] INFO
2025-05-14 05:35:12,063 [ scc.merge] INFO
2025-05-14 05:35:12,063 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-05-14 05:35:12,063 [ scc.merge] INFO Excluded PRs:
2025-05-14 05:35:12,063 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-05-14 05:35:12,063 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-05-14 05:35:12,063 [ scc.merge] INFO Already up to date.
2025-05-14 05:35:12,063 [ scc.merge] INFO
2025-05-14 05:35:12,063 [ scc.merge] INFO Merged PRs:
2025-05-14 05:35:12,063 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-05-14 05:35:12,063 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-05-14 05:35:12,063 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-05-14 05:35:12,063 [ scc.merge] INFO
2025-05-14 05:35:12,063 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-05-14 05:35:12,063 [ scc.merge] INFO Excluded PRs:
2025-05-14 05:35:12,063 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-05-14 05:35:12,063 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-05-14 05:35:12,063 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-05-14 05:35:12,063 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-14 05:35:12,063 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-05-14 05:35:12,063 [ scc.merge] INFO Updating 11d3587..5b2ca82
2025-05-14 05:35:12,063 [ scc.merge] INFO Previously merged:
2025-05-14 05:35:12,063 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-05-14 05:35:12,063 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-14 05:35:12,063 [ scc.merge] INFO
2025-05-14 05:35:12,063 [ scc.merge] INFO Merged PRs:
2025-05-14 05:35:12,063 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-05-14 05:35:12,063 [ scc.merge] INFO
2025-05-14 05:35:12,063 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-14 05:35:12,063 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-05-14 05:35:12,063 [ scc.merge] INFO
2025-05-14 05:35:12,063 [ scc.merge] INFO Repository: ome/omero-figure
2025-05-14 05:35:12,063 [ scc.merge] INFO Excluded PRs:
2025-05-14 05:35:12,063 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-05-14 05:35:12,063 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-05-14 05:35:12,063 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-05-14 05:35:12,063 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-05-14 05:35:12,063 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-05-14 05:35:12,063 [ scc.merge] INFO Previously merged:
2025-05-14 05:35:12,063 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-05-14 05:35:12,063 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-05-14 05:35:12,064 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-05-14 05:35:12,064 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-14 05:35:12,064 [ scc.merge] INFO
2025-05-14 05:35:12,064 [ scc.merge] INFO Merged PRs:
2025-05-14 05:35:12,064 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-05-14 05:35:12,064 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-05-14 05:35:12,064 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-05-14 05:35:12,064 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-05-14 05:35:12,064 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-05-14 05:35:12,064 [ scc.merge] INFO
2025-05-14 05:35:12,064 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-14 05:35:12,064 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-05-14 05:35:12,064 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-05-14 05:35:12,064 [ scc.merge] INFO
2025-05-14 05:35:12,064 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-05-14 05:35:12,064 [ scc.merge] INFO Already up to date.
2025-05-14 05:35:12,064 [ scc.merge] INFO
2025-05-14 05:35:12,064 [ scc.merge] INFO Merged PRs:
2025-05-14 05:35:12,064 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-05-14 05:35:12,064 [ scc.merge] INFO
2025-05-14 05:35:12,064 [ scc.merge] INFO Repository: ome/omero-gallery
2025-05-14 05:35:12,064 [ scc.merge] INFO Already up to date.
2025-05-14 05:35:12,064 [ scc.merge] INFO
2025-05-14 05:35:12,064 [ scc.merge] INFO Merged PRs:
2025-05-14 05:35:12,064 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-05-14 05:35:12,064 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-05-14 05:35:12,064 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-05-14 05:35:12,064 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-05-14 05:35:12,064 [ scc.merge] INFO
2025-05-14 05:35:12,064 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-14 05:35:12,064 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-05-14 05:35:12,064 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-05-14 05:35:12,064 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-05-14 05:35:12,064 [ scc.merge] INFO
2025-05-14 05:35:12,064 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-05-14 05:35:12,064 [ scc.merge] INFO Excluded PRs:
2025-05-14 05:35:12,064 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-05-14 05:35:12,064 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-05-14 05:35:12,064 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-05-14 05:35:12,065 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-05-14 05:35:12,065 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-05-14 05:35:12,065 [ scc.merge] INFO Already up to date.
2025-05-14 05:35:12,065 [ scc.merge] INFO
2025-05-14 05:35:12,065 [ scc.merge] INFO Merged PRs:
2025-05-14 05:35:12,065 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-05-14 05:35:12,065 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-05-14 05:35:12,065 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-05-14 05:35:12,065 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-05-14 05:35:12,065 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-14 05:35:12,065 [ scc.merge] INFO
2025-05-14 05:35:12,065 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-14 05:35:12,065 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-05-14 05:35:12,065 [ scc.merge] INFO
2025-05-14 05:35:12,065 [ scc.merge] INFO Repository: ome/omero-mapr
2025-05-14 05:35:12,065 [ scc.merge] INFO Excluded PRs:
2025-05-14 05:35:12,065 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-05-14 05:35:12,065 [ scc.merge] INFO Already up to date.
2025-05-14 05:35:12,065 [ scc.merge] INFO
2025-05-14 05:35:12,065 [ scc.merge] INFO Merged PRs:
2025-05-14 05:35:12,065 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-05-14 05:35:12,065 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-14 05:35:12,065 [ scc.merge] INFO
2025-05-14 05:35:12,065 [ scc.merge] INFO Repository: ome/omero-metadata
2025-05-14 05:35:12,065 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-05-14 05:35:12,065 [ scc.merge] INFO Previously merged:
2025-05-14 05:35:12,065 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-14 05:35:12,065 [ scc.merge] INFO
2025-05-14 05:35:12,065 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-14 05:35:12,065 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-14 05:35:12,065 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-14 05:35:12,065 [ scc.merge] INFO
2025-05-14 05:35:12,065 [ scc.merge] INFO Repository: ome/omero-parade
2025-05-14 05:35:12,065 [ scc.merge] INFO Excluded PRs:
2025-05-14 05:35:12,065 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-05-14 05:35:12,065 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-05-14 05:35:12,065 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-05-14 05:35:12,065 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-05-14 05:35:12,065 [ scc.merge] INFO Already up to date.
2025-05-14 05:35:12,066 [ scc.merge] INFO
2025-05-14 05:35:12,066 [ scc.merge] INFO Merged PRs:
2025-05-14 05:35:12,066 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-14 05:35:12,066 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-14 05:35:12,066 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-14 05:35:12,066 [ scc.merge] INFO
2025-05-14 05:35:12,066 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-05-14 05:35:12,066 [ scc.merge] INFO Already up to date.
2025-05-14 05:35:12,066 [ scc.merge] INFO
2025-05-14 05:35:12,066 [ scc.merge] INFO
2025-05-14 05:35:12,066 [ scc.merge] INFO Repository: ome/omero-rois
2025-05-14 05:35:12,066 [ scc.merge] INFO Excluded PRs:
2025-05-14 05:35:12,066 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-05-14 05:35:12,066 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-14 05:35:12,066 [ scc.merge] INFO Already up to date.
2025-05-14 05:35:12,066 [ scc.merge] INFO
2025-05-14 05:35:12,066 [ scc.merge] INFO
2025-05-14 05:35:12,066 [ scc.merge] INFO Repository: ome/omero-signup
2025-05-14 05:35:12,066 [ scc.merge] INFO Already up to date.
2025-05-14 05:35:12,066 [ scc.merge] INFO
2025-05-14 05:35:12,066 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-14 05:35:12,066 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-14 05:35:12,066 [ scc.merge] INFO
2025-05-14 05:35:12,066 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-05-14 05:35:12,066 [ scc.merge] INFO Excluded PRs:
2025-05-14 05:35:12,066 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-05-14 05:35:12,066 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-05-14 05:35:12,066 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-05-14 05:35:12,066 [ scc.merge] INFO Already up to date.
2025-05-14 05:35:12,066 [ scc.merge] INFO
2025-05-14 05:35:12,066 [ scc.merge] INFO Merged PRs:
2025-05-14 05:35:12,066 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-14 05:35:12,066 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-05-14 05:35:12,066 [ scc.merge] INFO
2025-05-14 05:35:12,066 [ scc.merge] INFO Repository: ome/omero-upload
2025-05-14 05:35:12,066 [ scc.merge] INFO Already up to date.
2025-05-14 05:35:12,066 [ scc.merge] INFO
2025-05-14 05:35:12,066 [ scc.merge] INFO
2025-05-14 05:35:12,066 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-05-14 05:35:12,066 [ scc.merge] INFO Already up to date.
2025-05-14 05:35:12,067 [ scc.merge] INFO
2025-05-14 05:35:12,067 [ scc.merge] INFO Merged PRs:
2025-05-14 05:35:12,067 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-05-14 05:35:12,067 [ scc.merge] INFO
2025-05-14 05:35:12,067 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-05-14 05:35:12,067 [ scc.merge] INFO Excluded PRs:
2025-05-14 05:35:12,067 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-05-14 05:35:12,067 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-05-14 05:35:12,067 [ scc.merge] INFO Already up to date.
2025-05-14 05:35:12,067 [ scc.merge] INFO
2025-05-14 05:35:12,067 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-14 05:35:12,067 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-14 05:35:12,067 [ scc.merge] INFO
2025-05-14 05:35:12,067 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-05-14 05:35:12,067 [ scc.merge] INFO Already up to date.
2025-05-14 05:35:12,067 [ scc.merge] INFO
2025-05-14 05:35:12,067 [ scc.merge] INFO
2025-05-14 05:35:12,067 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-05-14 05:35:12,067 [ scc.merge] INFO Already up to date.
2025-05-14 05:35:12,067 [ scc.merge] INFO
2025-05-14 05:35:12,067 [ scc.merge] INFO
2025-05-14 05:35:12,067 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-05-14 05:35:12,067 [ scc.merge] INFO Already up to date.
2025-05-14 05:35:12,067 [ scc.merge] INFO
2025-05-14 05:35:12,067 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-14 05:35:12,067 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-05-14 05:35:12,067 [ scc.merge] INFO
2025-05-14 05:35:12,067 [ scc.merge] INFO Repository: ome/scripts
2025-05-14 05:35:12,067 [ scc.merge] INFO Excluded PRs:
2025-05-14 05:35:12,067 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-05-14 05:35:12,067 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-05-14 05:35:12,067 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-05-14 05:35:12,067 [ scc.merge] INFO Previously merged:
2025-05-14 05:35:12,067 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-05-14 05:35:12,067 [ scc.merge] INFO
2025-05-14 05:35:12,067 [ scc.merge] INFO Merged PRs:
2025-05-14 05:35:12,067 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-14 05:35:12,067 [ scc.merge] INFO
2025-05-14 05:35:12,067 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-14 05:35:12,067 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-14 05:35:12,067 [ scc.merge] INFO
2025-05-14 05:35:12,068 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-05-14 05:35:12,068 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 05:35:12,070 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-05-14 05:35:12,070 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 05:35:12,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:35:12,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-05-14 05:35:12,072 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 05:35:12,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:35:12,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-05-14 05:35:12,074 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 05:35:12,076 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:35:12,077 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-05-14 05:35:12,077 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 05:35:12,079 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:35:12,079 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-05-14 05:35:12,079 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 05:35:12,081 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:35:12,081 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-05-14 05:35:12,081 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 05:35:12,083 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:35:12,083 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-05-14 05:35:12,083 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 05:35:12,085 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:35:12,085 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-05-14 05:35:12,085 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 05:35:12,087 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:35:12,088 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-14 05:35:12,088 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 05:35:12,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:35:12,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-14 05:35:12,090 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 05:35:12,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:35:12,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-14 05:35:12,092 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 05:35:12,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:35:12,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-14 05:35:12,094 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 05:35:12,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:35:12,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-14 05:35:12,096 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 05:35:12,098 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:35:12,098 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-14 05:35:12,098 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 05:35:12,100 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:35:12,101 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-14 05:35:12,101 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 05:35:12,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:35:12,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-14 05:35:12,103 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 05:35:12,105 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:35:12,105 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-14 05:35:12,105 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 05:35:12,107 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:35:12,107 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-14 05:35:12,107 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 05:35:12,109 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:35:12,109 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-14 05:35:12,109 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 05:35:12,111 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:35:12,111 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-14 05:35:12,111 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 05:35:12,113 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:35:12,114 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-14 05:35:12,114 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 05:35:12,116 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 05:35:12,116 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-14 05:35:12,116 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 05:35:12,118 [ 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.3-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 85006bd] 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 998cfe4] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-05-14 05:36:01,060 [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-05-14 05:36:11,044 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2025-05-14 05:36:13,834 [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-05-14 05:36:18,736 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-05-14 05:37:00,392 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/9161e9ff/images/svgs/logo.svg){kind=logo}
