Skipping 216 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-06-22 00:28:29,042 [ scc.git] DEBUG HEAD is now at 37d94c9 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-06-22 00:28:29,238 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:29,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:28:29,411 [ scc.git] DEBUG Calling 'git merge-base bb94cf8da960e3283090038b04432f301560f5e4 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-06-22 00:28:29,414 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..bb94cf8da960e3283090038b04432f301560f5e4'
2025-06-22 00:28:29,417 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#457](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-06-22 00:28:29,419 [ scc.config] DEBUG Found github.token
2025-06-22 00:28:29,419 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-06-22 00:28:29,419 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-22 00:28:29,460 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:28:29,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:28:29,463 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-22 00:28:29,503 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-22 00:28:29,510 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb377543590> has no local changes
2025-06-22 00:28:29,510 [ 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#457 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/)'
2025-06-22 00:28:29,519 [ scc.git] DEBUG [detached HEAD c19c5b6] merge master -Dorg -Ssuccess-only
2025-06-22 00:28:29,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:28:29,520 [ scc.repo] DEBUG ## PRs found:
2025-06-22 00:28:29,662 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:29,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-06-22 00:28:30,192 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:30,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-06-22 00:28:30,657 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:30,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-06-22 00:28:31,203 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:31,446 [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-22 00:28:31,697 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:31,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-06-22 00:28:32,207 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:32,385 [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-22 00:28:32,385 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-22 00:28:32,636 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:32,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-06-22 00:28:33,097 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:33,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-06-22 00:28:33,565 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:33,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-06-22 00:28:34,088 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:34,299 [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-22 00:28:34,550 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:34,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-06-22 00:28:35,070 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:35,262 [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-22 00:28:35,263 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-06-22 00:28:35,263 [ scc.repo] DEBUG ## Branches found:
2025-06-22 00:28:35,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-06-22 00:28:35,263 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:28:35,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:28:35,266 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-22 00:28:35,268 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-22 00:28:35,268 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-22 00:28:35,271 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-22 00:28:35,274 [ scc.git] DEBUG Already up to date.
2025-06-22 00:28:35,274 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-06-22 00:28:35,610 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-06-22 00:28:35,610 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-06-22 00:28:35,615 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-06-22 00:28:35,885 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-06-22 00:28:35,886 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-06-22 00:28:35,890 [ scc.git] DEBUG ## Unique users: []
2025-06-22 00:28:35,890 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:28:35,890 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:28:35,893 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-06-22 00:28:35,897 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:28:35,899 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-06-22 00:28:35,909 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-22 00:28:35,913 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-06-22 00:28:35,913 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-06-22 00:28:35,913 [ scc.git] DEBUG requirements.txt | 2 +-
2025-06-22 00:28:35,913 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-06-22 00:28:35,913 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-06-22 00:28:35,913 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-06-22 00:28:35,914 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:36,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:28:36,066 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-06-22 00:28:36,070 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:28:36,072 [ 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-22 00:28:36,081 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-22 00:28:36,084 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-06-22 00:28:36,084 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-06-22 00:28:36,317 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:36,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:28:36,476 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-22 00:28:36,518 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:28:36,519 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:28:36,521 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-22 00:28:36,558 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-22 00:28:36,562 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb3776419d0> has no local changes
2025-06-22 00:28:36,562 [ 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#457 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/)'
2025-06-22 00:28:36,568 [ scc.git] DEBUG [detached HEAD 3b1c91b] merge master -Dorg -Ssuccess-only
2025-06-22 00:28:36,569 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:28:36,569 [ scc.repo] DEBUG ## PRs found:
2025-06-22 00:28:36,727 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:37,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-06-22 00:28:37,285 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:37,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-06-22 00:28:37,748 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:37,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-06-22 00:28:38,219 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:38,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-06-22 00:28:38,735 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:38,934 [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-22 00:28:39,186 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:39,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-06-22 00:28:39,646 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:39,828 [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-22 00:28:39,828 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-06-22 00:28:40,079 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:40,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-06-22 00:28:40,558 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:40,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-06-22 00:28:41,057 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:41,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-06-22 00:28:41,583 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:41,794 [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-22 00:28:42,046 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:42,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-06-22 00:28:42,587 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:42,763 [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-22 00:28:42,763 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-06-22 00:28:42,763 [ scc.repo] DEBUG ## Branches found:
2025-06-22 00:28:42,763 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-06-22 00:28:42,764 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:28:42,764 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:28:42,766 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-22 00:28:42,768 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-22 00:28:42,769 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-22 00:28:42,772 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-22 00:28:42,780 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-06-22 00:28:43,014 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:43,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-06-22 00:28:43,425 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-06-22 00:28:43,724 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-06-22 00:28:43,724 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-06-22 00:28:43,728 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-06-22 00:28:44,046 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-06-22 00:28:44,046 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-06-22 00:28:44,051 [ scc.git] DEBUG ## Unique users: []
2025-06-22 00:28:44,051 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:28:44,051 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:28:44,053 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-06-22 00:28:44,058 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:28:44,060 [ 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-22 00:28:44,073 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-06-22 00:28:44,074 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-06-22 00:28:44,074 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-06-22 00:28:44,074 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-06-22 00:28:44,074 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-06-22 00:28:44,074 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-06-22 00:28:44,077 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-06-22 00:28:44,081 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-06-22 00:28:44,083 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:44,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:28:44,315 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-06-22 00:28:44,320 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-06-22 00:28:44,323 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#457](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-06-22 00:28:44,325 [ scc.config] DEBUG Found github.token
2025-06-22 00:28:44,325 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-06-22 00:28:44,325 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-06-22 00:28:44,329 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:28:44,332 [ 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-22 00:28:44,347 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-06-22 00:28:44,347 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-06-22 00:28:44,347 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-06-22 00:28:44,347 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-06-22 00:28:44,348 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-06-22 00:28:44,351 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-06-22 00:28:44,356 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-06-22 00:28:44,566 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:44,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:28:44,729 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-06-22 00:28:44,734 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-06-22 00:28:44,737 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#457](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/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-22 00:28:44,739 [ scc.config] DEBUG Found github.token
2025-06-22 00:28:44,739 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-06-22 00:28:44,739 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-22 00:28:44,780 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:28:44,780 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:28:44,782 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-22 00:28:44,823 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-22 00:28:44,827 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb3775f5b10> has no local changes
2025-06-22 00:28:44,827 [ 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#457 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/)'
2025-06-22 00:28:44,834 [ scc.git] DEBUG [detached HEAD 24b1a4b] merge master -Dorg -Ssuccess-only
2025-06-22 00:28:44,835 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:28:44,835 [ scc.repo] DEBUG ## PRs found:
2025-06-22 00:28:44,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:45,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-06-22 00:28:45,661 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:45,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-06-22 00:28:46,141 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:46,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-06-22 00:28:46,675 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:46,906 [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-22 00:28:47,157 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:47,410 [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-22 00:28:47,661 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:47,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-06-22 00:28:48,141 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:48,322 [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-22 00:28:48,322 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-22 00:28:48,573 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:48,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-06-22 00:28:48,824 [ scc.repo] DEBUG # ... Include label: dependencies
2025-06-22 00:28:49,075 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:49,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-06-22 00:28:49,679 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:49,937 [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-22 00:28:50,189 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:50,461 [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-22 00:28:50,713 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:50,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-06-22 00:28:51,174 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:51,358 [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-22 00:28:51,358 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-06-22 00:28:51,609 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:51,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-06-22 00:28:51,857 [ scc.repo] DEBUG # ... Include label: dependencies
2025-06-22 00:28:52,108 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:52,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-06-22 00:28:52,695 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:52,933 [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-22 00:28:53,185 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:53,429 [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-22 00:28:53,681 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:53,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-06-22 00:28:54,238 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:54,436 [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-22 00:28:54,437 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-06-22 00:28:54,688 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:54,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-06-22 00:28:55,165 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:55,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-06-22 00:28:55,661 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:55,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-06-22 00:28:56,117 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:56,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-06-22 00:28:56,590 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:56,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-06-22 00:28:57,059 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:57,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-06-22 00:28:57,540 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:57,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-06-22 00:28:57,755 [ scc.repo] DEBUG ## Branches found:
2025-06-22 00:28:57,756 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-06-22 00:28:57,756 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:28:57,756 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:28:57,758 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-22 00:28:57,761 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-22 00:28:57,761 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-22 00:28:57,764 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-22 00:28:57,767 [ scc.git] DEBUG Already up to date.
2025-06-22 00:28:57,767 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-06-22 00:28:58,072 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-06-22 00:28:58,072 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-06-22 00:28:58,077 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-06-22 00:28:58,357 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-06-22 00:28:58,357 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-06-22 00:28:58,361 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-06-22 00:28:58,615 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-06-22 00:28:58,615 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-06-22 00:28:58,619 [ scc.git] DEBUG ## Unique users: []
2025-06-22 00:28:58,619 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:28:58,619 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:28:58,621 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-06-22 00:28:58,624 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:28:58,626 [ 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-22 00:28:58,635 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-22 00:28:58,638 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-06-22 00:28:58,638 [ scc.git] DEBUG package.json | 2 +-
2025-06-22 00:28:58,638 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-06-22 00:28:58,639 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:58,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:28:58,830 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-06-22 00:28:58,833 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:28:58,836 [ 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-22 00:28:58,846 [ scc.git] DEBUG Auto-merging package-lock.json
2025-06-22 00:28:58,846 [ scc.git] DEBUG Auto-merging package.json
2025-06-22 00:28:58,847 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-22 00:28:58,851 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-06-22 00:28:58,851 [ scc.git] DEBUG package.json | 2 +-
2025-06-22 00:28:58,851 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-06-22 00:28:59,081 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:59,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:28:59,240 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-06-22 00:28:59,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:28:59,246 [ 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-22 00:28:59,255 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-22 00:28:59,258 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-06-22 00:28:59,258 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-06-22 00:28:59,491 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:28:59,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:28:59,652 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-22 00:28:59,693 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:28:59,693 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:28:59,695 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-22 00:28:59,735 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-22 00:28:59,739 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb3744228d0> has no local changes
2025-06-22 00:28:59,739 [ 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#457 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/)'
2025-06-22 00:28:59,746 [ scc.git] DEBUG [detached HEAD 7f37415] merge master -Dorg -Ssuccess-only
2025-06-22 00:28:59,747 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:28:59,747 [ scc.repo] DEBUG ## PRs found:
2025-06-22 00:28:59,903 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:00,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-06-22 00:29:00,088 [ scc.repo] DEBUG ## Branches found:
2025-06-22 00:29:00,088 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-06-22 00:29:00,088 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:00,088 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:00,091 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-22 00:29:00,094 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-22 00:29:00,094 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-22 00:29:00,097 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-22 00:29:00,099 [ scc.git] DEBUG Already up to date.
2025-06-22 00:29:00,100 [ scc.git] DEBUG ## Unique users: []
2025-06-22 00:29:00,100 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:00,100 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:00,102 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-22 00:29:00,142 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:00,143 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:00,145 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-22 00:29:00,183 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-22 00:29:00,186 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb377600490> has no local changes
2025-06-22 00:29:00,186 [ 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#457 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/)'
2025-06-22 00:29:00,192 [ scc.git] DEBUG [detached HEAD 87c68a5] merge master -Dorg -Ssuccess-only
2025-06-22 00:29:00,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:00,192 [ scc.repo] DEBUG ## PRs found:
2025-06-22 00:29:00,339 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:00,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-06-22 00:29:00,857 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:01,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-06-22 00:29:01,390 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:01,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-06-22 00:29:01,871 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:02,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-06-22 00:29:02,085 [ scc.repo] DEBUG ## Branches found:
2025-06-22 00:29:02,085 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-06-22 00:29:02,085 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:02,086 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:02,089 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-22 00:29:02,091 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-22 00:29:02,091 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-22 00:29:02,094 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-22 00:29:02,097 [ scc.git] DEBUG Already up to date.
2025-06-22 00:29:02,097 [ scc.git] DEBUG ## Unique users: []
2025-06-22 00:29:02,097 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:02,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:02,099 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-22 00:29:02,140 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:02,140 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:02,142 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-22 00:29:02,182 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-22 00:29:02,186 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb374414810> has no local changes
2025-06-22 00:29:02,186 [ 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#457 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/)'
2025-06-22 00:29:02,192 [ scc.git] DEBUG [detached HEAD 10ba796] merge master -Dorg -Ssuccess-only
2025-06-22 00:29:02,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:02,192 [ scc.repo] DEBUG ## PRs found:
2025-06-22 00:29:02,336 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:02,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-06-22 00:29:02,910 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:03,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-06-22 00:29:03,432 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:03,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-06-22 00:29:03,896 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:04,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-06-22 00:29:04,458 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:05,002 [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-22 00:29:05,254 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:05,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-06-22 00:29:05,818 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:06,003 [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-22 00:29:06,003 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-06-22 00:29:06,003 [ scc.repo] DEBUG ## Branches found:
2025-06-22 00:29:06,003 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-06-22 00:29:06,003 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:06,003 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:06,007 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-22 00:29:06,009 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-22 00:29:06,009 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-22 00:29:06,012 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-22 00:29:06,015 [ scc.git] DEBUG Already up to date.
2025-06-22 00:29:06,015 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-06-22 00:29:06,307 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-06-22 00:29:06,307 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-06-22 00:29:06,312 [ scc.git] DEBUG ## Unique users: []
2025-06-22 00:29:06,312 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:06,312 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:06,315 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-06-22 00:29:06,318 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:06,320 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-06-22 00:29:06,329 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-06-22 00:29:06,329 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-06-22 00:29:06,330 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-06-22 00:29:06,330 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-06-22 00:29:06,330 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-06-22 00:29:06,330 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-06-22 00:29:06,330 [ scc.git] DEBUG Auto-merging setup.py
2025-06-22 00:29:06,330 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-06-22 00:29:06,330 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-06-22 00:29:06,330 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-06-22 00:29:06,333 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-06-22 00:29:06,337 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-06-22 00:29:06,338 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:06,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:06,494 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-06-22 00:29:06,497 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-06-22 00:29:06,500 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#457](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
- setup.py
--conflicts
2025-06-22 00:29:06,502 [ scc.config] DEBUG Found github.token
2025-06-22 00:29:06,502 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-06-22 00:29:06,502 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-22 00:29:06,541 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:06,541 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:06,544 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-22 00:29:06,582 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-22 00:29:06,586 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb377642690> has no local changes
2025-06-22 00:29:06,586 [ 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#457 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/)'
2025-06-22 00:29:06,592 [ scc.git] DEBUG [detached HEAD 41d757a] merge master -Dorg -Ssuccess-only
2025-06-22 00:29:06,592 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:06,593 [ scc.repo] DEBUG ## PRs found:
2025-06-22 00:29:06,745 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:07,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-06-22 00:29:07,325 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:07,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-06-22 00:29:07,857 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:08,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-06-22 00:29:08,415 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:08,690 [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-22 00:29:08,942 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:09,163 [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-22 00:29:09,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:09,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-06-22 00:29:09,975 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:10,159 [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-22 00:29:10,160 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-06-22 00:29:10,411 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:10,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-06-22 00:29:10,928 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:11,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-06-22 00:29:11,400 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:11,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-06-22 00:29:11,920 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:12,178 [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-22 00:29:12,429 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:12,703 [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-22 00:29:12,955 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:13,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-06-22 00:29:13,463 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:13,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-06-22 00:29:13,923 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:14,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-06-22 00:29:14,413 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:14,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-06-22 00:29:14,865 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:15,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-06-22 00:29:15,386 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:15,586 [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-22 00:29:15,838 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:16,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-06-22 00:29:16,396 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:16,585 [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-22 00:29:16,586 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-06-22 00:29:16,586 [ scc.repo] DEBUG ## Branches found:
2025-06-22 00:29:16,586 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-06-22 00:29:16,586 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:16,586 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:16,589 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-22 00:29:16,591 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-22 00:29:16,591 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-22 00:29:16,594 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-22 00:29:16,597 [ scc.git] DEBUG Already up to date.
2025-06-22 00:29:16,597 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-06-22 00:29:16,875 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-06-22 00:29:16,875 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-06-22 00:29:16,880 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-06-22 00:29:17,181 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-06-22 00:29:17,181 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-06-22 00:29:17,186 [ scc.git] DEBUG ## Unique users: []
2025-06-22 00:29:17,186 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:17,186 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:17,188 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-06-22 00:29:17,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:17,195 [ 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-22 00:29:17,207 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-22 00:29:17,211 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-06-22 00:29:17,211 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-06-22 00:29:17,211 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-06-22 00:29:17,211 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-06-22 00:29:17,211 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-06-22 00:29:17,211 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-06-22 00:29:17,211 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-06-22 00:29:17,211 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-06-22 00:29:17,211 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-06-22 00:29:17,212 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:17,212 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-06-22 00:29:17,212 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-06-22 00:29:17,212 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-06-22 00:29:17,212 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-06-22 00:29:17,212 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-06-22 00:29:17,213 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-06-22 00:29:17,213 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-06-22 00:29:17,213 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-06-22 00:29:17,213 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-06-22 00:29:17,213 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-06-22 00:29:17,213 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-06-22 00:29:17,213 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-06-22 00:29:17,213 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-06-22 00:29:17,213 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-06-22 00:29:17,213 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-06-22 00:29:17,213 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-06-22 00:29:17,213 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-06-22 00:29:17,213 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-06-22 00:29:17,213 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-06-22 00:29:17,213 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-06-22 00:29:17,213 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-06-22 00:29:17,213 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-06-22 00:29:17,213 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-06-22 00:29:17,213 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-06-22 00:29:17,213 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-06-22 00:29:17,213 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-06-22 00:29:17,213 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-06-22 00:29:17,213 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-06-22 00:29:17,213 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-06-22 00:29:17,213 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-06-22 00:29:17,213 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-06-22 00:29:17,213 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-06-22 00:29:17,213 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-06-22 00:29:17,213 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-06-22 00:29:17,213 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-06-22 00:29:17,213 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-06-22 00:29:17,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:17,373 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-06-22 00:29:17,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:17,380 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-06-22 00:29:17,391 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-22 00:29:17,393 [ scc.git] DEBUG docker | 1 +
2025-06-22 00:29:17,394 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-06-22 00:29:17,624 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:17,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:17,790 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-22 00:29:17,832 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:17,832 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:17,834 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-22 00:29:17,875 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-22 00:29:17,879 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb37443a010> has no local changes
2025-06-22 00:29:17,879 [ 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#457 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/)'
2025-06-22 00:29:17,886 [ scc.git] DEBUG [detached HEAD e6fb66b] merge master -Dorg -Ssuccess-only
2025-06-22 00:29:17,886 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:17,887 [ scc.repo] DEBUG ## PRs found:
2025-06-22 00:29:18,041 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:18,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-06-22 00:29:18,302 [ scc.repo] DEBUG ## Branches found:
2025-06-22 00:29:18,302 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-06-22 00:29:18,302 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:18,302 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:18,304 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-22 00:29:18,307 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-22 00:29:18,307 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-22 00:29:18,310 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-22 00:29:18,313 [ scc.git] DEBUG Already up to date.
2025-06-22 00:29:18,313 [ scc.git] DEBUG ## Unique users: []
2025-06-22 00:29:18,313 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:18,313 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:18,315 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-22 00:29:18,352 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:18,352 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:18,355 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-22 00:29:18,393 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-22 00:29:18,397 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb37761e550> has no local changes
2025-06-22 00:29:18,397 [ 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#457 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/)'
2025-06-22 00:29:18,403 [ scc.git] DEBUG [detached HEAD 5989ab8] merge master -Dorg -Ssuccess-only
2025-06-22 00:29:18,403 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:18,403 [ scc.repo] DEBUG ## PRs found:
2025-06-22 00:29:18,553 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:18,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2025-06-22 00:29:18,732 [ scc.repo] DEBUG ## Branches found:
2025-06-22 00:29:18,732 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-06-22 00:29:18,733 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:18,733 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:18,735 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-22 00:29:18,737 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-22 00:29:18,737 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-22 00:29:18,740 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-22 00:29:18,748 [ scc.git] DEBUG Updating deab817..160d894
2025-06-22 00:29:18,984 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:19,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls/20 HTTP/1.1" 200 None
2025-06-22 00:29:19,389 [ scc.git] DEBUG ## Unique users: []
2025-06-22 00:29:19,389 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:19,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:19,392 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-22 00:29:19,432 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:19,432 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:19,435 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-22 00:29:19,474 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-22 00:29:19,477 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb379db42d0> has no local changes
2025-06-22 00:29:19,477 [ 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#457 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/)'
2025-06-22 00:29:19,483 [ scc.git] DEBUG [detached HEAD 8bab547] merge master -Dorg -Ssuccess-only
2025-06-22 00:29:19,483 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:19,483 [ scc.git] INFO Overriding base-branch from master to main
2025-06-22 00:29:19,484 [ scc.repo] DEBUG ## PRs found:
2025-06-22 00:29:19,640 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:19,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-06-22 00:29:20,159 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:20,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-06-22 00:29:20,658 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:20,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-06-22 00:29:21,180 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:21,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-06-22 00:29:21,721 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:21,960 [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-22 00:29:22,212 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:22,455 [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-22 00:29:22,706 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:22,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-06-22 00:29:23,196 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:23,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-06-22 00:29:23,657 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:23,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-06-22 00:29:24,194 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:24,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-06-22 00:29:24,736 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:24,970 [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-22 00:29:25,221 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:25,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-06-22 00:29:25,766 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:25,954 [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-22 00:29:25,954 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-06-22 00:29:25,954 [ scc.repo] DEBUG ## Branches found:
2025-06-22 00:29:25,954 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-06-22 00:29:25,955 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:25,955 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:25,957 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-06-22 00:29:25,960 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-22 00:29:25,960 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-06-22 00:29:25,963 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-06-22 00:29:25,966 [ scc.git] DEBUG Already up to date.
2025-06-22 00:29:25,966 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-06-22 00:29:26,245 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-06-22 00:29:26,245 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-06-22 00:29:26,249 [ scc.git] DEBUG ## Unique users: []
2025-06-22 00:29:26,249 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:26,249 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:26,251 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-06-22 00:29:26,255 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:26,257 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-06-22 00:29:26,265 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-06-22 00:29:26,265 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-06-22 00:29:26,265 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-06-22 00:29:26,265 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-06-22 00:29:26,268 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-06-22 00:29:26,272 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-06-22 00:29:26,273 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:26,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:26,433 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-06-22 00:29:26,436 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-06-22 00:29:26,439 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#457](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-06-22 00:29:26,441 [ scc.config] DEBUG Found github.token
2025-06-22 00:29:26,441 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-06-22 00:29:26,441 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-22 00:29:26,483 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:26,483 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:26,485 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-22 00:29:26,523 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-22 00:29:26,526 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb379fb6650> has no local changes
2025-06-22 00:29:26,526 [ 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#457 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/)'
2025-06-22 00:29:26,533 [ scc.git] DEBUG [detached HEAD be0593c] merge master -Dorg -Ssuccess-only
2025-06-22 00:29:26,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:26,533 [ scc.repo] DEBUG ## PRs found:
2025-06-22 00:29:26,685 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:26,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-06-22 00:29:26,883 [ scc.repo] DEBUG ## Branches found:
2025-06-22 00:29:26,883 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-06-22 00:29:26,883 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:26,883 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:26,886 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-22 00:29:26,888 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-22 00:29:26,888 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-22 00:29:26,891 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-22 00:29:26,894 [ scc.git] DEBUG Already up to date.
2025-06-22 00:29:26,894 [ scc.git] DEBUG ## Unique users: []
2025-06-22 00:29:26,894 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:26,894 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:26,896 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-22 00:29:26,937 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:26,938 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:26,940 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-22 00:29:26,979 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-22 00:29:26,982 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb374491590> has no local changes
2025-06-22 00:29:26,982 [ 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#457 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/)'
2025-06-22 00:29:26,988 [ scc.git] DEBUG [detached HEAD b6862bb] merge master -Dorg -Ssuccess-only
2025-06-22 00:29:26,988 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:26,988 [ scc.repo] DEBUG ## PRs found:
2025-06-22 00:29:27,134 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:27,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-06-22 00:29:27,327 [ scc.repo] DEBUG ## Branches found:
2025-06-22 00:29:27,327 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-06-22 00:29:27,327 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:27,327 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:27,330 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-22 00:29:27,332 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-22 00:29:27,332 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-22 00:29:27,335 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-22 00:29:27,338 [ scc.git] DEBUG Already up to date.
2025-06-22 00:29:27,338 [ scc.git] DEBUG ## Unique users: []
2025-06-22 00:29:27,338 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:27,338 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:27,340 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-22 00:29:27,379 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:27,379 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:27,381 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-22 00:29:27,420 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-22 00:29:27,423 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb37761d490> has no local changes
2025-06-22 00:29:27,423 [ 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#457 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/)'
2025-06-22 00:29:27,430 [ scc.git] DEBUG [detached HEAD a333d25] merge master -Dorg -Ssuccess-only
2025-06-22 00:29:27,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:27,430 [ scc.repo] DEBUG ## PRs found:
2025-06-22 00:29:27,578 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:27,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-06-22 00:29:28,094 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:28,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-06-22 00:29:28,576 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:28,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-06-22 00:29:29,054 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:29,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-06-22 00:29:29,550 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:29,763 [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-22 00:29:30,015 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:30,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-06-22 00:29:30,475 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:30,657 [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-22 00:29:30,657 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-06-22 00:29:30,657 [ scc.repo] DEBUG ## Branches found:
2025-06-22 00:29:30,657 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-06-22 00:29:30,658 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:30,658 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:30,660 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-22 00:29:30,663 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-22 00:29:30,663 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-22 00:29:30,665 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-22 00:29:30,668 [ scc.git] DEBUG Already up to date.
2025-06-22 00:29:30,669 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-06-22 00:29:30,945 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-06-22 00:29:30,945 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-06-22 00:29:30,950 [ scc.git] DEBUG ## Unique users: []
2025-06-22 00:29:30,950 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:30,950 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:30,952 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-06-22 00:29:30,955 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:30,957 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-06-22 00:29:30,966 [ scc.git] DEBUG Auto-merging Dockerfile
2025-06-22 00:29:30,966 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-06-22 00:29:30,966 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-06-22 00:29:30,967 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-06-22 00:29:30,970 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-06-22 00:29:30,974 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-06-22 00:29:30,976 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:31,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:31,155 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-06-22 00:29:31,158 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-06-22 00:29:31,160 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#457](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-06-22 00:29:31,162 [ scc.config] DEBUG Found github.token
2025-06-22 00:29:31,162 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-06-22 00:29:31,162 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-22 00:29:31,203 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:31,204 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:31,206 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-22 00:29:31,244 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-22 00:29:31,248 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb3744d4690> has no local changes
2025-06-22 00:29:31,248 [ 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#457 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/)'
2025-06-22 00:29:31,254 [ scc.git] DEBUG [detached HEAD a06a426] merge master -Dorg -Ssuccess-only
2025-06-22 00:29:31,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:31,255 [ scc.git] INFO Overriding base-branch from master to develop
2025-06-22 00:29:31,255 [ scc.repo] DEBUG ## PRs found:
2025-06-22 00:29:31,406 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:31,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-06-22 00:29:31,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:32,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-06-22 00:29:32,438 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:32,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-06-22 00:29:32,903 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:33,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-06-22 00:29:33,475 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:33,726 [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-22 00:29:33,977 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:34,198 [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-22 00:29:34,449 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:34,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-06-22 00:29:34,917 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:35,101 [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-22 00:29:35,101 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-06-22 00:29:35,352 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:35,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-06-22 00:29:35,842 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:36,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-06-22 00:29:36,312 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:36,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-06-22 00:29:36,822 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:37,027 [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-22 00:29:37,278 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:37,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-06-22 00:29:37,721 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:37,904 [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-22 00:29:37,905 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-06-22 00:29:38,156 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:38,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-06-22 00:29:38,640 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:38,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-06-22 00:29:39,122 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:39,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-06-22 00:29:39,609 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:39,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-06-22 00:29:39,831 [ scc.repo] DEBUG ## Branches found:
2025-06-22 00:29:39,831 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-06-22 00:29:39,831 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:39,831 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:39,834 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-06-22 00:29:39,836 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-22 00:29:39,836 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-06-22 00:29:39,839 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-06-22 00:29:39,850 [ scc.git] DEBUG Updating 4b4c755..573db34
2025-06-22 00:29:40,081 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:40,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/227 HTTP/1.1" 200 None
2025-06-22 00:29:40,731 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:41,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-06-22 00:29:41,132 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-06-22 00:29:41,436 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-06-22 00:29:41,436 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-06-22 00:29:41,440 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-06-22 00:29:41,756 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-06-22 00:29:41,756 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-06-22 00:29:41,760 [ scc.git] DEBUG ## Unique users: []
2025-06-22 00:29:41,761 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:41,761 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:41,763 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-06-22 00:29:41,769 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:41,771 [ 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-22 00:29:41,782 [ 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-22 00:29:41,782 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-06-22 00:29:41,783 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-06-22 00:29:41,785 [ scc.git] DEBUG Calling 'git reset --hard 573db340d5d1429fa17c7e486206948412a7c150'
2025-06-22 00:29:41,789 [ scc.git] DEBUG HEAD is now at 573db34 Bump version: 5.9.1 → 5.9.2.dev0
2025-06-22 00:29:41,790 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:41,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:41,943 [ scc.git] DEBUG Calling 'git merge-base 573db340d5d1429fa17c7e486206948412a7c150 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-06-22 00:29:41,948 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..573db340d5d1429fa17c7e486206948412a7c150'
2025-06-22 00:29:41,952 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#457](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-06-22 00:29:41,954 [ scc.config] DEBUG Found github.token
2025-06-22 00:29:41,954 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-06-22 00:29:41,954 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-06-22 00:29:41,959 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:41,961 [ 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-22 00:29:41,971 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-22 00:29:41,974 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-06-22 00:29:41,974 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-06-22 00:29:42,193 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:42,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:42,390 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-22 00:29:42,431 [ scc.git] DEBUG Get sha1 of %s
2025-06-22 00:29:42,431 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-22 00:29:42,433 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-22 00:29:42,471 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-22 00:29:42,475 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb374318dd0> has no local changes
2025-06-22 00:29:42,475 [ 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#457 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/)'
2025-06-22 00:29:42,481 [ scc.git] DEBUG [detached HEAD 93baec0] merge master -Dorg -Ssuccess-only
2025-06-22 00:29:42,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:42,481 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-22 00:29:42,558 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-06-22 00:29:42,641 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:42,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:42,804 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-06-22 00:29:42,806 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-06-22 00:29:43,050 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:43,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:43,221 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-06-22 00:29:43,223 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-06-22 00:29:43,467 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:43,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:43,675 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-06-22 00:29:43,677 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-06-22 00:29:43,922 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:44,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:44,087 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-06-22 00:29:44,331 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:44,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:44,506 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-06-22 00:29:44,508 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-06-22 00:29:44,753 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:44,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:44,917 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-06-22 00:29:44,918 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-06-22 00:29:45,163 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:45,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:45,326 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-06-22 00:29:45,328 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-06-22 00:29:45,572 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:45,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:45,748 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-06-22 00:29:45,750 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-06-22 00:29:45,995 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:46,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:46,159 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-06-22 00:29:46,161 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-06-22 00:29:46,405 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:46,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:46,577 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-06-22 00:29:46,579 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-06-22 00:29:46,824 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:46,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:46,987 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-06-22 00:29:46,989 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-06-22 00:29:47,234 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:47,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:47,414 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-06-22 00:29:47,416 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-06-22 00:29:47,661 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:47,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:47,841 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-06-22 00:29:48,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:48,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:48,249 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-06-22 00:29:48,494 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:48,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:48,664 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-06-22 00:29:48,666 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-06-22 00:29:48,911 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:49,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:49,097 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-06-22 00:29:49,342 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:49,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:49,513 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-06-22 00:29:49,758 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:49,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:49,927 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-06-22 00:29:49,929 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-06-22 00:29:50,174 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:50,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:50,334 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-06-22 00:29:50,336 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-06-22 00:29:50,581 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:50,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:50,743 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-06-22 00:29:50,745 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-06-22 00:29:50,989 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:51,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:51,151 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-06-22 00:29:51,153 [ scc.config] DEBUG Found submodule.scripts.url
2025-06-22 00:29:51,398 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-22 00:29:51,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-22 00:29:51,557 [ scc.config] DEBUG Found submodule.scripts.branch
2025-06-22 00:29:51,557 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-22 00:29:51,651 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb3777f5bd0> has local changes
2025-06-22 00:29:51,651 [ 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..64321ac
Previously merged:
- PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
- PR 147 will-moore 'Name option'
- PR 173 will-moore 'Add test_export_plate_polygons()'
- PR 171 will-moore 'Initial addition of integration tests'
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 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#457 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/457/)'
2025-06-22 00:29:51,664 [ scc.git] DEBUG [detached HEAD 28eff31] merge master -Dorg -Ssuccess-only
2025-06-22 00:29:51,664 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-06-22 00:29:51,664 [ scc.merge] INFO Repository: ome/omero-plugins
2025-06-22 00:29:51,664 [ scc.merge] INFO Already up to date.
2025-06-22 00:29:51,664 [ scc.merge] INFO
2025-06-22 00:29:51,664 [ scc.merge] INFO Merged PRs:
2025-06-22 00:29:51,664 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-06-22 00:29:51,664 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-06-22 00:29:51,664 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-06-22 00:29:51,664 [ scc.merge] INFO
2025-06-22 00:29:51,664 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-06-22 00:29:51,664 [ scc.merge] INFO Already up to date.
2025-06-22 00:29:51,664 [ scc.merge] INFO
2025-06-22 00:29:51,664 [ scc.merge] INFO
2025-06-22 00:29:51,665 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-06-22 00:29:51,665 [ scc.merge] INFO Excluded PRs:
2025-06-22 00:29:51,665 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-06-22 00:29:51,665 [ scc.merge] INFO Already up to date.
2025-06-22 00:29:51,665 [ scc.merge] INFO
2025-06-22 00:29:51,665 [ scc.merge] INFO
2025-06-22 00:29:51,665 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-06-22 00:29:51,665 [ scc.merge] INFO Excluded PRs:
2025-06-22 00:29:51,665 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-06-22 00:29:51,665 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-06-22 00:29:51,665 [ scc.merge] INFO Already up to date.
2025-06-22 00:29:51,665 [ scc.merge] INFO
2025-06-22 00:29:51,665 [ scc.merge] INFO Merged PRs:
2025-06-22 00:29:51,665 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-06-22 00:29:51,665 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-06-22 00:29:51,665 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-06-22 00:29:51,665 [ scc.merge] INFO
2025-06-22 00:29:51,665 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-06-22 00:29:51,665 [ scc.merge] INFO Excluded PRs:
2025-06-22 00:29:51,665 [ scc.merge] INFO - PR 174 will-moore 'Skip wells' (stage: draft)
2025-06-22 00:29:51,665 [ scc.merge] INFO - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
2025-06-22 00:29:51,665 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-06-22 00:29:51,665 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-06-22 00:29:51,665 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-06-22 00:29:51,665 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-06-22 00:29:51,665 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-06-22 00:29:51,665 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-06-22 00:29:51,665 [ scc.merge] INFO Updating 11d3587..64321ac
2025-06-22 00:29:51,665 [ scc.merge] INFO Previously merged:
2025-06-22 00:29:51,665 [ scc.merge] INFO - PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
2025-06-22 00:29:51,665 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-06-22 00:29:51,665 [ scc.merge] INFO - PR 173 will-moore 'Add test_export_plate_polygons()'
2025-06-22 00:29:51,665 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-06-22 00:29:51,665 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-22 00:29:51,665 [ scc.merge] INFO
2025-06-22 00:29:51,665 [ scc.merge] INFO Merged PRs:
2025-06-22 00:29:51,665 [ scc.merge] INFO - PR 177 jburel 'Replace fromstring by frombuffer'
2025-06-22 00:29:51,665 [ scc.merge] INFO
2025-06-22 00:29:51,666 [ scc.merge] INFO Repository: ome/omero-figure
2025-06-22 00:29:51,666 [ scc.merge] INFO Excluded PRs:
2025-06-22 00:29:51,666 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-06-22 00:29:51,666 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-06-22 00:29:51,666 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-06-22 00:29:51,666 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-06-22 00:29:51,666 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-06-22 00:29:51,666 [ scc.merge] INFO Previously merged:
2025-06-22 00:29:51,666 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-06-22 00:29:51,666 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-06-22 00:29:51,666 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-06-22 00:29:51,666 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-22 00:29:51,666 [ scc.merge] INFO
2025-06-22 00:29:51,666 [ scc.merge] INFO Merged PRs:
2025-06-22 00:29:51,666 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-06-22 00:29:51,666 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-06-22 00:29:51,666 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-06-22 00:29:51,666 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-06-22 00:29:51,666 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-06-22 00:29:51,666 [ scc.merge] INFO
2025-06-22 00:29:51,666 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-22 00:29:51,666 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-06-22 00:29:51,666 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-06-22 00:29:51,666 [ scc.merge] INFO
2025-06-22 00:29:51,666 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-06-22 00:29:51,666 [ scc.merge] INFO Already up to date.
2025-06-22 00:29:51,666 [ scc.merge] INFO
2025-06-22 00:29:51,666 [ scc.merge] INFO Merged PRs:
2025-06-22 00:29:51,666 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-06-22 00:29:51,666 [ scc.merge] INFO
2025-06-22 00:29:51,666 [ scc.merge] INFO Repository: ome/omero-gallery
2025-06-22 00:29:51,666 [ scc.merge] INFO Already up to date.
2025-06-22 00:29:51,666 [ scc.merge] INFO
2025-06-22 00:29:51,666 [ scc.merge] INFO Merged PRs:
2025-06-22 00:29:51,666 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-06-22 00:29:51,666 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-06-22 00:29:51,666 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-06-22 00:29:51,666 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-06-22 00:29:51,666 [ scc.merge] INFO
2025-06-22 00:29:51,667 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-22 00:29:51,667 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-06-22 00:29:51,667 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-06-22 00:29:51,667 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-06-22 00:29:51,667 [ scc.merge] INFO
2025-06-22 00:29:51,667 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-06-22 00:29:51,667 [ scc.merge] INFO Excluded PRs:
2025-06-22 00:29:51,667 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-06-22 00:29:51,667 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-06-22 00:29:51,667 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-06-22 00:29:51,667 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-06-22 00:29:51,667 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-06-22 00:29:51,667 [ scc.merge] INFO Updating 7a798ce..bb94cf8
2025-06-22 00:29:51,667 [ scc.merge] INFO Previously merged:
2025-06-22 00:29:51,667 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-22 00:29:51,667 [ scc.merge] INFO
2025-06-22 00:29:51,667 [ scc.merge] INFO Merged PRs:
2025-06-22 00:29:51,667 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-06-22 00:29:51,667 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-06-22 00:29:51,667 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-06-22 00:29:51,667 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-06-22 00:29:51,667 [ scc.merge] INFO
2025-06-22 00:29:51,667 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-22 00:29:51,667 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-06-22 00:29:51,667 [ scc.merge] INFO
2025-06-22 00:29:51,667 [ scc.merge] INFO Repository: ome/omero-mapr
2025-06-22 00:29:51,667 [ scc.merge] INFO Excluded PRs:
2025-06-22 00:29:51,667 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-06-22 00:29:51,667 [ scc.merge] INFO Already up to date.
2025-06-22 00:29:51,667 [ scc.merge] INFO
2025-06-22 00:29:51,667 [ scc.merge] INFO Merged PRs:
2025-06-22 00:29:51,667 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-06-22 00:29:51,667 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-22 00:29:51,667 [ scc.merge] INFO
2025-06-22 00:29:51,667 [ scc.merge] INFO Repository: ome/omero-metadata
2025-06-22 00:29:51,667 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-06-22 00:29:51,667 [ scc.merge] INFO Previously merged:
2025-06-22 00:29:51,667 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-22 00:29:51,667 [ scc.merge] INFO
2025-06-22 00:29:51,668 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-22 00:29:51,668 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-06-22 00:29:51,668 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-06-22 00:29:51,668 [ scc.merge] INFO
2025-06-22 00:29:51,668 [ scc.merge] INFO Repository: ome/omero-parade
2025-06-22 00:29:51,668 [ scc.merge] INFO Excluded PRs:
2025-06-22 00:29:51,668 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-06-22 00:29:51,668 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-06-22 00:29:51,668 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-06-22 00:29:51,668 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-06-22 00:29:51,668 [ scc.merge] INFO Already up to date.
2025-06-22 00:29:51,668 [ scc.merge] INFO
2025-06-22 00:29:51,668 [ scc.merge] INFO Merged PRs:
2025-06-22 00:29:51,668 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-06-22 00:29:51,668 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-06-22 00:29:51,668 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-22 00:29:51,668 [ scc.merge] INFO
2025-06-22 00:29:51,668 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-06-22 00:29:51,668 [ scc.merge] INFO Already up to date.
2025-06-22 00:29:51,668 [ scc.merge] INFO
2025-06-22 00:29:51,668 [ scc.merge] INFO
2025-06-22 00:29:51,668 [ scc.merge] INFO Repository: ome/omero-rois
2025-06-22 00:29:51,668 [ scc.merge] INFO Excluded PRs:
2025-06-22 00:29:51,668 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-06-22 00:29:51,668 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-06-22 00:29:51,668 [ scc.merge] INFO Already up to date.
2025-06-22 00:29:51,668 [ scc.merge] INFO
2025-06-22 00:29:51,668 [ scc.merge] INFO
2025-06-22 00:29:51,668 [ scc.merge] INFO Repository: ome/omero-signup
2025-06-22 00:29:51,668 [ scc.merge] INFO Already up to date.
2025-06-22 00:29:51,668 [ scc.merge] INFO
2025-06-22 00:29:51,668 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-22 00:29:51,668 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-06-22 00:29:51,668 [ scc.merge] INFO
2025-06-22 00:29:51,668 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-06-22 00:29:51,668 [ scc.merge] INFO Excluded PRs:
2025-06-22 00:29:51,668 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-06-22 00:29:51,668 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-06-22 00:29:51,668 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-06-22 00:29:51,668 [ scc.merge] INFO Already up to date.
2025-06-22 00:29:51,669 [ scc.merge] INFO
2025-06-22 00:29:51,669 [ scc.merge] INFO Merged PRs:
2025-06-22 00:29:51,669 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-06-22 00:29:51,669 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-06-22 00:29:51,669 [ scc.merge] INFO
2025-06-22 00:29:51,669 [ scc.merge] INFO Repository: ome/omero-upload
2025-06-22 00:29:51,669 [ scc.merge] INFO Already up to date.
2025-06-22 00:29:51,669 [ scc.merge] INFO
2025-06-22 00:29:51,669 [ scc.merge] INFO
2025-06-22 00:29:51,669 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-06-22 00:29:51,669 [ scc.merge] INFO Updating deab817..160d894
2025-06-22 00:29:51,669 [ scc.merge] INFO Previously merged:
2025-06-22 00:29:51,669 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-06-22 00:29:51,669 [ scc.merge] INFO
2025-06-22 00:29:51,669 [ scc.merge] INFO
2025-06-22 00:29:51,669 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-06-22 00:29:51,669 [ scc.merge] INFO Excluded PRs:
2025-06-22 00:29:51,669 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-06-22 00:29:51,669 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-06-22 00:29:51,669 [ scc.merge] INFO Already up to date.
2025-06-22 00:29:51,669 [ scc.merge] INFO
2025-06-22 00:29:51,669 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-22 00:29:51,669 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-06-22 00:29:51,669 [ scc.merge] INFO
2025-06-22 00:29:51,669 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-06-22 00:29:51,669 [ scc.merge] INFO Already up to date.
2025-06-22 00:29:51,669 [ scc.merge] INFO
2025-06-22 00:29:51,669 [ scc.merge] INFO
2025-06-22 00:29:51,669 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-06-22 00:29:51,669 [ scc.merge] INFO Already up to date.
2025-06-22 00:29:51,669 [ scc.merge] INFO
2025-06-22 00:29:51,669 [ scc.merge] INFO
2025-06-22 00:29:51,669 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-06-22 00:29:51,669 [ scc.merge] INFO Already up to date.
2025-06-22 00:29:51,669 [ scc.merge] INFO
2025-06-22 00:29:51,669 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-22 00:29:51,669 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-06-22 00:29:51,669 [ scc.merge] INFO
2025-06-22 00:29:51,669 [ scc.merge] INFO Repository: ome/scripts
2025-06-22 00:29:51,669 [ scc.merge] INFO Excluded PRs:
2025-06-22 00:29:51,670 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-06-22 00:29:51,670 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-06-22 00:29:51,670 [ scc.merge] INFO Updating 4b4c755..573db34
2025-06-22 00:29:51,670 [ scc.merge] INFO Previously merged:
2025-06-22 00:29:51,670 [ scc.merge] INFO - PR 227 jburel 'Replace tostring by tobytes'
2025-06-22 00:29:51,670 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-06-22 00:29:51,670 [ scc.merge] INFO
2025-06-22 00:29:51,670 [ scc.merge] INFO Merged PRs:
2025-06-22 00:29:51,670 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-06-22 00:29:51,670 [ scc.merge] INFO
2025-06-22 00:29:51,670 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-22 00:29:51,670 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-06-22 00:29:51,670 [ scc.merge] INFO
2025-06-22 00:29:51,670 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-06-22 00:29:51,670 [ scc.git] DEBUG Calling 'git remote'
2025-06-22 00:29:51,672 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-06-22 00:29:51,672 [ scc.git] DEBUG Calling 'git remote'
2025-06-22 00:29:51,674 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:51,674 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-06-22 00:29:51,675 [ scc.git] DEBUG Calling 'git remote'
2025-06-22 00:29:51,677 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:51,677 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-06-22 00:29:51,677 [ scc.git] DEBUG Calling 'git remote'
2025-06-22 00:29:51,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:51,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-06-22 00:29:51,679 [ scc.git] DEBUG Calling 'git remote'
2025-06-22 00:29:51,681 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:51,681 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-06-22 00:29:51,681 [ scc.git] DEBUG Calling 'git remote'
2025-06-22 00:29:51,683 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:51,683 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-06-22 00:29:51,683 [ scc.git] DEBUG Calling 'git remote'
2025-06-22 00:29:51,685 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:51,686 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-06-22 00:29:51,686 [ scc.git] DEBUG Calling 'git remote'
2025-06-22 00:29:51,688 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:51,688 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-06-22 00:29:51,688 [ scc.git] DEBUG Calling 'git remote'
2025-06-22 00:29:51,690 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:51,690 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-06-22 00:29:51,690 [ scc.git] DEBUG Calling 'git remote'
2025-06-22 00:29:51,692 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:51,692 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-06-22 00:29:51,692 [ scc.git] DEBUG Calling 'git remote'
2025-06-22 00:29:51,695 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:51,695 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-06-22 00:29:51,695 [ scc.git] DEBUG Calling 'git remote'
2025-06-22 00:29:51,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:51,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-06-22 00:29:51,697 [ scc.git] DEBUG Calling 'git remote'
2025-06-22 00:29:51,700 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:51,700 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-06-22 00:29:51,700 [ scc.git] DEBUG Calling 'git remote'
2025-06-22 00:29:51,702 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:51,702 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-06-22 00:29:51,702 [ scc.git] DEBUG Calling 'git remote'
2025-06-22 00:29:51,704 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:51,704 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-06-22 00:29:51,704 [ scc.git] DEBUG Calling 'git remote'
2025-06-22 00:29:51,706 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:51,707 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-06-22 00:29:51,707 [ scc.git] DEBUG Calling 'git remote'
2025-06-22 00:29:51,709 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:51,709 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-06-22 00:29:51,709 [ scc.git] DEBUG Calling 'git remote'
2025-06-22 00:29:51,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:51,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-06-22 00:29:51,711 [ scc.git] DEBUG Calling 'git remote'
2025-06-22 00:29:51,713 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:51,713 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-06-22 00:29:51,713 [ scc.git] DEBUG Calling 'git remote'
2025-06-22 00:29:51,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:51,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-06-22 00:29:51,716 [ scc.git] DEBUG Calling 'git remote'
2025-06-22 00:29:51,718 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:51,718 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-06-22 00:29:51,718 [ scc.git] DEBUG Calling 'git remote'
2025-06-22 00:29:51,720 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-22 00:29:51,720 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-06-22 00:29:51,720 [ scc.git] DEBUG Calling 'git remote'
2025-06-22 00:29:51,722 [ 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 6a836eb] 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 861a0a1] 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-22 00:30:39,024 [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-22 00:30:49,614 [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-22 00:30:52,201 [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-22 00:30:57,101 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-06-22 00:31:38,415 [ 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}
