Console Output
Skipping 204 KB..
Full Logling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 506 (Use the release/v1 branch for the PyPA action publishing to PyPI) 7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-05-14 00:52:17,122 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-14 00:52:17,125 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-14 00:52:17,125 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-14 00:52:17,341 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:17,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:52:17,502 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 00:52:17,541 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:52:17,541 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:17,543 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 00:52:17,580 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 00:52:17,585 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f19392c5690> has no local changes
2025-05-14 00:52:17,585 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
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#419 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/)'
2025-05-14 00:52:17,592 [ scc.git] DEBUG [detached HEAD 00fb12b] merge master -Dorg -Ssuccess-only
2025-05-14 00:52:17,592 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:52:17,592 [ scc.repo] DEBUG ## PRs found:
2025-05-14 00:52:17,753 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:18,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-05-14 00:52:18,263 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:18,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-05-14 00:52:18,732 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:18,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-14 00:52:19,248 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:19,465 [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 00:52:19,717 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:19,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-14 00:52:20,238 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:20,429 [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 00:52:20,429 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-14 00:52:20,680 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:20,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-05-14 00:52:21,217 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:21,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-05-14 00:52:21,807 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:22,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-14 00:52:22,329 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:22,536 [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 00:52:22,787 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:23,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-14 00:52:23,302 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:23,489 [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 00:52:23,489 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-05-14 00:52:23,490 [ scc.repo] DEBUG ## Branches found:
2025-05-14 00:52:23,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-14 00:52:23,490 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:52:23,490 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:23,493 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-14 00:52:23,495 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 00:52:23,495 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-14 00:52:23,498 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-14 00:52:23,501 [ scc.git] DEBUG Already up to date.
2025-05-14 00:52:23,501 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-05-14 00:52:24,417 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-14 00:52:24,418 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-05-14 00:52:24,422 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-05-14 00:52:24,759 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-14 00:52:24,759 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-05-14 00:52:24,763 [ scc.git] DEBUG ## Unique users: []
2025-05-14 00:52:24,764 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:52:24,764 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:24,766 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-14 00:52:24,770 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:24,772 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-14 00:52:24,800 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-14 00:52:24,803 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-05-14 00:52:24,803 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-05-14 00:52:24,804 [ scc.git] DEBUG requirements.txt | 2 +-
2025-05-14 00:52:24,804 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-05-14 00:52:24,804 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-05-14 00:52:24,804 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-05-14 00:52:24,805 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:24,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:52:24,969 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-05-14 00:52:24,973 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:24,976 [ 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 00:52:24,985 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-14 00:52:24,987 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-14 00:52:24,987 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-14 00:52:25,220 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:25,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:52:25,382 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 00:52:25,420 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:52:25,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:25,422 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 00:52:25,460 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 00:52:25,464 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1939246dd0> has no local changes
2025-05-14 00:52:25,464 [ 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#419 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/)'
2025-05-14 00:52:25,471 [ scc.git] DEBUG [detached HEAD 5279de2] merge master -Dorg -Ssuccess-only
2025-05-14 00:52:25,471 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:52:25,471 [ scc.repo] DEBUG ## PRs found:
2025-05-14 00:52:25,633 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:25,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-05-14 00:52:26,137 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:26,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-05-14 00:52:26,639 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:26,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-05-14 00:52:27,201 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:27,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-14 00:52:27,736 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:27,956 [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 00:52:28,207 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:28,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-14 00:52:28,738 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:28,921 [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 00:52:28,922 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-14 00:52:29,172 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:29,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-05-14 00:52:29,658 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:29,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-05-14 00:52:30,140 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:30,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-14 00:52:30,735 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:30,950 [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 00:52:31,202 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:31,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-14 00:52:31,742 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:31,915 [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 00:52:31,916 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-14 00:52:31,916 [ scc.repo] DEBUG ## Branches found:
2025-05-14 00:52:31,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-14 00:52:31,916 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:52:31,916 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:31,918 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-14 00:52:31,921 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 00:52:31,921 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-14 00:52:31,924 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-14 00:52:31,931 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-05-14 00:52:32,167 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:32,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-05-14 00:52:32,587 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-05-14 00:52:33,434 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-14 00:52:33,434 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-05-14 00:52:33,439 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-05-14 00:52:33,962 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-14 00:52:33,963 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-05-14 00:52:33,967 [ scc.git] DEBUG ## Unique users: []
2025-05-14 00:52:33,967 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:52:33,967 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:33,970 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-14 00:52:33,974 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:33,976 [ 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 00:52:34,226 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-05-14 00:52:34,226 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-05-14 00:52:34,226 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-14 00:52:34,226 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-14 00:52:34,226 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-14 00:52:34,226 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-14 00:52:34,229 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-14 00:52:34,234 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-14 00:52:34,235 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:34,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:52:34,418 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-14 00:52:34,422 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-14 00:52:34,425 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#419](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-05-14 00:52:34,427 [ scc.config] DEBUG Found github.token
2025-05-14 00:52:34,428 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-05-14 00:52:34,428 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-14 00:52:34,432 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:34,434 [ 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 00:52:34,595 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-14 00:52:34,595 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-14 00:52:34,595 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-05-14 00:52:34,595 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-14 00:52:34,596 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-14 00:52:34,599 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-14 00:52:34,604 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-14 00:52:34,669 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:34,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:52:34,828 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-14 00:52:34,832 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-14 00:52:34,835 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#419](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/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 00:52:34,837 [ scc.config] DEBUG Found github.token
2025-05-14 00:52:34,837 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-05-14 00:52:34,837 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 00:52:34,876 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:52:34,876 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:34,878 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 00:52:34,915 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 00:52:34,919 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1939ed90d0> has no local changes
2025-05-14 00:52:34,920 [ 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#419 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/)'
2025-05-14 00:52:34,927 [ scc.git] DEBUG [detached HEAD 36a84f2] merge master -Dorg -Ssuccess-only
2025-05-14 00:52:34,927 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:52:34,927 [ scc.repo] DEBUG ## PRs found:
2025-05-14 00:52:35,079 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:35,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-05-14 00:52:35,667 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:35,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-05-14 00:52:36,143 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:36,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-14 00:52:36,690 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:36,950 [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 00:52:37,201 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:37,449 [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 00:52:37,700 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:37,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-14 00:52:38,177 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:38,352 [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 00:52:38,352 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-14 00:52:38,603 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:38,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-05-14 00:52:38,825 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-14 00:52:39,076 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:39,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-14 00:52:39,641 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:39,931 [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 00:52:40,182 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:40,460 [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 00:52:40,711 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:41,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-14 00:52:41,259 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:41,433 [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 00:52:41,433 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-14 00:52:41,684 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:41,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-05-14 00:52:41,932 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-14 00:52:42,183 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:42,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-14 00:52:42,722 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:42,964 [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 00:52:43,215 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:43,484 [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 00:52:43,736 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:43,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-14 00:52:44,187 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:44,365 [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 00:52:44,365 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-14 00:52:44,616 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:44,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-05-14 00:52:45,133 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:45,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-05-14 00:52:45,635 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:45,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-05-14 00:52:46,123 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:46,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-05-14 00:52:46,607 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:46,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-05-14 00:52:47,109 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:47,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-05-14 00:52:47,572 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:47,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-05-14 00:52:47,855 [ scc.repo] DEBUG ## Branches found:
2025-05-14 00:52:47,855 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-14 00:52:47,855 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:52:47,855 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:47,858 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-14 00:52:47,860 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 00:52:47,860 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-14 00:52:47,863 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-14 00:52:47,866 [ scc.git] DEBUG Already up to date.
2025-05-14 00:52:47,866 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-05-14 00:52:48,192 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-14 00:52:48,192 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-05-14 00:52:48,196 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-05-14 00:52:48,496 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-14 00:52:48,496 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-05-14 00:52:48,500 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-05-14 00:52:48,799 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-14 00:52:48,799 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-05-14 00:52:48,803 [ scc.git] DEBUG ## Unique users: []
2025-05-14 00:52:48,803 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:52:48,803 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:48,806 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-05-14 00:52:48,870 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:48,872 [ 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 00:52:48,939 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-14 00:52:48,942 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-05-14 00:52:48,942 [ scc.git] DEBUG package.json | 2 +-
2025-05-14 00:52:48,942 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-05-14 00:52:48,943 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:49,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:52:49,133 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-05-14 00:52:49,189 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:49,191 [ 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 00:52:49,324 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-14 00:52:49,324 [ scc.git] DEBUG Auto-merging package.json
2025-05-14 00:52:49,325 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-14 00:52:49,329 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-05-14 00:52:49,329 [ scc.git] DEBUG package.json | 2 +-
2025-05-14 00:52:49,329 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-05-14 00:52:49,384 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:49,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:52:49,550 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-05-14 00:52:49,553 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:49,555 [ 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 00:52:49,564 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-14 00:52:49,567 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-14 00:52:49,567 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-14 00:52:49,801 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:49,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:52:49,977 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 00:52:50,014 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:52:50,014 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:50,016 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 00:52:50,054 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 00:52:50,058 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f193814a310> has no local changes
2025-05-14 00:52:50,058 [ 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#419 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/)'
2025-05-14 00:52:50,064 [ scc.git] DEBUG [detached HEAD 95c7c88] merge master -Dorg -Ssuccess-only
2025-05-14 00:52:50,064 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:52:50,065 [ scc.repo] DEBUG ## PRs found:
2025-05-14 00:52:50,228 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:50,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-05-14 00:52:50,429 [ scc.repo] DEBUG ## Branches found:
2025-05-14 00:52:50,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-14 00:52:50,430 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:52:50,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:50,432 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-14 00:52:50,434 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 00:52:50,434 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-14 00:52:50,437 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-14 00:52:50,440 [ scc.git] DEBUG Already up to date.
2025-05-14 00:52:50,440 [ scc.git] DEBUG ## Unique users: []
2025-05-14 00:52:50,440 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:52:50,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:50,442 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 00:52:50,479 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:52:50,479 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:50,481 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 00:52:50,517 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 00:52:50,520 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1939310d90> has no local changes
2025-05-14 00:52:50,520 [ 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#419 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/)'
2025-05-14 00:52:50,527 [ scc.git] DEBUG [detached HEAD 7865616] merge master -Dorg -Ssuccess-only
2025-05-14 00:52:50,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:52:50,527 [ scc.repo] DEBUG ## PRs found:
2025-05-14 00:52:50,681 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:50,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-05-14 00:52:51,212 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:51,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-05-14 00:52:51,713 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:51,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-05-14 00:52:52,202 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:52,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-05-14 00:52:52,435 [ scc.repo] DEBUG ## Branches found:
2025-05-14 00:52:52,435 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-14 00:52:52,435 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:52:52,435 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:52,437 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-14 00:52:52,440 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 00:52:52,440 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-14 00:52:52,443 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-14 00:52:52,445 [ scc.git] DEBUG Already up to date.
2025-05-14 00:52:52,446 [ scc.git] DEBUG ## Unique users: []
2025-05-14 00:52:52,446 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:52:52,446 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:52,448 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 00:52:52,485 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:52:52,485 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:52,487 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 00:52:52,524 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 00:52:52,527 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1939500d90> has no local changes
2025-05-14 00:52:52,527 [ 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#419 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/)'
2025-05-14 00:52:52,533 [ scc.git] DEBUG [detached HEAD c85e33a] merge master -Dorg -Ssuccess-only
2025-05-14 00:52:52,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:52:52,533 [ scc.repo] DEBUG ## PRs found:
2025-05-14 00:52:52,685 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:52,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-05-14 00:52:53,201 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:53,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-05-14 00:52:53,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:53,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-05-14 00:52:54,119 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:54,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-14 00:52:54,679 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:54,894 [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 00:52:55,145 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:55,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-14 00:52:55,631 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:55,868 [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 00:52:55,868 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-14 00:52:55,868 [ scc.repo] DEBUG ## Branches found:
2025-05-14 00:52:55,868 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-14 00:52:55,869 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:52:55,869 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:55,871 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-14 00:52:55,873 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 00:52:55,873 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-14 00:52:55,876 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-14 00:52:55,879 [ scc.git] DEBUG Already up to date.
2025-05-14 00:52:55,879 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-05-14 00:52:56,374 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-05-14 00:52:56,375 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-05-14 00:52:56,379 [ scc.git] DEBUG ## Unique users: []
2025-05-14 00:52:56,379 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:52:56,379 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:56,381 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-14 00:52:56,384 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:56,387 [ 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 00:52:56,598 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-05-14 00:52:56,598 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-05-14 00:52:56,598 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-05-14 00:52:56,598 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-05-14 00:52:56,598 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-05-14 00:52:56,598 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-05-14 00:52:56,598 [ scc.git] DEBUG Auto-merging setup.py
2025-05-14 00:52:56,598 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-05-14 00:52:56,598 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-14 00:52:56,598 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-14 00:52:56,601 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-14 00:52:56,605 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-05-14 00:52:56,607 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:56,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:52:56,773 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-14 00:52:56,776 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-14 00:52:56,779 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#419](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- setup.py
- omero_signup/urls.py
- omero_signup/views.py
--conflicts
2025-05-14 00:52:56,781 [ scc.config] DEBUG Found github.token
2025-05-14 00:52:56,781 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-05-14 00:52:56,781 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 00:52:56,819 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:52:56,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:52:56,821 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 00:52:56,859 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 00:52:56,863 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f193816df10> has no local changes
2025-05-14 00:52:56,863 [ 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#419 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/)'
2025-05-14 00:52:56,869 [ scc.git] DEBUG [detached HEAD cfb0061] merge master -Dorg -Ssuccess-only
2025-05-14 00:52:56,869 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:52:56,869 [ scc.repo] DEBUG ## PRs found:
2025-05-14 00:52:57,024 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:57,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-05-14 00:52:57,597 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:57,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-05-14 00:52:58,063 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:58,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-14 00:52:58,600 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:58,841 [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 00:52:59,093 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:59,357 [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 00:52:59,609 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:52:59,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-14 00:53:00,070 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:00,270 [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 00:53:00,270 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-05-14 00:53:00,521 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:00,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-05-14 00:53:01,030 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:01,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-05-14 00:53:01,494 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:01,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-05-14 00:53:01,998 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:02,244 [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 00:53:02,495 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:02,731 [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 00:53:02,982 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:03,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-05-14 00:53:03,481 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:03,691 [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 00:53:03,942 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:04,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-05-14 00:53:04,417 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:04,625 [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 00:53:04,877 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:05,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-14 00:53:05,398 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:05,611 [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 00:53:05,863 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:06,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-14 00:53:06,319 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:06,498 [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 00:53:06,498 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-14 00:53:06,498 [ scc.repo] DEBUG ## Branches found:
2025-05-14 00:53:06,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-14 00:53:06,498 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:53:06,498 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:06,501 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-14 00:53:06,503 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 00:53:06,504 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-14 00:53:06,506 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-14 00:53:06,509 [ scc.git] DEBUG Already up to date.
2025-05-14 00:53:06,509 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-05-14 00:53:06,885 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-14 00:53:06,885 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-05-14 00:53:06,889 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-05-14 00:53:07,168 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-14 00:53:07,168 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-05-14 00:53:07,173 [ scc.git] DEBUG ## Unique users: []
2025-05-14 00:53:07,173 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:53:07,173 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:07,175 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-05-14 00:53:07,179 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:07,182 [ 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 00:53:07,225 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-14 00:53:07,229 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-05-14 00:53:07,229 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-05-14 00:53:07,229 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-05-14 00:53:07,229 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-05-14 00:53:07,229 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-05-14 00:53:07,229 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-05-14 00:53:07,229 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-05-14 00:53:07,229 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-05-14 00:53:07,230 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:07,230 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-05-14 00:53:07,230 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-05-14 00:53:07,230 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-05-14 00:53:07,230 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-05-14 00:53:07,230 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-05-14 00:53:07,230 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-05-14 00:53:07,230 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-05-14 00:53:07,230 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-05-14 00:53:07,230 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-05-14 00:53:07,230 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-05-14 00:53:07,231 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-05-14 00:53:07,231 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-05-14 00:53:07,231 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-05-14 00:53:07,231 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-05-14 00:53:07,231 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-05-14 00:53:07,231 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-05-14 00:53:07,231 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-05-14 00:53:07,231 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-05-14 00:53:07,231 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-05-14 00:53:07,231 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-05-14 00:53:07,231 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-05-14 00:53:07,231 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-05-14 00:53:07,231 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-05-14 00:53:07,231 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-05-14 00:53:07,231 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-05-14 00:53:07,231 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-05-14 00:53:07,231 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-05-14 00:53:07,231 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-05-14 00:53:07,231 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-05-14 00:53:07,231 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-05-14 00:53:07,231 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-05-14 00:53:07,231 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-05-14 00:53:07,231 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-05-14 00:53:07,231 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-05-14 00:53:07,231 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-05-14 00:53:07,231 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-05-14 00:53:07,231 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-05-14 00:53:07,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:07,401 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-14 00:53:07,405 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:07,407 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-14 00:53:07,417 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-14 00:53:07,420 [ scc.git] DEBUG docker | 1 +
2025-05-14 00:53:07,420 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-05-14 00:53:07,652 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:07,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:07,814 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 00:53:07,851 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:53:07,851 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:07,853 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 00:53:07,889 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 00:53:07,894 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f19392e7c10> has no local changes
2025-05-14 00:53:07,894 [ 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#419 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/)'
2025-05-14 00:53:07,901 [ scc.git] DEBUG [detached HEAD d763d18] merge master -Dorg -Ssuccess-only
2025-05-14 00:53:07,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:07,901 [ scc.repo] DEBUG ## PRs found:
2025-05-14 00:53:08,065 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:08,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-05-14 00:53:08,267 [ scc.repo] DEBUG ## Branches found:
2025-05-14 00:53:08,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-14 00:53:08,267 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:53:08,267 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:08,269 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-14 00:53:08,272 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 00:53:08,272 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-14 00:53:08,275 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-14 00:53:08,277 [ scc.git] DEBUG Already up to date.
2025-05-14 00:53:08,277 [ scc.git] DEBUG ## Unique users: []
2025-05-14 00:53:08,278 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:53:08,278 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:08,280 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 00:53:08,317 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:53:08,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:08,319 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 00:53:08,355 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 00:53:08,359 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f193817e7d0> has no local changes
2025-05-14 00:53:08,359 [ 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#419 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/)'
2025-05-14 00:53:08,365 [ scc.git] DEBUG [detached HEAD 04baa05] merge master -Dorg -Ssuccess-only
2025-05-14 00:53:08,365 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:08,365 [ scc.repo] DEBUG ## PRs found:
2025-05-14 00:53:08,518 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:08,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-05-14 00:53:09,058 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:09,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-05-14 00:53:09,555 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:09,837 [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 00:53:10,088 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:10,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-14 00:53:10,613 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:10,894 [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 00:53:11,146 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:11,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 00:53:11,635 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:11,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-14 00:53:12,180 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:12,350 [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 00:53:12,351 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-05-14 00:53:12,351 [ scc.repo] DEBUG ## Branches found:
2025-05-14 00:53:12,351 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-14 00:53:12,351 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:53:12,351 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:12,354 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-14 00:53:12,356 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 00:53:12,356 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-14 00:53:12,359 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-14 00:53:12,362 [ scc.git] DEBUG Already up to date.
2025-05-14 00:53:12,362 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-05-14 00:53:13,113 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-05-14 00:53:13,113 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-05-14 00:53:13,117 [ scc.git] DEBUG ## Unique users: []
2025-05-14 00:53:13,117 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:53:13,117 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:13,120 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-05-14 00:53:13,123 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:13,125 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-05-14 00:53:13,132 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-14 00:53:13,135 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-05-14 00:53:13,135 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-05-14 00:53:13,135 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-05-14 00:53:13,135 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-05-14 00:53:13,135 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-05-14 00:53:13,136 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:13,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:13,295 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 00:53:13,332 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:53:13,332 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:13,334 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 00:53:13,372 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 00:53:13,376 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1938160b50> has no local changes
2025-05-14 00:53:13,376 [ 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#419 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/)'
2025-05-14 00:53:13,382 [ scc.git] DEBUG [detached HEAD c8b78d4] merge master -Dorg -Ssuccess-only
2025-05-14 00:53:13,382 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:13,382 [ scc.git] INFO Overriding base-branch from master to main
2025-05-14 00:53:13,383 [ scc.repo] DEBUG ## PRs found:
2025-05-14 00:53:13,546 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:13,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-05-14 00:53:14,083 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:14,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-05-14 00:53:14,558 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:14,816 [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 00:53:15,067 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:15,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-05-14 00:53:15,601 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:15,858 [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 00:53:16,110 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:16,333 [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 00:53:16,584 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:16,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-05-14 00:53:17,054 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:17,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-05-14 00:53:17,553 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:17,756 [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 00:53:18,007 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:18,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-14 00:53:18,533 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:18,747 [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 00:53:18,999 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:19,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-14 00:53:19,535 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:19,713 [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 00:53:19,713 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-14 00:53:19,713 [ scc.repo] DEBUG ## Branches found:
2025-05-14 00:53:19,713 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-14 00:53:19,713 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:53:19,713 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:19,716 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-05-14 00:53:19,718 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 00:53:19,718 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-05-14 00:53:19,721 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-05-14 00:53:19,724 [ scc.git] DEBUG Already up to date.
2025-05-14 00:53:19,724 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-05-14 00:53:20,297 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-05-14 00:53:20,297 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-05-14 00:53:20,301 [ scc.git] DEBUG ## Unique users: []
2025-05-14 00:53:20,301 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:53:20,301 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:20,304 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-14 00:53:20,307 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:20,309 [ 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 00:53:20,481 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-05-14 00:53:20,481 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-05-14 00:53:20,481 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-14 00:53:20,481 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-14 00:53:20,484 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-14 00:53:20,488 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-05-14 00:53:20,489 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:20,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:20,656 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-14 00:53:20,659 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-14 00:53:20,662 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#419](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-05-14 00:53:20,664 [ scc.config] DEBUG Found github.token
2025-05-14 00:53:20,664 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-05-14 00:53:20,664 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 00:53:20,702 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:53:20,702 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:20,705 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 00:53:20,741 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 00:53:20,744 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f193817c350> has no local changes
2025-05-14 00:53:20,744 [ 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#419 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/)'
2025-05-14 00:53:20,751 [ scc.git] DEBUG [detached HEAD 3fd1230] merge master -Dorg -Ssuccess-only
2025-05-14 00:53:20,751 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:20,751 [ scc.repo] DEBUG ## PRs found:
2025-05-14 00:53:20,907 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:21,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-05-14 00:53:21,107 [ scc.repo] DEBUG ## Branches found:
2025-05-14 00:53:21,107 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-14 00:53:21,107 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:53:21,107 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:21,109 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-14 00:53:21,112 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 00:53:21,112 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-14 00:53:21,115 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-14 00:53:21,117 [ scc.git] DEBUG Already up to date.
2025-05-14 00:53:21,117 [ scc.git] DEBUG ## Unique users: []
2025-05-14 00:53:21,117 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:53:21,117 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:21,119 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 00:53:21,158 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:53:21,158 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:21,160 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 00:53:21,196 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 00:53:21,200 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1939323710> has no local changes
2025-05-14 00:53:21,200 [ 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#419 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/)'
2025-05-14 00:53:21,206 [ scc.git] DEBUG [detached HEAD 456fc3a] merge master -Dorg -Ssuccess-only
2025-05-14 00:53:21,206 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:21,206 [ scc.repo] DEBUG ## PRs found:
2025-05-14 00:53:21,358 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:21,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-05-14 00:53:21,578 [ scc.repo] DEBUG ## Branches found:
2025-05-14 00:53:21,578 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-14 00:53:21,578 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:53:21,578 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:21,581 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-14 00:53:21,583 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 00:53:21,583 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-14 00:53:21,586 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-14 00:53:21,589 [ scc.git] DEBUG Already up to date.
2025-05-14 00:53:21,589 [ scc.git] DEBUG ## Unique users: []
2025-05-14 00:53:21,589 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:53:21,589 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:21,591 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 00:53:21,630 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:53:21,630 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:21,632 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 00:53:21,669 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 00:53:21,672 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f193812c510> has no local changes
2025-05-14 00:53:21,672 [ 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#419 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/)'
2025-05-14 00:53:21,678 [ scc.git] DEBUG [detached HEAD e9b6b13] merge master -Dorg -Ssuccess-only
2025-05-14 00:53:21,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:21,679 [ scc.repo] DEBUG ## PRs found:
2025-05-14 00:53:21,829 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:22,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-05-14 00:53:22,352 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:22,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-05-14 00:53:22,838 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:23,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-05-14 00:53:23,290 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:23,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-14 00:53:23,906 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:24,123 [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 00:53:24,375 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:24,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-14 00:53:24,931 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:25,130 [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 00:53:25,131 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-05-14 00:53:25,132 [ scc.repo] DEBUG ## Branches found:
2025-05-14 00:53:25,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-14 00:53:25,132 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:53:25,132 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:25,134 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-14 00:53:25,137 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 00:53:25,137 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-14 00:53:25,139 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-14 00:53:25,142 [ scc.git] DEBUG Already up to date.
2025-05-14 00:53:25,143 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-05-14 00:53:25,695 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-05-14 00:53:25,695 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-05-14 00:53:25,699 [ scc.git] DEBUG ## Unique users: []
2025-05-14 00:53:25,699 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:53:25,699 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:25,702 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-14 00:53:25,705 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:25,707 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-14 00:53:25,903 [ scc.git] DEBUG Auto-merging Dockerfile
2025-05-14 00:53:25,903 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-05-14 00:53:25,904 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-14 00:53:25,904 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-14 00:53:25,907 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-14 00:53:25,912 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-05-14 00:53:25,914 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:26,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:26,082 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-14 00:53:26,085 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-14 00:53:26,087 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#419](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-05-14 00:53:26,089 [ scc.config] DEBUG Found github.token
2025-05-14 00:53:26,090 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-05-14 00:53:26,090 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 00:53:26,127 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:53:26,127 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:26,129 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 00:53:26,168 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 00:53:26,172 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f19393395d0> has no local changes
2025-05-14 00:53:26,172 [ 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#419 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/)'
2025-05-14 00:53:26,178 [ scc.git] DEBUG [detached HEAD 2e0eceb] merge master -Dorg -Ssuccess-only
2025-05-14 00:53:26,178 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:26,178 [ scc.git] INFO Overriding base-branch from master to develop
2025-05-14 00:53:26,179 [ scc.repo] DEBUG ## PRs found:
2025-05-14 00:53:26,333 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:26,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-05-14 00:53:26,867 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:27,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-05-14 00:53:27,350 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:27,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-05-14 00:53:27,826 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:28,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-14 00:53:28,283 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:28,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-14 00:53:28,758 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:29,035 [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 00:53:29,286 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:29,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-14 00:53:29,732 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:29,929 [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 00:53:29,929 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-14 00:53:30,180 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:30,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-05-14 00:53:30,650 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:30,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-05-14 00:53:31,188 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:31,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-14 00:53:31,719 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:31,915 [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 00:53:32,166 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:32,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-14 00:53:32,634 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:32,871 [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 00:53:32,872 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-14 00:53:33,123 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:33,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-05-14 00:53:33,608 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:33,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-05-14 00:53:34,146 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:34,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-05-14 00:53:34,636 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:34,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-05-14 00:53:34,968 [ scc.repo] DEBUG ## Branches found:
2025-05-14 00:53:34,968 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-14 00:53:34,968 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:53:34,968 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:34,970 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-05-14 00:53:34,973 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-14 00:53:34,973 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-05-14 00:53:34,976 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-05-14 00:53:34,984 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-05-14 00:53:35,218 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:35,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-05-14 00:53:35,614 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-05-14 00:53:36,363 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-14 00:53:36,363 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-05-14 00:53:36,367 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-05-14 00:53:36,938 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-14 00:53:36,938 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-05-14 00:53:36,942 [ scc.git] DEBUG ## Unique users: []
2025-05-14 00:53:36,942 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:53:36,942 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:36,944 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-14 00:53:36,950 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:36,952 [ 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 00:53:37,136 [ 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 00:53:37,137 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-14 00:53:37,137 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-14 00:53:37,139 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-14 00:53:37,143 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-05-14 00:53:37,144 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:37,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:37,321 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-14 00:53:37,327 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-14 00:53:37,331 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#419](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-05-14 00:53:37,333 [ scc.config] DEBUG Found github.token
2025-05-14 00:53:37,333 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-05-14 00:53:37,333 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-05-14 00:53:37,338 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:37,340 [ 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 00:53:37,350 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-14 00:53:37,353 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-05-14 00:53:37,353 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-05-14 00:53:37,572 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:37,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:37,737 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-14 00:53:37,775 [ scc.git] DEBUG Get sha1 of %s
2025-05-14 00:53:37,775 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-14 00:53:37,777 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 00:53:37,813 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 00:53:37,817 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1939294c50> has no local changes
2025-05-14 00:53:37,817 [ 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#419 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/)'
2025-05-14 00:53:37,824 [ scc.git] DEBUG [detached HEAD 21762d6] merge master -Dorg -Ssuccess-only
2025-05-14 00:53:37,824 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:37,824 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-14 00:53:37,896 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-05-14 00:53:37,988 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:38,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:38,152 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-05-14 00:53:38,153 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-05-14 00:53:38,398 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:38,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:38,557 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-05-14 00:53:38,559 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-05-14 00:53:38,804 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:38,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:38,982 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-05-14 00:53:38,984 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-05-14 00:53:39,229 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:39,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:39,397 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-05-14 00:53:39,642 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:39,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:39,810 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-05-14 00:53:39,812 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-05-14 00:53:40,057 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:40,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:40,218 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-05-14 00:53:40,220 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-05-14 00:53:40,465 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:40,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:40,629 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-05-14 00:53:40,631 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-05-14 00:53:40,875 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:41,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:41,035 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-05-14 00:53:41,037 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-05-14 00:53:41,282 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:41,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:41,439 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-05-14 00:53:41,442 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-05-14 00:53:41,686 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:41,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:41,855 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-05-14 00:53:41,857 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-05-14 00:53:42,102 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:42,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:42,262 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-05-14 00:53:42,264 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-05-14 00:53:42,508 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:42,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:42,686 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-05-14 00:53:42,688 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-05-14 00:53:42,933 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:43,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:43,100 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-05-14 00:53:43,344 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:43,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:43,658 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-05-14 00:53:43,903 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:44,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:44,069 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-05-14 00:53:44,071 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-05-14 00:53:44,316 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:44,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:44,488 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-05-14 00:53:44,733 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:44,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:44,897 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-05-14 00:53:45,142 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:45,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:45,303 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-05-14 00:53:45,305 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-05-14 00:53:45,549 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:45,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:45,711 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-05-14 00:53:45,713 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-05-14 00:53:45,958 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:46,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:46,126 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-05-14 00:53:46,128 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-05-14 00:53:46,373 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:46,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:46,547 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-05-14 00:53:46,549 [ scc.config] DEBUG Found submodule.scripts.url
2025-05-14 00:53:46,793 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-14 00:53:46,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-14 00:53:46,962 [ scc.config] DEBUG Found submodule.scripts.branch
2025-05-14 00:53:46,962 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-14 00:53:47,054 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f193922a410> has local changes
2025-05-14 00:53:47,054 [ 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#419 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/419/)'
2025-05-14 00:53:47,069 [ scc.git] DEBUG [detached HEAD 5783bec] merge master -Dorg -Ssuccess-only
2025-05-14 00:53:47,069 [ scc.merge] INFO Repository: ome/omero-plugins
2025-05-14 00:53:47,069 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-05-14 00:53:47,069 [ scc.merge] INFO Already up to date.
2025-05-14 00:53:47,069 [ scc.merge] INFO
2025-05-14 00:53:47,069 [ scc.merge] INFO Merged PRs:
2025-05-14 00:53:47,069 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-05-14 00:53:47,069 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-05-14 00:53:47,069 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-05-14 00:53:47,069 [ scc.merge] INFO
2025-05-14 00:53:47,069 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-05-14 00:53:47,069 [ scc.merge] INFO Already up to date.
2025-05-14 00:53:47,069 [ scc.merge] INFO
2025-05-14 00:53:47,069 [ scc.merge] INFO
2025-05-14 00:53:47,069 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-05-14 00:53:47,069 [ scc.merge] INFO Excluded PRs:
2025-05-14 00:53:47,070 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-05-14 00:53:47,070 [ scc.merge] INFO Already up to date.
2025-05-14 00:53:47,070 [ scc.merge] INFO
2025-05-14 00:53:47,070 [ scc.merge] INFO
2025-05-14 00:53:47,070 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-05-14 00:53:47,070 [ scc.merge] INFO Excluded PRs:
2025-05-14 00:53:47,070 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-05-14 00:53:47,070 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-05-14 00:53:47,070 [ scc.merge] INFO Already up to date.
2025-05-14 00:53:47,070 [ scc.merge] INFO
2025-05-14 00:53:47,070 [ scc.merge] INFO Merged PRs:
2025-05-14 00:53:47,070 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-05-14 00:53:47,070 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-05-14 00:53:47,070 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-05-14 00:53:47,070 [ scc.merge] INFO
2025-05-14 00:53:47,070 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-05-14 00:53:47,070 [ scc.merge] INFO Excluded PRs:
2025-05-14 00:53:47,070 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-05-14 00:53:47,070 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-05-14 00:53:47,070 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-05-14 00:53:47,070 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-14 00:53:47,070 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-05-14 00:53:47,070 [ scc.merge] INFO Updating 11d3587..5b2ca82
2025-05-14 00:53:47,070 [ scc.merge] INFO Previously merged:
2025-05-14 00:53:47,070 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-05-14 00:53:47,070 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-14 00:53:47,070 [ scc.merge] INFO
2025-05-14 00:53:47,070 [ scc.merge] INFO Merged PRs:
2025-05-14 00:53:47,070 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-05-14 00:53:47,070 [ scc.merge] INFO
2025-05-14 00:53:47,070 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-14 00:53:47,070 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-05-14 00:53:47,070 [ scc.merge] INFO
2025-05-14 00:53:47,070 [ scc.merge] INFO Repository: ome/omero-figure
2025-05-14 00:53:47,070 [ scc.merge] INFO Excluded PRs:
2025-05-14 00:53:47,070 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-05-14 00:53:47,070 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-05-14 00:53:47,070 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-05-14 00:53:47,070 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-05-14 00:53:47,070 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-05-14 00:53:47,070 [ scc.merge] INFO Previously merged:
2025-05-14 00:53:47,070 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-05-14 00:53:47,071 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-05-14 00:53:47,071 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-05-14 00:53:47,071 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-14 00:53:47,071 [ scc.merge] INFO
2025-05-14 00:53:47,071 [ scc.merge] INFO Merged PRs:
2025-05-14 00:53:47,071 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-05-14 00:53:47,071 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-05-14 00:53:47,071 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-05-14 00:53:47,071 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-05-14 00:53:47,071 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-05-14 00:53:47,071 [ scc.merge] INFO
2025-05-14 00:53:47,071 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-14 00:53:47,071 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-05-14 00:53:47,071 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-05-14 00:53:47,071 [ scc.merge] INFO
2025-05-14 00:53:47,071 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-05-14 00:53:47,071 [ scc.merge] INFO Already up to date.
2025-05-14 00:53:47,071 [ scc.merge] INFO
2025-05-14 00:53:47,071 [ scc.merge] INFO Merged PRs:
2025-05-14 00:53:47,071 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-05-14 00:53:47,071 [ scc.merge] INFO
2025-05-14 00:53:47,071 [ scc.merge] INFO Repository: ome/omero-gallery
2025-05-14 00:53:47,071 [ scc.merge] INFO Already up to date.
2025-05-14 00:53:47,071 [ scc.merge] INFO
2025-05-14 00:53:47,071 [ scc.merge] INFO Merged PRs:
2025-05-14 00:53:47,071 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-05-14 00:53:47,071 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-05-14 00:53:47,071 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-05-14 00:53:47,071 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-05-14 00:53:47,071 [ scc.merge] INFO
2025-05-14 00:53:47,071 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-14 00:53:47,071 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-05-14 00:53:47,071 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-05-14 00:53:47,071 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-05-14 00:53:47,071 [ scc.merge] INFO
2025-05-14 00:53:47,071 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-05-14 00:53:47,071 [ scc.merge] INFO Excluded PRs:
2025-05-14 00:53:47,071 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-05-14 00:53:47,071 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-05-14 00:53:47,071 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-05-14 00:53:47,071 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-05-14 00:53:47,071 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-05-14 00:53:47,072 [ scc.merge] INFO Already up to date.
2025-05-14 00:53:47,072 [ scc.merge] INFO
2025-05-14 00:53:47,072 [ scc.merge] INFO Merged PRs:
2025-05-14 00:53:47,072 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-05-14 00:53:47,072 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-05-14 00:53:47,072 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-05-14 00:53:47,072 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-05-14 00:53:47,072 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-14 00:53:47,072 [ scc.merge] INFO
2025-05-14 00:53:47,072 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-14 00:53:47,072 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-05-14 00:53:47,072 [ scc.merge] INFO
2025-05-14 00:53:47,072 [ scc.merge] INFO Repository: ome/omero-mapr
2025-05-14 00:53:47,072 [ scc.merge] INFO Excluded PRs:
2025-05-14 00:53:47,072 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-05-14 00:53:47,072 [ scc.merge] INFO Already up to date.
2025-05-14 00:53:47,072 [ scc.merge] INFO
2025-05-14 00:53:47,072 [ scc.merge] INFO Merged PRs:
2025-05-14 00:53:47,072 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-05-14 00:53:47,072 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-14 00:53:47,072 [ scc.merge] INFO
2025-05-14 00:53:47,072 [ scc.merge] INFO Repository: ome/omero-metadata
2025-05-14 00:53:47,072 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-05-14 00:53:47,072 [ scc.merge] INFO Previously merged:
2025-05-14 00:53:47,072 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-14 00:53:47,072 [ scc.merge] INFO
2025-05-14 00:53:47,072 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-14 00:53:47,072 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-14 00:53:47,072 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-14 00:53:47,072 [ scc.merge] INFO
2025-05-14 00:53:47,072 [ scc.merge] INFO Repository: ome/omero-parade
2025-05-14 00:53:47,072 [ scc.merge] INFO Excluded PRs:
2025-05-14 00:53:47,072 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-05-14 00:53:47,072 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-05-14 00:53:47,072 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-05-14 00:53:47,072 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-05-14 00:53:47,072 [ scc.merge] INFO Already up to date.
2025-05-14 00:53:47,072 [ scc.merge] INFO
2025-05-14 00:53:47,072 [ scc.merge] INFO Merged PRs:
2025-05-14 00:53:47,072 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-14 00:53:47,072 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-14 00:53:47,072 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-14 00:53:47,073 [ scc.merge] INFO
2025-05-14 00:53:47,073 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-05-14 00:53:47,073 [ scc.merge] INFO Already up to date.
2025-05-14 00:53:47,073 [ scc.merge] INFO
2025-05-14 00:53:47,073 [ scc.merge] INFO
2025-05-14 00:53:47,073 [ scc.merge] INFO Repository: ome/omero-rois
2025-05-14 00:53:47,073 [ scc.merge] INFO Excluded PRs:
2025-05-14 00:53:47,073 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-05-14 00:53:47,073 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-14 00:53:47,073 [ scc.merge] INFO Already up to date.
2025-05-14 00:53:47,073 [ scc.merge] INFO
2025-05-14 00:53:47,073 [ scc.merge] INFO
2025-05-14 00:53:47,073 [ scc.merge] INFO Repository: ome/omero-signup
2025-05-14 00:53:47,073 [ scc.merge] INFO Already up to date.
2025-05-14 00:53:47,073 [ scc.merge] INFO
2025-05-14 00:53:47,073 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-14 00:53:47,073 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-14 00:53:47,073 [ scc.merge] INFO
2025-05-14 00:53:47,073 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-05-14 00:53:47,073 [ scc.merge] INFO Excluded PRs:
2025-05-14 00:53:47,073 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-05-14 00:53:47,073 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-05-14 00:53:47,073 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-05-14 00:53:47,073 [ scc.merge] INFO Already up to date.
2025-05-14 00:53:47,073 [ scc.merge] INFO
2025-05-14 00:53:47,073 [ scc.merge] INFO Merged PRs:
2025-05-14 00:53:47,073 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-14 00:53:47,073 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-05-14 00:53:47,073 [ scc.merge] INFO
2025-05-14 00:53:47,073 [ scc.merge] INFO Repository: ome/omero-upload
2025-05-14 00:53:47,073 [ scc.merge] INFO Already up to date.
2025-05-14 00:53:47,073 [ scc.merge] INFO
2025-05-14 00:53:47,073 [ scc.merge] INFO
2025-05-14 00:53:47,073 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-05-14 00:53:47,073 [ scc.merge] INFO Already up to date.
2025-05-14 00:53:47,073 [ scc.merge] INFO
2025-05-14 00:53:47,073 [ scc.merge] INFO Merged PRs:
2025-05-14 00:53:47,073 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-05-14 00:53:47,073 [ scc.merge] INFO
2025-05-14 00:53:47,073 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-05-14 00:53:47,073 [ scc.merge] INFO Excluded PRs:
2025-05-14 00:53:47,073 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-05-14 00:53:47,074 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-05-14 00:53:47,074 [ scc.merge] INFO Already up to date.
2025-05-14 00:53:47,074 [ scc.merge] INFO
2025-05-14 00:53:47,074 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-14 00:53:47,074 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-14 00:53:47,074 [ scc.merge] INFO
2025-05-14 00:53:47,074 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-05-14 00:53:47,074 [ scc.merge] INFO Already up to date.
2025-05-14 00:53:47,074 [ scc.merge] INFO
2025-05-14 00:53:47,074 [ scc.merge] INFO
2025-05-14 00:53:47,074 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-05-14 00:53:47,074 [ scc.merge] INFO Already up to date.
2025-05-14 00:53:47,074 [ scc.merge] INFO
2025-05-14 00:53:47,074 [ scc.merge] INFO
2025-05-14 00:53:47,074 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-05-14 00:53:47,074 [ scc.merge] INFO Already up to date.
2025-05-14 00:53:47,074 [ scc.merge] INFO
2025-05-14 00:53:47,074 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-14 00:53:47,074 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-05-14 00:53:47,074 [ scc.merge] INFO
2025-05-14 00:53:47,074 [ scc.merge] INFO Repository: ome/scripts
2025-05-14 00:53:47,074 [ scc.merge] INFO Excluded PRs:
2025-05-14 00:53:47,074 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-05-14 00:53:47,074 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-05-14 00:53:47,074 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-05-14 00:53:47,074 [ scc.merge] INFO Previously merged:
2025-05-14 00:53:47,074 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-05-14 00:53:47,074 [ scc.merge] INFO
2025-05-14 00:53:47,074 [ scc.merge] INFO Merged PRs:
2025-05-14 00:53:47,074 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-14 00:53:47,074 [ scc.merge] INFO
2025-05-14 00:53:47,074 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-14 00:53:47,074 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-14 00:53:47,074 [ scc.merge] INFO
2025-05-14 00:53:47,074 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-05-14 00:53:47,074 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 00:53:47,077 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-05-14 00:53:47,077 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 00:53:47,079 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:47,079 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-05-14 00:53:47,079 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 00:53:47,081 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:47,081 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-05-14 00:53:47,081 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 00:53:47,083 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:47,083 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-05-14 00:53:47,083 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 00:53:47,085 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:47,085 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-05-14 00:53:47,085 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 00:53:47,087 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:47,087 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-05-14 00:53:47,087 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 00:53:47,089 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:47,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-05-14 00:53:47,090 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 00:53:47,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:47,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-05-14 00:53:47,092 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 00:53:47,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:47,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-14 00:53:47,094 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 00:53:47,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:47,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-14 00:53:47,096 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 00:53:47,098 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:47,098 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-14 00:53:47,098 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 00:53:47,101 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:47,101 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-14 00:53:47,101 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 00:53:47,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:47,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-14 00:53:47,103 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 00:53:47,105 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:47,105 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-14 00:53:47,105 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 00:53:47,107 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:47,107 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-14 00:53:47,107 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 00:53:47,109 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:47,109 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-14 00:53:47,110 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 00:53:47,112 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:47,112 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-14 00:53:47,112 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 00:53:47,114 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:47,114 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-14 00:53:47,114 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 00:53:47,116 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:47,116 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-14 00:53:47,116 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 00:53:47,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:47,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-14 00:53:47,118 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 00:53:47,120 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:47,120 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-14 00:53:47,120 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 00:53:47,123 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-14 00:53:47,123 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-14 00:53:47,123 [ scc.git] DEBUG Calling 'git remote'
2025-05-14 00:53:47,125 [ 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 995dcb2] 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 982884c] 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 00:54:34,768 [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 00:54:44,222 [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 00:54:46,737 [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 00:54:51,647 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-05-14 00:55:30,971 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/9161e9ff/images/svgs/logo.svg){kind=logo}
