Skipping 219 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-06-17 00:51:18,381 [ scc.git] DEBUG HEAD is now at f188e9b merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-06-17 00:51:18,575 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:18,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:51:18,745 [ scc.git] DEBUG Calling 'git merge-base bb94cf8da960e3283090038b04432f301560f5e4 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-06-17 00:51:18,748 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..bb94cf8da960e3283090038b04432f301560f5e4'
2025-06-17 00:51:18,751 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#452](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-06-17 00:51:18,754 [ scc.config] DEBUG Found github.token
2025-06-17 00:51:18,754 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-06-17 00:51:18,754 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-17 00:51:18,797 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:51:18,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:18,799 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-17 00:51:18,840 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-17 00:51:18,847 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06a4a4b750> has no local changes
2025-06-17 00:51:18,847 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Updating 7a798ce..bb94cf8
Previously merged:
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#452 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/)'
2025-06-17 00:51:18,857 [ scc.git] DEBUG [detached HEAD f38a6b7] merge master -Dorg -Ssuccess-only
2025-06-17 00:51:18,857 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:51:18,857 [ scc.repo] DEBUG ## PRs found:
2025-06-17 00:51:18,996 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:19,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-06-17 00:51:19,511 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:19,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-06-17 00:51:19,996 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:20,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-06-17 00:51:20,525 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:20,743 [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-06-17 00:51:20,995 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:21,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-06-17 00:51:21,538 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:21,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-06-17 00:51:21,717 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-17 00:51:21,968 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:22,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-06-17 00:51:22,432 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:22,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-06-17 00:51:22,950 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:23,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-06-17 00:51:23,495 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:23,718 [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-06-17 00:51:23,969 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:24,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-06-17 00:51:24,507 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:24,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-06-17 00:51:24,685 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-06-17 00:51:24,685 [ scc.repo] DEBUG ## Branches found:
2025-06-17 00:51:24,685 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-06-17 00:51:24,685 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:51:24,685 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:24,688 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-17 00:51:24,690 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-17 00:51:24,690 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-17 00:51:24,693 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-17 00:51:24,697 [ scc.git] DEBUG Already up to date.
2025-06-17 00:51:24,697 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-06-17 00:51:24,988 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-06-17 00:51:24,989 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-06-17 00:51:24,993 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-06-17 00:51:25,289 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-06-17 00:51:25,289 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-06-17 00:51:25,293 [ scc.git] DEBUG ## Unique users: []
2025-06-17 00:51:25,293 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:51:25,294 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:25,296 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-06-17 00:51:25,300 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:25,303 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-06-17 00:51:25,312 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-17 00:51:25,315 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-06-17 00:51:25,315 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-06-17 00:51:25,315 [ scc.git] DEBUG requirements.txt | 2 +-
2025-06-17 00:51:25,315 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-06-17 00:51:25,315 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-06-17 00:51:25,315 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-06-17 00:51:25,317 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:25,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:51:25,493 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-06-17 00:51:25,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:25,500 [ 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-06-17 00:51:25,509 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-17 00:51:25,512 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-06-17 00:51:25,512 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-06-17 00:51:25,744 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:25,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:51:25,913 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-17 00:51:25,953 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:51:25,953 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:25,956 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-17 00:51:25,993 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-17 00:51:25,997 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06a4a5bc50> has no local changes
2025-06-17 00:51:25,997 [ 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#452 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/)'
2025-06-17 00:51:26,004 [ scc.git] DEBUG [detached HEAD b53d2c0] merge master -Dorg -Ssuccess-only
2025-06-17 00:51:26,004 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:51:26,004 [ scc.repo] DEBUG ## PRs found:
2025-06-17 00:51:26,164 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:26,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-06-17 00:51:26,755 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:27,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-06-17 00:51:27,252 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:27,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-06-17 00:51:27,770 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:28,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-06-17 00:51:28,358 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:28,593 [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-06-17 00:51:28,845 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:29,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-06-17 00:51:29,379 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:29,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-06-17 00:51:29,565 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-06-17 00:51:29,816 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:30,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-06-17 00:51:30,287 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:30,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-06-17 00:51:30,808 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:31,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-06-17 00:51:31,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:31,656 [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-06-17 00:51:31,908 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:32,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-06-17 00:51:32,466 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:32,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-06-17 00:51:32,646 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-06-17 00:51:32,647 [ scc.repo] DEBUG ## Branches found:
2025-06-17 00:51:32,647 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-06-17 00:51:32,647 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:51:32,647 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:32,649 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-17 00:51:32,652 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-17 00:51:32,652 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-17 00:51:32,655 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-17 00:51:32,663 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-06-17 00:51:32,898 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:33,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-06-17 00:51:33,321 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-06-17 00:51:33,617 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-06-17 00:51:33,617 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-06-17 00:51:33,622 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-06-17 00:51:33,930 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-06-17 00:51:33,931 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-06-17 00:51:33,935 [ scc.git] DEBUG ## Unique users: []
2025-06-17 00:51:33,935 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:51:33,935 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:33,937 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-06-17 00:51:33,942 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:33,944 [ 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-06-17 00:51:33,958 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-06-17 00:51:33,958 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-06-17 00:51:33,958 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-06-17 00:51:33,958 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-06-17 00:51:33,958 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-06-17 00:51:33,958 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-06-17 00:51:33,961 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-06-17 00:51:33,966 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-06-17 00:51:33,967 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:34,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:51:34,125 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-06-17 00:51:34,129 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-06-17 00:51:34,132 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#452](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-06-17 00:51:34,135 [ scc.config] DEBUG Found github.token
2025-06-17 00:51:34,135 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-06-17 00:51:34,135 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-06-17 00:51:34,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:34,142 [ 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-06-17 00:51:34,156 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-06-17 00:51:34,156 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-06-17 00:51:34,156 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-06-17 00:51:34,156 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-06-17 00:51:34,156 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-06-17 00:51:34,159 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-06-17 00:51:34,164 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-06-17 00:51:34,376 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:34,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:51:34,534 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-06-17 00:51:34,538 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-06-17 00:51:34,541 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#452](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/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-06-17 00:51:34,543 [ scc.config] DEBUG Found github.token
2025-06-17 00:51:34,544 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-06-17 00:51:34,544 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-17 00:51:34,586 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:51:34,586 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:34,589 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-17 00:51:34,630 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-17 00:51:34,634 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06a4ad61d0> has no local changes
2025-06-17 00:51:34,635 [ 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#452 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/)'
2025-06-17 00:51:34,642 [ scc.git] DEBUG [detached HEAD 5291a33] merge master -Dorg -Ssuccess-only
2025-06-17 00:51:34,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:51:34,642 [ scc.repo] DEBUG ## PRs found:
2025-06-17 00:51:34,785 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:35,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-06-17 00:51:35,361 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:35,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-06-17 00:51:35,857 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:36,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-06-17 00:51:36,366 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:36,598 [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-06-17 00:51:36,850 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:37,070 [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-06-17 00:51:37,321 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:37,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-06-17 00:51:37,830 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:38,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-06-17 00:51:38,019 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-17 00:51:38,270 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:38,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-06-17 00:51:38,507 [ scc.repo] DEBUG # ... Include label: dependencies
2025-06-17 00:51:38,758 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:39,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-06-17 00:51:39,350 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:39,621 [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-06-17 00:51:39,872 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:40,249 [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-06-17 00:51:40,501 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:40,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-06-17 00:51:40,958 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:41,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-06-17 00:51:41,148 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-06-17 00:51:41,399 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:41,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-06-17 00:51:41,628 [ scc.repo] DEBUG # ... Include label: dependencies
2025-06-17 00:51:41,879 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:42,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-06-17 00:51:42,431 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:42,711 [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-06-17 00:51:42,963 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:43,222 [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-06-17 00:51:43,474 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:43,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-06-17 00:51:43,923 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:44,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-06-17 00:51:44,129 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-06-17 00:51:44,380 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:44,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-06-17 00:51:44,878 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:45,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-06-17 00:51:45,365 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:45,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-06-17 00:51:45,857 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:46,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-06-17 00:51:46,326 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:46,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-06-17 00:51:46,849 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:47,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-06-17 00:51:47,314 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:47,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-06-17 00:51:47,575 [ scc.repo] DEBUG ## Branches found:
2025-06-17 00:51:47,575 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-06-17 00:51:47,575 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:51:47,575 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:47,578 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-17 00:51:47,580 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-17 00:51:47,580 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-17 00:51:47,583 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-17 00:51:47,587 [ scc.git] DEBUG Already up to date.
2025-06-17 00:51:47,587 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-06-17 00:51:47,873 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-06-17 00:51:47,873 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-06-17 00:51:47,878 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-06-17 00:51:48,177 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-06-17 00:51:48,177 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-06-17 00:51:48,182 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-06-17 00:51:48,473 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-06-17 00:51:48,473 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-06-17 00:51:48,478 [ scc.git] DEBUG ## Unique users: []
2025-06-17 00:51:48,478 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:51:48,478 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:48,480 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-06-17 00:51:48,483 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:48,485 [ 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-06-17 00:51:48,494 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-17 00:51:48,498 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-06-17 00:51:48,498 [ scc.git] DEBUG package.json | 2 +-
2025-06-17 00:51:48,498 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-06-17 00:51:48,499 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:48,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:51:48,666 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-06-17 00:51:48,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:48,672 [ 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-06-17 00:51:48,682 [ scc.git] DEBUG Auto-merging package-lock.json
2025-06-17 00:51:48,682 [ scc.git] DEBUG Auto-merging package.json
2025-06-17 00:51:48,683 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-17 00:51:48,686 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-06-17 00:51:48,686 [ scc.git] DEBUG package.json | 2 +-
2025-06-17 00:51:48,686 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-06-17 00:51:48,917 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:49,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:51:49,075 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-06-17 00:51:49,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:49,081 [ 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-06-17 00:51:49,090 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-17 00:51:49,093 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-06-17 00:51:49,093 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-06-17 00:51:49,326 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:49,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:51:49,493 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-17 00:51:49,536 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:51:49,536 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:49,539 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-17 00:51:49,580 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-17 00:51:49,584 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06a4a58d90> has no local changes
2025-06-17 00:51:49,584 [ 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#452 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/)'
2025-06-17 00:51:49,591 [ scc.git] DEBUG [detached HEAD 0731c0a] merge master -Dorg -Ssuccess-only
2025-06-17 00:51:49,592 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:51:49,592 [ scc.repo] DEBUG ## PRs found:
2025-06-17 00:51:49,744 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:49,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-06-17 00:51:49,929 [ scc.repo] DEBUG ## Branches found:
2025-06-17 00:51:49,929 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-06-17 00:51:49,929 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:51:49,929 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:49,932 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-17 00:51:49,934 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-17 00:51:49,934 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-17 00:51:49,937 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-17 00:51:49,940 [ scc.git] DEBUG Already up to date.
2025-06-17 00:51:49,940 [ scc.git] DEBUG ## Unique users: []
2025-06-17 00:51:49,940 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:51:49,940 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:49,942 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-17 00:51:49,983 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:51:49,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:49,985 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-17 00:51:50,025 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-17 00:51:50,028 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06a415f690> has no local changes
2025-06-17 00:51:50,028 [ 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#452 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/)'
2025-06-17 00:51:50,034 [ scc.git] DEBUG [detached HEAD a57b96d] merge master -Dorg -Ssuccess-only
2025-06-17 00:51:50,035 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:51:50,035 [ scc.repo] DEBUG ## PRs found:
2025-06-17 00:51:50,180 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:50,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-06-17 00:51:50,687 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:50,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-06-17 00:51:51,179 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:51,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-06-17 00:51:51,659 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:51,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-06-17 00:51:51,898 [ scc.repo] DEBUG ## Branches found:
2025-06-17 00:51:51,898 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-06-17 00:51:51,898 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:51:51,898 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:51,901 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-17 00:51:51,903 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-17 00:51:51,903 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-17 00:51:51,906 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-17 00:51:51,909 [ scc.git] DEBUG Already up to date.
2025-06-17 00:51:51,909 [ scc.git] DEBUG ## Unique users: []
2025-06-17 00:51:51,909 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:51:51,909 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:51,912 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-17 00:51:51,955 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:51:51,955 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:51,957 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-17 00:51:51,998 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-17 00:51:52,001 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06a413a750> has no local changes
2025-06-17 00:51:52,001 [ 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#452 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/)'
2025-06-17 00:51:52,008 [ scc.git] DEBUG [detached HEAD ebf8cdb] merge master -Dorg -Ssuccess-only
2025-06-17 00:51:52,008 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:51:52,008 [ scc.repo] DEBUG ## PRs found:
2025-06-17 00:51:52,149 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:52,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-06-17 00:51:52,700 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:52,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-06-17 00:51:53,197 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:53,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-06-17 00:51:53,652 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:54,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-06-17 00:51:54,258 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:54,509 [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-06-17 00:51:54,761 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:55,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-06-17 00:51:55,322 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:55,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-06-17 00:51:55,530 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-06-17 00:51:55,530 [ scc.repo] DEBUG ## Branches found:
2025-06-17 00:51:55,530 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-06-17 00:51:55,531 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:51:55,531 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:55,533 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-17 00:51:55,536 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-17 00:51:55,536 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-17 00:51:55,539 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-17 00:51:55,543 [ scc.git] DEBUG Already up to date.
2025-06-17 00:51:55,543 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-06-17 00:51:55,833 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-06-17 00:51:55,833 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-06-17 00:51:55,837 [ scc.git] DEBUG ## Unique users: []
2025-06-17 00:51:55,837 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:51:55,837 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:55,840 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-06-17 00:51:55,843 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:55,845 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-06-17 00:51:55,857 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-06-17 00:51:55,857 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-06-17 00:51:55,857 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-06-17 00:51:55,857 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-06-17 00:51:55,857 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-06-17 00:51:55,857 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-06-17 00:51:55,857 [ scc.git] DEBUG Auto-merging setup.py
2025-06-17 00:51:55,857 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-06-17 00:51:55,858 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-06-17 00:51:55,858 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-06-17 00:51:55,861 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-06-17 00:51:55,865 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-06-17 00:51:55,866 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:56,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:51:56,024 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-06-17 00:51:56,027 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-06-17 00:51:56,030 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#452](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/urls.py
- omero_signup/views.py
- setup.py
--conflicts
2025-06-17 00:51:56,033 [ scc.config] DEBUG Found github.token
2025-06-17 00:51:56,033 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-06-17 00:51:56,033 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-17 00:51:56,075 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:51:56,075 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:51:56,077 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-17 00:51:56,117 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-17 00:51:56,120 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06a417b590> has no local changes
2025-06-17 00:51:56,120 [ 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#452 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/)'
2025-06-17 00:51:56,127 [ scc.git] DEBUG [detached HEAD ea60c57] merge master -Dorg -Ssuccess-only
2025-06-17 00:51:56,127 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:51:56,127 [ scc.repo] DEBUG ## PRs found:
2025-06-17 00:51:56,275 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:56,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-06-17 00:51:56,860 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:57,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-06-17 00:51:57,306 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:57,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-06-17 00:51:57,891 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:58,133 [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-06-17 00:51:58,384 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:58,622 [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-06-17 00:51:58,873 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:59,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-06-17 00:51:59,326 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:51:59,517 [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-06-17 00:51:59,517 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-06-17 00:51:59,768 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:00,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-06-17 00:52:00,262 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:00,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-06-17 00:52:00,721 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:01,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-06-17 00:52:01,258 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:01,551 [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-06-17 00:52:01,802 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:02,029 [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-06-17 00:52:02,280 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:02,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-06-17 00:52:02,794 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:03,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-06-17 00:52:03,252 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:03,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-06-17 00:52:03,727 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:03,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-06-17 00:52:04,215 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:04,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-06-17 00:52:04,709 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:04,932 [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-06-17 00:52:05,183 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:05,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-06-17 00:52:05,734 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:05,915 [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-06-17 00:52:05,916 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-06-17 00:52:05,916 [ scc.repo] DEBUG ## Branches found:
2025-06-17 00:52:05,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-06-17 00:52:05,916 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:52:05,916 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:05,919 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-17 00:52:05,922 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-17 00:52:05,922 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-17 00:52:05,925 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-17 00:52:05,928 [ scc.git] DEBUG Already up to date.
2025-06-17 00:52:05,928 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-06-17 00:52:06,244 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-06-17 00:52:06,244 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-06-17 00:52:06,248 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-06-17 00:52:06,512 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-06-17 00:52:06,512 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-06-17 00:52:06,517 [ scc.git] DEBUG ## Unique users: []
2025-06-17 00:52:06,517 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:52:06,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:06,519 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-06-17 00:52:06,524 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:06,526 [ 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-06-17 00:52:06,539 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-17 00:52:06,543 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-06-17 00:52:06,543 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-06-17 00:52:06,543 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-06-17 00:52:06,543 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-06-17 00:52:06,543 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-06-17 00:52:06,543 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-06-17 00:52:06,543 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-06-17 00:52:06,543 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-06-17 00:52:06,543 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-06-17 00:52:06,543 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-06-17 00:52:06,544 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:06,544 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-06-17 00:52:06,544 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-06-17 00:52:06,544 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-06-17 00:52:06,544 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-06-17 00:52:06,544 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-06-17 00:52:06,544 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-06-17 00:52:06,544 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-06-17 00:52:06,544 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-06-17 00:52:06,544 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-06-17 00:52:06,544 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-06-17 00:52:06,544 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-06-17 00:52:06,544 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-06-17 00:52:06,545 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-06-17 00:52:06,545 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-06-17 00:52:06,545 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-06-17 00:52:06,545 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-06-17 00:52:06,545 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-06-17 00:52:06,545 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-06-17 00:52:06,545 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-06-17 00:52:06,545 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-06-17 00:52:06,545 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-06-17 00:52:06,545 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-06-17 00:52:06,545 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-06-17 00:52:06,545 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-06-17 00:52:06,545 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-06-17 00:52:06,545 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-06-17 00:52:06,545 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-06-17 00:52:06,545 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-06-17 00:52:06,545 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-06-17 00:52:06,545 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-06-17 00:52:06,545 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-06-17 00:52:06,545 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-06-17 00:52:06,545 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-06-17 00:52:06,545 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-06-17 00:52:06,545 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-06-17 00:52:06,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:06,708 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-06-17 00:52:06,712 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:06,715 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-06-17 00:52:06,725 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-17 00:52:06,728 [ scc.git] DEBUG docker | 1 +
2025-06-17 00:52:06,728 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-06-17 00:52:06,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:07,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:07,118 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-17 00:52:07,160 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:52:07,160 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:07,162 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-17 00:52:07,201 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-17 00:52:07,205 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06a4b30050> has no local changes
2025-06-17 00:52:07,205 [ 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#452 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/)'
2025-06-17 00:52:07,212 [ scc.git] DEBUG [detached HEAD dcadc1b] merge master -Dorg -Ssuccess-only
2025-06-17 00:52:07,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:07,212 [ scc.repo] DEBUG ## PRs found:
2025-06-17 00:52:07,369 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:07,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-06-17 00:52:07,556 [ scc.repo] DEBUG ## Branches found:
2025-06-17 00:52:07,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-06-17 00:52:07,556 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:52:07,556 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:07,559 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-17 00:52:07,561 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-17 00:52:07,561 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-17 00:52:07,564 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-17 00:52:07,568 [ scc.git] DEBUG Already up to date.
2025-06-17 00:52:07,568 [ scc.git] DEBUG ## Unique users: []
2025-06-17 00:52:07,568 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:52:07,568 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:07,570 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-17 00:52:07,613 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:52:07,613 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:07,615 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-17 00:52:07,656 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-17 00:52:07,659 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06a4181b90> has no local changes
2025-06-17 00:52:07,660 [ 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#452 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/)'
2025-06-17 00:52:07,666 [ scc.git] DEBUG [detached HEAD 5949285] merge master -Dorg -Ssuccess-only
2025-06-17 00:52:07,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:07,667 [ scc.repo] DEBUG ## PRs found:
2025-06-17 00:52:07,807 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:08,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2025-06-17 00:52:08,001 [ scc.repo] DEBUG ## Branches found:
2025-06-17 00:52:08,001 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-06-17 00:52:08,001 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:52:08,001 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:08,004 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-17 00:52:08,006 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-17 00:52:08,006 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-17 00:52:08,009 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-17 00:52:08,018 [ scc.git] DEBUG Updating deab817..160d894
2025-06-17 00:52:08,252 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:08,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls/20 HTTP/1.1" 200 None
2025-06-17 00:52:08,654 [ scc.git] DEBUG ## Unique users: []
2025-06-17 00:52:08,654 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:52:08,654 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:08,656 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-17 00:52:08,699 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:52:08,699 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:08,701 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-17 00:52:08,742 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-17 00:52:08,746 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06a41acd90> has no local changes
2025-06-17 00:52:08,746 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-virtual-microscope
Updating deab817..160d894
Previously merged:
- PR 20 jburel 'Build'
Generated by OMERO-plugins-push#452 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/)'
2025-06-17 00:52:08,753 [ scc.git] DEBUG [detached HEAD 70794e9] merge master -Dorg -Ssuccess-only
2025-06-17 00:52:08,753 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:08,753 [ scc.git] INFO Overriding base-branch from master to main
2025-06-17 00:52:08,753 [ scc.repo] DEBUG ## PRs found:
2025-06-17 00:52:08,904 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:09,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-06-17 00:52:09,440 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:09,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-06-17 00:52:09,911 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:10,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-06-17 00:52:10,390 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:10,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-06-17 00:52:10,944 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:11,182 [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-06-17 00:52:11,434 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:11,667 [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-06-17 00:52:11,919 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:12,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-06-17 00:52:12,386 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:12,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-06-17 00:52:12,868 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:13,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-06-17 00:52:13,368 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:13,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-06-17 00:52:13,880 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:14,093 [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-06-17 00:52:14,344 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:14,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-06-17 00:52:14,924 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:15,104 [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-06-17 00:52:15,104 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-06-17 00:52:15,105 [ scc.repo] DEBUG ## Branches found:
2025-06-17 00:52:15,105 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-06-17 00:52:15,105 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:52:15,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:15,108 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-06-17 00:52:15,110 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-17 00:52:15,110 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-06-17 00:52:15,113 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-06-17 00:52:15,116 [ scc.git] DEBUG Already up to date.
2025-06-17 00:52:15,116 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-06-17 00:52:15,429 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-06-17 00:52:15,429 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-06-17 00:52:15,434 [ scc.git] DEBUG ## Unique users: []
2025-06-17 00:52:15,434 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:52:15,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:15,437 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-06-17 00:52:15,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:15,442 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-06-17 00:52:15,450 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-06-17 00:52:15,450 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-06-17 00:52:15,450 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-06-17 00:52:15,450 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-06-17 00:52:15,453 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-06-17 00:52:15,458 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-06-17 00:52:15,460 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:15,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:15,622 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-06-17 00:52:15,625 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-06-17 00:52:15,628 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#452](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-06-17 00:52:15,630 [ scc.config] DEBUG Found github.token
2025-06-17 00:52:15,630 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-06-17 00:52:15,630 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-17 00:52:15,672 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:52:15,672 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:15,674 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-17 00:52:15,714 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-17 00:52:15,718 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06a4126e90> has no local changes
2025-06-17 00:52:15,718 [ 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#452 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/)'
2025-06-17 00:52:15,725 [ scc.git] DEBUG [detached HEAD fae8971] merge master -Dorg -Ssuccess-only
2025-06-17 00:52:15,725 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:15,725 [ scc.repo] DEBUG ## PRs found:
2025-06-17 00:52:15,873 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:16,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-06-17 00:52:16,054 [ scc.repo] DEBUG ## Branches found:
2025-06-17 00:52:16,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-06-17 00:52:16,054 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:52:16,054 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:16,057 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-17 00:52:16,059 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-17 00:52:16,059 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-17 00:52:16,063 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-17 00:52:16,066 [ scc.git] DEBUG Already up to date.
2025-06-17 00:52:16,066 [ scc.git] DEBUG ## Unique users: []
2025-06-17 00:52:16,066 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:52:16,066 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:16,068 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-17 00:52:16,108 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:52:16,108 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:16,110 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-17 00:52:16,149 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-17 00:52:16,153 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06a41cb590> has no local changes
2025-06-17 00:52:16,153 [ 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#452 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/)'
2025-06-17 00:52:16,159 [ scc.git] DEBUG [detached HEAD 9abc9b9] merge master -Dorg -Ssuccess-only
2025-06-17 00:52:16,160 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:16,160 [ scc.repo] DEBUG ## PRs found:
2025-06-17 00:52:16,305 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:16,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-06-17 00:52:16,503 [ scc.repo] DEBUG ## Branches found:
2025-06-17 00:52:16,503 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-06-17 00:52:16,503 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:52:16,503 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:16,505 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-17 00:52:16,508 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-17 00:52:16,508 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-17 00:52:16,511 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-17 00:52:16,514 [ scc.git] DEBUG Already up to date.
2025-06-17 00:52:16,514 [ scc.git] DEBUG ## Unique users: []
2025-06-17 00:52:16,514 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:52:16,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:16,517 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-17 00:52:16,558 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:52:16,558 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:16,560 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-17 00:52:16,601 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-17 00:52:16,605 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06a41bc6d0> has no local changes
2025-06-17 00:52:16,605 [ 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#452 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/)'
2025-06-17 00:52:16,611 [ scc.git] DEBUG [detached HEAD 4891f46] merge master -Dorg -Ssuccess-only
2025-06-17 00:52:16,612 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:16,612 [ scc.repo] DEBUG ## PRs found:
2025-06-17 00:52:16,754 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:17,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-06-17 00:52:17,277 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:17,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-06-17 00:52:17,749 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:17,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-06-17 00:52:18,214 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:18,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-06-17 00:52:18,742 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:19,075 [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-06-17 00:52:19,327 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:19,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-06-17 00:52:19,861 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:20,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-06-17 00:52:20,041 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-06-17 00:52:20,041 [ scc.repo] DEBUG ## Branches found:
2025-06-17 00:52:20,041 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-06-17 00:52:20,042 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:52:20,042 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:20,044 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-17 00:52:20,047 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-17 00:52:20,047 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-17 00:52:20,050 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-17 00:52:20,053 [ scc.git] DEBUG Already up to date.
2025-06-17 00:52:20,053 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-06-17 00:52:20,332 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-06-17 00:52:20,332 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-06-17 00:52:20,336 [ scc.git] DEBUG ## Unique users: []
2025-06-17 00:52:20,336 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:52:20,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:20,339 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-06-17 00:52:20,342 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:20,344 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-06-17 00:52:20,353 [ scc.git] DEBUG Auto-merging Dockerfile
2025-06-17 00:52:20,353 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-06-17 00:52:20,353 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-06-17 00:52:20,354 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-06-17 00:52:20,357 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-06-17 00:52:20,361 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-06-17 00:52:20,363 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:20,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:20,543 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-06-17 00:52:20,546 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-06-17 00:52:20,549 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#452](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-06-17 00:52:20,551 [ scc.config] DEBUG Found github.token
2025-06-17 00:52:20,551 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-06-17 00:52:20,551 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-17 00:52:20,593 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:52:20,593 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:20,595 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-17 00:52:20,637 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-17 00:52:20,641 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06a41df190> has no local changes
2025-06-17 00:52:20,641 [ 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#452 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/)'
2025-06-17 00:52:20,648 [ scc.git] DEBUG [detached HEAD de96b84] merge master -Dorg -Ssuccess-only
2025-06-17 00:52:20,648 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:20,648 [ scc.git] INFO Overriding base-branch from master to develop
2025-06-17 00:52:20,648 [ scc.repo] DEBUG ## PRs found:
2025-06-17 00:52:20,794 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:21,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-06-17 00:52:21,309 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:21,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-06-17 00:52:21,839 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:22,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-06-17 00:52:22,338 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:22,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-06-17 00:52:22,876 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:23,107 [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-06-17 00:52:23,358 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:23,573 [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-06-17 00:52:23,824 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:24,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-06-17 00:52:24,288 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:24,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-06-17 00:52:24,474 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-06-17 00:52:24,725 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:24,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-06-17 00:52:25,209 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:25,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-06-17 00:52:25,687 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:25,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-06-17 00:52:26,157 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:26,381 [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-06-17 00:52:26,633 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:26,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-06-17 00:52:27,089 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:27,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-06-17 00:52:27,298 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-06-17 00:52:27,549 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:27,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-06-17 00:52:28,071 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:28,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-06-17 00:52:28,603 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:28,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-06-17 00:52:29,082 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:29,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-06-17 00:52:29,381 [ scc.repo] DEBUG ## Branches found:
2025-06-17 00:52:29,381 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-06-17 00:52:29,381 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:52:29,381 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:29,385 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-06-17 00:52:29,387 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-17 00:52:29,387 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-06-17 00:52:29,390 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-06-17 00:52:29,402 [ scc.git] DEBUG Updating 4b4c755..573db34
2025-06-17 00:52:29,631 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:30,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/227 HTTP/1.1" 200 None
2025-06-17 00:52:30,254 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:30,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-06-17 00:52:30,654 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-06-17 00:52:30,948 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-06-17 00:52:30,948 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-06-17 00:52:30,953 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-06-17 00:52:31,245 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-06-17 00:52:31,245 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-06-17 00:52:31,251 [ scc.git] DEBUG ## Unique users: []
2025-06-17 00:52:31,251 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:52:31,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:31,254 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-06-17 00:52:31,259 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:31,261 [ 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-06-17 00:52:31,273 [ 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-06-17 00:52:31,273 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-06-17 00:52:31,274 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-06-17 00:52:31,276 [ scc.git] DEBUG Calling 'git reset --hard 573db340d5d1429fa17c7e486206948412a7c150'
2025-06-17 00:52:31,280 [ scc.git] DEBUG HEAD is now at 573db34 Bump version: 5.9.1 → 5.9.2.dev0
2025-06-17 00:52:31,281 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:31,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:31,486 [ scc.git] DEBUG Calling 'git merge-base 573db340d5d1429fa17c7e486206948412a7c150 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-06-17 00:52:31,492 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..573db340d5d1429fa17c7e486206948412a7c150'
2025-06-17 00:52:31,496 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#452](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-06-17 00:52:31,498 [ scc.config] DEBUG Found github.token
2025-06-17 00:52:31,498 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-06-17 00:52:31,498 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-06-17 00:52:31,503 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:31,505 [ 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-06-17 00:52:31,515 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-17 00:52:31,519 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-06-17 00:52:31,519 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-06-17 00:52:31,737 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:31,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:31,901 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-17 00:52:31,944 [ scc.git] DEBUG Get sha1 of %s
2025-06-17 00:52:31,944 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-17 00:52:31,946 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-17 00:52:31,986 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-17 00:52:31,990 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06a41bfd50> has no local changes
2025-06-17 00:52:31,990 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..573db34
Previously merged:
- PR 227 jburel 'Replace tostring by tobytes'
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#452 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/)'
2025-06-17 00:52:31,998 [ scc.git] DEBUG [detached HEAD ec05666] merge master -Dorg -Ssuccess-only
2025-06-17 00:52:31,998 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:31,998 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-17 00:52:32,079 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-06-17 00:52:32,152 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:32,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:32,314 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-06-17 00:52:32,316 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-06-17 00:52:32,560 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:32,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:32,729 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-06-17 00:52:32,731 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-06-17 00:52:32,975 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:33,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:33,141 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-06-17 00:52:33,143 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-06-17 00:52:33,388 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:33,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:33,554 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-06-17 00:52:33,798 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:33,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:33,963 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-06-17 00:52:33,965 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-06-17 00:52:34,210 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:34,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:34,398 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-06-17 00:52:34,400 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-06-17 00:52:34,644 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:34,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:34,820 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-06-17 00:52:34,822 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-06-17 00:52:35,066 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:35,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:35,243 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-06-17 00:52:35,245 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-06-17 00:52:35,489 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:35,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:35,654 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-06-17 00:52:35,656 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-06-17 00:52:35,901 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:36,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:36,075 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-06-17 00:52:36,077 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-06-17 00:52:36,322 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:36,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:36,485 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-06-17 00:52:36,487 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-06-17 00:52:36,732 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:36,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:36,911 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-06-17 00:52:36,913 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-06-17 00:52:37,157 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:37,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:37,333 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-06-17 00:52:37,577 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:37,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:37,753 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-06-17 00:52:37,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:38,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:38,190 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-06-17 00:52:38,192 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-06-17 00:52:38,436 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:38,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:38,615 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-06-17 00:52:38,859 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:39,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:39,026 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-06-17 00:52:39,270 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:39,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:39,436 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-06-17 00:52:39,438 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-06-17 00:52:39,682 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:39,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:39,876 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-06-17 00:52:39,878 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-06-17 00:52:40,123 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:40,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:40,279 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-06-17 00:52:40,281 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-06-17 00:52:40,525 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:40,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:40,684 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-06-17 00:52:40,687 [ scc.config] DEBUG Found submodule.scripts.url
2025-06-17 00:52:40,931 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-17 00:52:41,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-17 00:52:41,093 [ scc.config] DEBUG Found submodule.scripts.branch
2025-06-17 00:52:41,094 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-17 00:52:41,188 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f06a4a2f450> has local changes
2025-06-17 00:52:41,188 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
- PR 71 dominikl 'Escape slash character in image names'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 174 will-moore 'Skip wells' (stage: draft)
- PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 167 dominikl 'Add extinfo command' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
Updating 11d3587..d0c57bc
Previously merged:
- PR 147 will-moore 'Name option'
- PR 173 will-moore 'Add test_export_plate_polygons()'
- PR 171 will-moore 'Initial addition of integration tests'
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
- PR 177 jburel 'Replace fromstring by frombuffer'
Repository: ome/omero-figure
Excluded PRs:
- PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
- PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..3e8fa730
Previously merged:
- PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
- PR 635 dependabot[bot] 'Bump esbuild and vite'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Updating 7a798ce..bb94cf8
Previously merged:
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
- PR 76 will-moore 'Run cli deps'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Updating deab817..160d894
Previously merged:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..573db34
Previously merged:
- PR 227 jburel 'Replace tostring by tobytes'
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#452 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/452/)'
2025-06-17 00:52:41,201 [ scc.git] DEBUG [detached HEAD f6b090b] merge master -Dorg -Ssuccess-only
2025-06-17 00:52:41,201 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-06-17 00:52:41,201 [ scc.merge] INFO Repository: ome/omero-plugins
2025-06-17 00:52:41,201 [ scc.merge] INFO Already up to date.
2025-06-17 00:52:41,201 [ scc.merge] INFO
2025-06-17 00:52:41,201 [ scc.merge] INFO Merged PRs:
2025-06-17 00:52:41,201 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-06-17 00:52:41,201 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-06-17 00:52:41,201 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-06-17 00:52:41,201 [ scc.merge] INFO
2025-06-17 00:52:41,201 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-06-17 00:52:41,201 [ scc.merge] INFO Already up to date.
2025-06-17 00:52:41,202 [ scc.merge] INFO
2025-06-17 00:52:41,202 [ scc.merge] INFO
2025-06-17 00:52:41,202 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-06-17 00:52:41,202 [ scc.merge] INFO Excluded PRs:
2025-06-17 00:52:41,202 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-06-17 00:52:41,202 [ scc.merge] INFO Already up to date.
2025-06-17 00:52:41,202 [ scc.merge] INFO
2025-06-17 00:52:41,202 [ scc.merge] INFO
2025-06-17 00:52:41,202 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-06-17 00:52:41,202 [ scc.merge] INFO Excluded PRs:
2025-06-17 00:52:41,202 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-06-17 00:52:41,202 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-06-17 00:52:41,202 [ scc.merge] INFO Already up to date.
2025-06-17 00:52:41,202 [ scc.merge] INFO
2025-06-17 00:52:41,202 [ scc.merge] INFO Merged PRs:
2025-06-17 00:52:41,202 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-06-17 00:52:41,202 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-06-17 00:52:41,202 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-06-17 00:52:41,202 [ scc.merge] INFO
2025-06-17 00:52:41,202 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-06-17 00:52:41,202 [ scc.merge] INFO Excluded PRs:
2025-06-17 00:52:41,202 [ scc.merge] INFO - PR 174 will-moore 'Skip wells' (stage: draft)
2025-06-17 00:52:41,202 [ scc.merge] INFO - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
2025-06-17 00:52:41,202 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-06-17 00:52:41,202 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-06-17 00:52:41,202 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-06-17 00:52:41,202 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-06-17 00:52:41,202 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-06-17 00:52:41,202 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-06-17 00:52:41,202 [ scc.merge] INFO Updating 11d3587..d0c57bc
2025-06-17 00:52:41,202 [ scc.merge] INFO Previously merged:
2025-06-17 00:52:41,202 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-06-17 00:52:41,202 [ scc.merge] INFO - PR 173 will-moore 'Add test_export_plate_polygons()'
2025-06-17 00:52:41,202 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-06-17 00:52:41,202 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-17 00:52:41,202 [ scc.merge] INFO
2025-06-17 00:52:41,202 [ scc.merge] INFO Merged PRs:
2025-06-17 00:52:41,202 [ scc.merge] INFO - PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
2025-06-17 00:52:41,202 [ scc.merge] INFO - PR 177 jburel 'Replace fromstring by frombuffer'
2025-06-17 00:52:41,202 [ scc.merge] INFO
2025-06-17 00:52:41,202 [ scc.merge] INFO Repository: ome/omero-figure
2025-06-17 00:52:41,202 [ scc.merge] INFO Excluded PRs:
2025-06-17 00:52:41,203 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-06-17 00:52:41,203 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-06-17 00:52:41,203 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-06-17 00:52:41,203 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-06-17 00:52:41,203 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-06-17 00:52:41,203 [ scc.merge] INFO Previously merged:
2025-06-17 00:52:41,203 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-06-17 00:52:41,203 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-06-17 00:52:41,203 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-06-17 00:52:41,203 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-17 00:52:41,203 [ scc.merge] INFO
2025-06-17 00:52:41,203 [ scc.merge] INFO Merged PRs:
2025-06-17 00:52:41,203 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-06-17 00:52:41,203 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-06-17 00:52:41,203 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-06-17 00:52:41,203 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-06-17 00:52:41,203 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-06-17 00:52:41,203 [ scc.merge] INFO
2025-06-17 00:52:41,203 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-17 00:52:41,203 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-06-17 00:52:41,203 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-06-17 00:52:41,203 [ scc.merge] INFO
2025-06-17 00:52:41,203 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-06-17 00:52:41,203 [ scc.merge] INFO Already up to date.
2025-06-17 00:52:41,203 [ scc.merge] INFO
2025-06-17 00:52:41,203 [ scc.merge] INFO Merged PRs:
2025-06-17 00:52:41,203 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-06-17 00:52:41,203 [ scc.merge] INFO
2025-06-17 00:52:41,203 [ scc.merge] INFO Repository: ome/omero-gallery
2025-06-17 00:52:41,203 [ scc.merge] INFO Already up to date.
2025-06-17 00:52:41,203 [ scc.merge] INFO
2025-06-17 00:52:41,203 [ scc.merge] INFO Merged PRs:
2025-06-17 00:52:41,203 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-06-17 00:52:41,203 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-06-17 00:52:41,203 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-06-17 00:52:41,203 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-06-17 00:52:41,203 [ scc.merge] INFO
2025-06-17 00:52:41,203 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-17 00:52:41,203 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-06-17 00:52:41,203 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-06-17 00:52:41,203 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-06-17 00:52:41,203 [ scc.merge] INFO
2025-06-17 00:52:41,203 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-06-17 00:52:41,204 [ scc.merge] INFO Excluded PRs:
2025-06-17 00:52:41,204 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-06-17 00:52:41,204 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-06-17 00:52:41,204 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-06-17 00:52:41,204 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-06-17 00:52:41,204 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-06-17 00:52:41,204 [ scc.merge] INFO Updating 7a798ce..bb94cf8
2025-06-17 00:52:41,204 [ scc.merge] INFO Previously merged:
2025-06-17 00:52:41,204 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-17 00:52:41,204 [ scc.merge] INFO
2025-06-17 00:52:41,204 [ scc.merge] INFO Merged PRs:
2025-06-17 00:52:41,204 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-06-17 00:52:41,204 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-06-17 00:52:41,204 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-06-17 00:52:41,204 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-06-17 00:52:41,204 [ scc.merge] INFO
2025-06-17 00:52:41,204 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-17 00:52:41,204 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-06-17 00:52:41,204 [ scc.merge] INFO
2025-06-17 00:52:41,204 [ scc.merge] INFO Repository: ome/omero-mapr
2025-06-17 00:52:41,204 [ scc.merge] INFO Excluded PRs:
2025-06-17 00:52:41,204 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-06-17 00:52:41,204 [ scc.merge] INFO Already up to date.
2025-06-17 00:52:41,204 [ scc.merge] INFO
2025-06-17 00:52:41,204 [ scc.merge] INFO Merged PRs:
2025-06-17 00:52:41,204 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-06-17 00:52:41,204 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-17 00:52:41,204 [ scc.merge] INFO
2025-06-17 00:52:41,204 [ scc.merge] INFO Repository: ome/omero-metadata
2025-06-17 00:52:41,204 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-06-17 00:52:41,204 [ scc.merge] INFO Previously merged:
2025-06-17 00:52:41,204 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-17 00:52:41,204 [ scc.merge] INFO
2025-06-17 00:52:41,204 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-17 00:52:41,204 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-06-17 00:52:41,204 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-06-17 00:52:41,204 [ scc.merge] INFO
2025-06-17 00:52:41,204 [ scc.merge] INFO Repository: ome/omero-parade
2025-06-17 00:52:41,204 [ scc.merge] INFO Excluded PRs:
2025-06-17 00:52:41,204 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-06-17 00:52:41,204 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-06-17 00:52:41,204 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-06-17 00:52:41,204 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-06-17 00:52:41,205 [ scc.merge] INFO Already up to date.
2025-06-17 00:52:41,205 [ scc.merge] INFO
2025-06-17 00:52:41,205 [ scc.merge] INFO Merged PRs:
2025-06-17 00:52:41,205 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-06-17 00:52:41,205 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-06-17 00:52:41,205 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-17 00:52:41,205 [ scc.merge] INFO
2025-06-17 00:52:41,205 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-06-17 00:52:41,205 [ scc.merge] INFO Already up to date.
2025-06-17 00:52:41,205 [ scc.merge] INFO
2025-06-17 00:52:41,205 [ scc.merge] INFO
2025-06-17 00:52:41,205 [ scc.merge] INFO Repository: ome/omero-rois
2025-06-17 00:52:41,205 [ scc.merge] INFO Excluded PRs:
2025-06-17 00:52:41,205 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-06-17 00:52:41,205 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-06-17 00:52:41,205 [ scc.merge] INFO Already up to date.
2025-06-17 00:52:41,205 [ scc.merge] INFO
2025-06-17 00:52:41,205 [ scc.merge] INFO
2025-06-17 00:52:41,205 [ scc.merge] INFO Repository: ome/omero-signup
2025-06-17 00:52:41,205 [ scc.merge] INFO Already up to date.
2025-06-17 00:52:41,205 [ scc.merge] INFO
2025-06-17 00:52:41,205 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-17 00:52:41,205 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-06-17 00:52:41,205 [ scc.merge] INFO
2025-06-17 00:52:41,205 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-06-17 00:52:41,205 [ scc.merge] INFO Excluded PRs:
2025-06-17 00:52:41,205 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-06-17 00:52:41,205 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-06-17 00:52:41,205 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-06-17 00:52:41,205 [ scc.merge] INFO Already up to date.
2025-06-17 00:52:41,205 [ scc.merge] INFO
2025-06-17 00:52:41,205 [ scc.merge] INFO Merged PRs:
2025-06-17 00:52:41,205 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-06-17 00:52:41,205 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-06-17 00:52:41,205 [ scc.merge] INFO
2025-06-17 00:52:41,205 [ scc.merge] INFO Repository: ome/omero-upload
2025-06-17 00:52:41,205 [ scc.merge] INFO Already up to date.
2025-06-17 00:52:41,205 [ scc.merge] INFO
2025-06-17 00:52:41,205 [ scc.merge] INFO
2025-06-17 00:52:41,205 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-06-17 00:52:41,205 [ scc.merge] INFO Updating deab817..160d894
2025-06-17 00:52:41,205 [ scc.merge] INFO Previously merged:
2025-06-17 00:52:41,205 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-06-17 00:52:41,206 [ scc.merge] INFO
2025-06-17 00:52:41,206 [ scc.merge] INFO
2025-06-17 00:52:41,206 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-06-17 00:52:41,206 [ scc.merge] INFO Excluded PRs:
2025-06-17 00:52:41,206 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-06-17 00:52:41,206 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-06-17 00:52:41,206 [ scc.merge] INFO Already up to date.
2025-06-17 00:52:41,206 [ scc.merge] INFO
2025-06-17 00:52:41,206 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-17 00:52:41,206 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-06-17 00:52:41,206 [ scc.merge] INFO
2025-06-17 00:52:41,206 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-06-17 00:52:41,206 [ scc.merge] INFO Already up to date.
2025-06-17 00:52:41,206 [ scc.merge] INFO
2025-06-17 00:52:41,206 [ scc.merge] INFO
2025-06-17 00:52:41,206 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-06-17 00:52:41,206 [ scc.merge] INFO Already up to date.
2025-06-17 00:52:41,206 [ scc.merge] INFO
2025-06-17 00:52:41,206 [ scc.merge] INFO
2025-06-17 00:52:41,206 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-06-17 00:52:41,206 [ scc.merge] INFO Already up to date.
2025-06-17 00:52:41,206 [ scc.merge] INFO
2025-06-17 00:52:41,206 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-17 00:52:41,206 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-06-17 00:52:41,206 [ scc.merge] INFO
2025-06-17 00:52:41,206 [ scc.merge] INFO Repository: ome/scripts
2025-06-17 00:52:41,206 [ scc.merge] INFO Excluded PRs:
2025-06-17 00:52:41,206 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-06-17 00:52:41,206 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-06-17 00:52:41,206 [ scc.merge] INFO Updating 4b4c755..573db34
2025-06-17 00:52:41,206 [ scc.merge] INFO Previously merged:
2025-06-17 00:52:41,206 [ scc.merge] INFO - PR 227 jburel 'Replace tostring by tobytes'
2025-06-17 00:52:41,206 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-06-17 00:52:41,206 [ scc.merge] INFO
2025-06-17 00:52:41,206 [ scc.merge] INFO Merged PRs:
2025-06-17 00:52:41,206 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-06-17 00:52:41,206 [ scc.merge] INFO
2025-06-17 00:52:41,206 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-17 00:52:41,206 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-06-17 00:52:41,206 [ scc.merge] INFO
2025-06-17 00:52:41,206 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-06-17 00:52:41,207 [ scc.git] DEBUG Calling 'git remote'
2025-06-17 00:52:41,209 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-06-17 00:52:41,209 [ scc.git] DEBUG Calling 'git remote'
2025-06-17 00:52:41,211 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:41,211 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-06-17 00:52:41,211 [ scc.git] DEBUG Calling 'git remote'
2025-06-17 00:52:41,213 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:41,213 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-06-17 00:52:41,213 [ scc.git] DEBUG Calling 'git remote'
2025-06-17 00:52:41,215 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:41,215 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-06-17 00:52:41,216 [ scc.git] DEBUG Calling 'git remote'
2025-06-17 00:52:41,218 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:41,218 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-06-17 00:52:41,218 [ scc.git] DEBUG Calling 'git remote'
2025-06-17 00:52:41,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:41,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-06-17 00:52:41,220 [ scc.git] DEBUG Calling 'git remote'
2025-06-17 00:52:41,222 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:41,222 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-06-17 00:52:41,222 [ scc.git] DEBUG Calling 'git remote'
2025-06-17 00:52:41,224 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:41,224 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-06-17 00:52:41,224 [ scc.git] DEBUG Calling 'git remote'
2025-06-17 00:52:41,226 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:41,227 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-06-17 00:52:41,227 [ scc.git] DEBUG Calling 'git remote'
2025-06-17 00:52:41,229 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:41,229 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-06-17 00:52:41,229 [ scc.git] DEBUG Calling 'git remote'
2025-06-17 00:52:41,231 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:41,231 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-06-17 00:52:41,231 [ scc.git] DEBUG Calling 'git remote'
2025-06-17 00:52:41,233 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:41,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-06-17 00:52:41,234 [ scc.git] DEBUG Calling 'git remote'
2025-06-17 00:52:41,236 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:41,236 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-06-17 00:52:41,236 [ scc.git] DEBUG Calling 'git remote'
2025-06-17 00:52:41,238 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:41,238 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-06-17 00:52:41,238 [ scc.git] DEBUG Calling 'git remote'
2025-06-17 00:52:41,240 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:41,240 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-06-17 00:52:41,240 [ scc.git] DEBUG Calling 'git remote'
2025-06-17 00:52:41,242 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:41,242 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-06-17 00:52:41,242 [ scc.git] DEBUG Calling 'git remote'
2025-06-17 00:52:41,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:41,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-06-17 00:52:41,245 [ scc.git] DEBUG Calling 'git remote'
2025-06-17 00:52:41,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:41,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-06-17 00:52:41,248 [ scc.git] DEBUG Calling 'git remote'
2025-06-17 00:52:41,250 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:41,250 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-06-17 00:52:41,250 [ scc.git] DEBUG Calling 'git remote'
2025-06-17 00:52:41,252 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:41,252 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-06-17 00:52:41,252 [ scc.git] DEBUG Calling 'git remote'
2025-06-17 00:52:41,254 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:41,254 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-06-17 00:52:41,254 [ scc.git] DEBUG Calling 'git remote'
2025-06-17 00:52:41,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-17 00:52:41,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-06-17 00:52:41,257 [ scc.git] DEBUG Calling 'git remote'
2025-06-17 00:52:41,259 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.10.0 to 5.10.4-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD 36f8a52] 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 c8f3fe4] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-06-17 00:53:28,962 [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-06-17 00:53:38,429 [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-06-17 00:53:40,970 [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-06-17 00:53:45,835 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-06-17 00:54:26,443 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/eb00aee0/images/svgs/logo.svg){kind=logo}
