Skipping 217 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-07-27 00:39:26,517 [ scc.git] DEBUG Calling 'git merge-base bb94cf8da960e3283090038b04432f301560f5e4 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-07-27 00:39:26,520 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..bb94cf8da960e3283090038b04432f301560f5e4'
2025-07-27 00:39:26,523 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#489](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-07-27 00:39:26,525 [ scc.config] DEBUG Found github.token
2025-07-27 00:39:26,525 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-07-27 00:39:26,525 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-27 00:39:26,565 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:39:26,565 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:39:26,567 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-27 00:39:26,607 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-27 00:39:26,614 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9e9e94a910> has no local changes
2025-07-27 00:39:26,614 [ 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#489 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/)'
2025-07-27 00:39:26,624 [ scc.git] DEBUG [detached HEAD 052da56] merge master -Dorg -Ssuccess-only
2025-07-27 00:39:26,624 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:39:26,624 [ scc.repo] DEBUG ## PRs found:
2025-07-27 00:39:26,768 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:27,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-07-27 00:39:27,282 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:27,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-07-27 00:39:27,751 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:28,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-07-27 00:39:28,258 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:28,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-27 00:39:28,729 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:29,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-07-27 00:39:29,259 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:29,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-07-27 00:39:29,443 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-27 00:39:29,694 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:29,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-07-27 00:39:30,194 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:30,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-07-27 00:39:30,689 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:30,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-07-27 00:39:31,226 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:31,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-27 00:39:31,700 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:32,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-07-27 00:39:32,266 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:32,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-07-27 00:39:32,463 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-07-27 00:39:32,464 [ scc.repo] DEBUG ## Branches found:
2025-07-27 00:39:32,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-07-27 00:39:32,464 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:39:32,464 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:39:32,467 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-27 00:39:32,469 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-27 00:39:32,469 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-27 00:39:32,472 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-27 00:39:32,475 [ scc.git] DEBUG Already up to date.
2025-07-27 00:39:32,475 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-07-27 00:39:32,764 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-07-27 00:39:32,764 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-07-27 00:39:32,768 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-07-27 00:39:33,049 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-07-27 00:39:33,049 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-07-27 00:39:33,054 [ scc.git] DEBUG ## Unique users: []
2025-07-27 00:39:33,054 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:39:33,054 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:39:33,056 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-07-27 00:39:33,060 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:39:33,063 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-07-27 00:39:33,071 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-27 00:39:33,075 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-07-27 00:39:33,075 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-07-27 00:39:33,075 [ scc.git] DEBUG requirements.txt | 2 +-
2025-07-27 00:39:33,075 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-07-27 00:39:33,075 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-07-27 00:39:33,075 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-07-27 00:39:33,076 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:33,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:39:33,258 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-07-27 00:39:33,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:39:33,265 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 94 (Use the release/v1 branch for the PyPA action publishing to PyPI) 1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-07-27 00:39:33,274 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-27 00:39:33,277 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-07-27 00:39:33,277 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-07-27 00:39:33,509 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:33,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:39:33,703 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-27 00:39:33,746 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:39:33,746 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:39:33,748 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-27 00:39:33,790 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-27 00:39:33,794 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9e9e945d50> has no local changes
2025-07-27 00:39:33,794 [ 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#489 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/)'
2025-07-27 00:39:33,801 [ scc.git] DEBUG [detached HEAD c452de5] merge master -Dorg -Ssuccess-only
2025-07-27 00:39:33,801 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:39:33,801 [ scc.repo] DEBUG ## PRs found:
2025-07-27 00:39:33,954 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:34,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-07-27 00:39:34,463 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:34,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-07-27 00:39:34,982 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:35,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-07-27 00:39:35,456 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:35,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-07-27 00:39:35,969 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:36,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-27 00:39:36,409 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:36,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-07-27 00:39:36,987 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:37,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-07-27 00:39:37,184 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-07-27 00:39:37,434 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:37,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-07-27 00:39:37,899 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:38,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-07-27 00:39:38,374 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:38,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-07-27 00:39:38,913 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:39,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-27 00:39:39,401 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:39,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-07-27 00:39:39,918 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:40,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-07-27 00:39:40,132 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-07-27 00:39:40,132 [ scc.repo] DEBUG ## Branches found:
2025-07-27 00:39:40,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-07-27 00:39:40,132 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:39:40,132 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:39:40,135 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-27 00:39:40,137 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-27 00:39:40,137 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-27 00:39:40,140 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-27 00:39:40,148 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-07-27 00:39:40,383 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:40,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-07-27 00:39:40,760 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-07-27 00:39:41,042 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-07-27 00:39:41,042 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-07-27 00:39:41,046 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-07-27 00:39:41,317 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-07-27 00:39:41,318 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-07-27 00:39:41,322 [ scc.git] DEBUG ## Unique users: []
2025-07-27 00:39:41,322 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:39:41,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:39:41,325 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-07-27 00:39:41,329 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:39:41,332 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-07-27 00:39:41,345 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-07-27 00:39:41,345 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-07-27 00:39:41,345 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-07-27 00:39:41,345 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-07-27 00:39:41,345 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-27 00:39:41,345 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-27 00:39:41,348 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-27 00:39:41,353 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-07-27 00:39:41,354 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:41,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:39:41,528 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-07-27 00:39:41,533 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-27 00:39:41,536 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#489](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-07-27 00:39:41,538 [ scc.config] DEBUG Found github.token
2025-07-27 00:39:41,538 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-07-27 00:39:41,538 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-07-27 00:39:41,543 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:39:41,545 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2025-07-27 00:39:41,560 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-07-27 00:39:41,560 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-07-27 00:39:41,560 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-07-27 00:39:41,560 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-27 00:39:41,561 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-27 00:39:41,564 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-27 00:39:41,569 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-07-27 00:39:41,779 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:41,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:39:41,949 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-07-27 00:39:41,954 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-27 00:39:41,956 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#489](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2025-07-27 00:39:41,959 [ scc.config] DEBUG Found github.token
2025-07-27 00:39:41,959 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-07-27 00:39:41,959 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-27 00:39:42,000 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:39:42,000 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:39:42,003 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-27 00:39:42,042 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-27 00:39:42,047 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9e9e9dbc90> has no local changes
2025-07-27 00:39:42,047 [ 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#489 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/)'
2025-07-27 00:39:42,053 [ scc.git] DEBUG [detached HEAD 43c9660] merge master -Dorg -Ssuccess-only
2025-07-27 00:39:42,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:39:42,054 [ scc.repo] DEBUG ## PRs found:
2025-07-27 00:39:42,200 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:42,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-07-27 00:39:42,759 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:43,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-07-27 00:39:43,281 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:43,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-07-27 00:39:43,804 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:44,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-27 00:39:44,283 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:44,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-07-27 00:39:44,753 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:45,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-07-27 00:39:45,308 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:45,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-07-27 00:39:45,507 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-27 00:39:45,758 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:45,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-07-27 00:39:46,000 [ scc.repo] DEBUG # ... Include label: dependencies
2025-07-27 00:39:46,251 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:46,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-07-27 00:39:46,807 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:47,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-27 00:39:47,337 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:47,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-07-27 00:39:47,899 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:48,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-07-27 00:39:48,383 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:48,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-07-27 00:39:48,573 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-07-27 00:39:48,823 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:49,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-07-27 00:39:49,075 [ scc.repo] DEBUG # ... Include label: dependencies
2025-07-27 00:39:49,325 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:49,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-07-27 00:39:49,914 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:50,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-27 00:39:50,417 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:50,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-07-27 00:39:50,905 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:51,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-07-27 00:39:51,478 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:51,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-07-27 00:39:51,681 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-07-27 00:39:51,932 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:52,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-07-27 00:39:52,418 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:52,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-07-27 00:39:52,956 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:53,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-07-27 00:39:53,427 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:53,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-07-27 00:39:53,890 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:54,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-07-27 00:39:54,438 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:54,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-07-27 00:39:54,918 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:55,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-07-27 00:39:55,143 [ scc.repo] DEBUG ## Branches found:
2025-07-27 00:39:55,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-07-27 00:39:55,143 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:39:55,143 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:39:55,146 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-27 00:39:55,149 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-27 00:39:55,149 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-27 00:39:55,152 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-27 00:39:55,155 [ scc.git] DEBUG Already up to date.
2025-07-27 00:39:55,155 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-07-27 00:39:55,439 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-07-27 00:39:55,440 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-07-27 00:39:55,443 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-07-27 00:39:55,722 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-07-27 00:39:55,722 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-07-27 00:39:55,727 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-07-27 00:39:56,010 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-07-27 00:39:56,010 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-07-27 00:39:56,015 [ scc.git] DEBUG ## Unique users: []
2025-07-27 00:39:56,015 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:39:56,015 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:39:56,017 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-07-27 00:39:56,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:39:56,022 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 140 (Bump vite from 4.2.3 to 4.5.9) 6301bc61b0a877104173846d526382bf15cc70a0'
2025-07-27 00:39:56,031 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-27 00:39:56,034 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-07-27 00:39:56,034 [ scc.git] DEBUG package.json | 2 +-
2025-07-27 00:39:56,034 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-07-27 00:39:56,036 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:56,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:39:56,227 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-07-27 00:39:56,230 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:39:56,232 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 141 (Bump axios from 1.6.0 to 1.8.2) de7db17cd62b498179713df276cff151a1f36d80'
2025-07-27 00:39:56,242 [ scc.git] DEBUG Auto-merging package-lock.json
2025-07-27 00:39:56,242 [ scc.git] DEBUG Auto-merging package.json
2025-07-27 00:39:56,243 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-27 00:39:56,247 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-07-27 00:39:56,247 [ scc.git] DEBUG package.json | 2 +-
2025-07-27 00:39:56,247 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-07-27 00:39:56,478 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:56,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:39:56,656 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-07-27 00:39:56,659 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:39:56,662 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 142 (Use the release/v1 branch for the PyPA action publishing to PyPI) 16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-07-27 00:39:56,671 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-27 00:39:56,674 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-07-27 00:39:56,674 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-07-27 00:39:56,907 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:57,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:39:57,070 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-27 00:39:57,111 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:39:57,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:39:57,114 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-27 00:39:57,154 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-27 00:39:57,158 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9e9c016110> has no local changes
2025-07-27 00:39:57,158 [ 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#489 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/)'
2025-07-27 00:39:57,164 [ scc.git] DEBUG [detached HEAD fbdb924] merge master -Dorg -Ssuccess-only
2025-07-27 00:39:57,164 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:39:57,165 [ scc.repo] DEBUG ## PRs found:
2025-07-27 00:39:57,321 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:57,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-07-27 00:39:57,516 [ scc.repo] DEBUG ## Branches found:
2025-07-27 00:39:57,516 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-07-27 00:39:57,516 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:39:57,516 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:39:57,519 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-27 00:39:57,522 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-27 00:39:57,522 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-27 00:39:57,525 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-27 00:39:57,528 [ scc.git] DEBUG Already up to date.
2025-07-27 00:39:57,528 [ scc.git] DEBUG ## Unique users: []
2025-07-27 00:39:57,528 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:39:57,529 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:39:57,531 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-27 00:39:57,572 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:39:57,572 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:39:57,575 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-27 00:39:57,614 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-27 00:39:57,618 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9e9c024790> has no local changes
2025-07-27 00:39:57,618 [ 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#489 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/)'
2025-07-27 00:39:57,624 [ scc.git] DEBUG [detached HEAD 6c096e8] merge master -Dorg -Ssuccess-only
2025-07-27 00:39:57,625 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:39:57,625 [ scc.repo] DEBUG ## PRs found:
2025-07-27 00:39:57,767 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:58,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-07-27 00:39:58,316 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:58,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-07-27 00:39:58,797 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:59,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-07-27 00:39:59,260 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:39:59,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-07-27 00:39:59,517 [ scc.repo] DEBUG ## Branches found:
2025-07-27 00:39:59,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-07-27 00:39:59,517 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:39:59,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:39:59,520 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-27 00:39:59,523 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-27 00:39:59,523 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-27 00:39:59,526 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-27 00:39:59,529 [ scc.git] DEBUG Already up to date.
2025-07-27 00:39:59,529 [ scc.git] DEBUG ## Unique users: []
2025-07-27 00:39:59,529 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:39:59,529 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:39:59,532 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-27 00:39:59,574 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:39:59,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:39:59,576 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-27 00:39:59,617 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-27 00:39:59,620 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9e9c01c910> has no local changes
2025-07-27 00:39:59,620 [ 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#489 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/)'
2025-07-27 00:39:59,626 [ scc.git] DEBUG [detached HEAD 4fbf7ec] merge master -Dorg -Ssuccess-only
2025-07-27 00:39:59,627 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:39:59,627 [ scc.repo] DEBUG ## PRs found:
2025-07-27 00:39:59,768 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:00,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-07-27 00:40:00,284 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:00,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-07-27 00:40:00,809 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:01,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-07-27 00:40:01,300 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:01,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-07-27 00:40:01,883 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:02,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-27 00:40:02,362 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:02,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-07-27 00:40:02,926 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:03,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-07-27 00:40:03,099 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-07-27 00:40:03,099 [ scc.repo] DEBUG ## Branches found:
2025-07-27 00:40:03,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-07-27 00:40:03,099 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:03,099 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:03,102 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-27 00:40:03,105 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-27 00:40:03,105 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-27 00:40:03,108 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-27 00:40:03,111 [ scc.git] DEBUG Already up to date.
2025-07-27 00:40:03,111 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-07-27 00:40:03,391 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-07-27 00:40:03,391 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-07-27 00:40:03,395 [ scc.git] DEBUG ## Unique users: []
2025-07-27 00:40:03,395 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:03,395 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:03,398 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-07-27 00:40:03,401 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:03,404 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-07-27 00:40:03,413 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-07-27 00:40:03,413 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-07-27 00:40:03,413 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-07-27 00:40:03,413 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-07-27 00:40:03,413 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-07-27 00:40:03,413 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-07-27 00:40:03,413 [ scc.git] DEBUG Auto-merging setup.py
2025-07-27 00:40:03,413 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-07-27 00:40:03,413 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-27 00:40:03,413 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-27 00:40:03,416 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-07-27 00:40:03,421 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-07-27 00:40:03,422 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:03,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:03,604 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-07-27 00:40:03,608 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-07-27 00:40:03,611 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#489](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- setup.py
- omero_signup/urls.py
- omero_signup/signup_settings.py
--conflicts
2025-07-27 00:40:03,614 [ scc.config] DEBUG Found github.token
2025-07-27 00:40:03,614 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-07-27 00:40:03,614 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-27 00:40:03,655 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:03,655 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:03,657 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-27 00:40:03,695 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-27 00:40:03,699 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9e9e9c1490> has no local changes
2025-07-27 00:40:03,699 [ 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#489 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/)'
2025-07-27 00:40:03,706 [ scc.git] DEBUG [detached HEAD 1cc1caf] merge master -Dorg -Ssuccess-only
2025-07-27 00:40:03,706 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:03,706 [ scc.repo] DEBUG ## PRs found:
2025-07-27 00:40:03,855 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:04,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-07-27 00:40:04,460 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:04,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-07-27 00:40:04,944 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:05,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-07-27 00:40:05,546 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:05,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-27 00:40:06,093 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:06,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-07-27 00:40:06,565 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:06,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-07-27 00:40:07,097 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:07,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6?per_page=1 HTTP/1.1" 200 2
2025-07-27 00:40:07,291 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-07-27 00:40:07,541 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:07,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-07-27 00:40:08,050 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:08,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-07-27 00:40:08,554 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:08,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-07-27 00:40:09,094 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:09,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-27 00:40:09,603 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:09,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-07-27 00:40:10,095 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:10,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-07-27 00:40:10,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:10,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-07-27 00:40:11,063 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:11,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-07-27 00:40:11,558 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:11,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-07-27 00:40:12,021 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:12,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-07-27 00:40:12,559 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:12,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-27 00:40:13,023 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:13,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-07-27 00:40:13,522 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:13,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2025-07-27 00:40:13,701 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-07-27 00:40:13,701 [ scc.repo] DEBUG ## Branches found:
2025-07-27 00:40:13,701 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-07-27 00:40:13,701 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:13,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:13,704 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-27 00:40:13,706 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-27 00:40:13,706 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-27 00:40:13,709 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-27 00:40:13,712 [ scc.git] DEBUG Already up to date.
2025-07-27 00:40:13,713 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-07-27 00:40:13,999 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-07-27 00:40:13,999 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-07-27 00:40:14,003 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-07-27 00:40:14,290 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-07-27 00:40:14,290 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-07-27 00:40:14,295 [ scc.git] DEBUG ## Unique users: []
2025-07-27 00:40:14,295 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:14,295 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:14,297 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-07-27 00:40:14,302 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:14,304 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2025-07-27 00:40:14,317 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-27 00:40:14,320 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-07-27 00:40:14,320 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-07-27 00:40:14,320 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-07-27 00:40:14,320 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-07-27 00:40:14,321 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-07-27 00:40:14,321 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-07-27 00:40:14,321 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-07-27 00:40:14,321 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-07-27 00:40:14,322 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:14,322 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-07-27 00:40:14,322 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-07-27 00:40:14,322 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-07-27 00:40:14,322 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-07-27 00:40:14,322 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-07-27 00:40:14,322 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-07-27 00:40:14,322 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-07-27 00:40:14,322 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-07-27 00:40:14,322 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-07-27 00:40:14,322 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-07-27 00:40:14,322 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-07-27 00:40:14,322 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-07-27 00:40:14,322 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-07-27 00:40:14,322 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-07-27 00:40:14,322 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-07-27 00:40:14,322 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-07-27 00:40:14,322 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-07-27 00:40:14,322 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-07-27 00:40:14,322 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-07-27 00:40:14,322 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-07-27 00:40:14,322 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-07-27 00:40:14,322 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-07-27 00:40:14,322 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-07-27 00:40:14,322 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-07-27 00:40:14,322 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-07-27 00:40:14,323 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-07-27 00:40:14,323 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-07-27 00:40:14,323 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-07-27 00:40:14,323 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-07-27 00:40:14,323 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-07-27 00:40:14,323 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-07-27 00:40:14,323 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-07-27 00:40:14,323 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-07-27 00:40:14,323 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-07-27 00:40:14,323 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-07-27 00:40:14,323 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-07-27 00:40:14,323 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-07-27 00:40:14,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:14,503 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-07-27 00:40:14,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:14,509 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-07-27 00:40:14,520 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-27 00:40:14,523 [ scc.git] DEBUG docker | 1 +
2025-07-27 00:40:14,523 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-07-27 00:40:14,753 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:14,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:14,946 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-27 00:40:14,988 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:14,988 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:14,990 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-27 00:40:15,028 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-27 00:40:15,032 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9e9e9a2150> has no local changes
2025-07-27 00:40:15,032 [ 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#489 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/)'
2025-07-27 00:40:15,038 [ scc.git] DEBUG [detached HEAD ead65e2] merge master -Dorg -Ssuccess-only
2025-07-27 00:40:15,039 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:15,039 [ scc.repo] DEBUG ## PRs found:
2025-07-27 00:40:15,197 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:15,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-07-27 00:40:15,407 [ scc.repo] DEBUG ## Branches found:
2025-07-27 00:40:15,407 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-07-27 00:40:15,408 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:15,408 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:15,410 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-27 00:40:15,413 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-27 00:40:15,413 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-27 00:40:15,416 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-27 00:40:15,419 [ scc.git] DEBUG Already up to date.
2025-07-27 00:40:15,419 [ scc.git] DEBUG ## Unique users: []
2025-07-27 00:40:15,419 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:15,419 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:15,421 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-27 00:40:15,461 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:15,461 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:15,464 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-27 00:40:15,504 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-27 00:40:15,508 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9e9c04e690> has no local changes
2025-07-27 00:40:15,508 [ 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#489 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/)'
2025-07-27 00:40:15,514 [ scc.git] DEBUG [detached HEAD 7d49ed6] merge master -Dorg -Ssuccess-only
2025-07-27 00:40:15,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:15,515 [ scc.repo] DEBUG ## PRs found:
2025-07-27 00:40:15,658 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:15,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2025-07-27 00:40:15,862 [ scc.repo] DEBUG ## Branches found:
2025-07-27 00:40:15,862 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-07-27 00:40:15,862 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:15,862 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:15,865 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-27 00:40:15,867 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-27 00:40:15,867 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-27 00:40:15,870 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-27 00:40:15,878 [ scc.git] DEBUG Updating deab817..160d894
2025-07-27 00:40:16,113 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:16,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls/20 HTTP/1.1" 200 None
2025-07-27 00:40:16,528 [ scc.git] DEBUG ## Unique users: []
2025-07-27 00:40:16,528 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:16,528 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:16,530 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-27 00:40:16,573 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:16,573 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:16,575 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-27 00:40:16,614 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-27 00:40:16,618 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9e9c0a3e10> has no local changes
2025-07-27 00:40:16,618 [ 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#489 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/)'
2025-07-27 00:40:16,624 [ scc.git] DEBUG [detached HEAD 20db191] merge master -Dorg -Ssuccess-only
2025-07-27 00:40:16,624 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:16,624 [ scc.git] INFO Overriding base-branch from master to main
2025-07-27 00:40:16,624 [ scc.repo] DEBUG ## PRs found:
2025-07-27 00:40:16,778 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:17,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-07-27 00:40:17,289 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:17,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-07-27 00:40:17,785 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:18,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-07-27 00:40:18,383 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:18,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-07-27 00:40:18,954 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:19,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-27 00:40:19,460 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:19,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-07-27 00:40:20,031 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:20,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-07-27 00:40:20,571 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:20,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-07-27 00:40:21,064 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:21,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-07-27 00:40:21,525 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:21,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-07-27 00:40:22,063 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:22,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-27 00:40:22,531 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:22,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-07-27 00:40:23,056 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:23,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-07-27 00:40:23,272 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-07-27 00:40:23,272 [ scc.repo] DEBUG ## Branches found:
2025-07-27 00:40:23,273 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-07-27 00:40:23,273 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:23,273 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:23,275 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-07-27 00:40:23,278 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-27 00:40:23,278 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-07-27 00:40:23,281 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-07-27 00:40:23,284 [ scc.git] DEBUG Already up to date.
2025-07-27 00:40:23,284 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-07-27 00:40:23,578 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-07-27 00:40:23,578 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-07-27 00:40:23,583 [ scc.git] DEBUG ## Unique users: []
2025-07-27 00:40:23,583 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:23,583 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:23,586 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-07-27 00:40:23,589 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:23,591 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-07-27 00:40:23,599 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-07-27 00:40:23,599 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-07-27 00:40:23,599 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-27 00:40:23,599 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-27 00:40:23,602 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-07-27 00:40:23,606 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-07-27 00:40:23,607 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:23,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:23,791 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-07-27 00:40:23,794 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-07-27 00:40:23,797 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#489](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-07-27 00:40:23,799 [ scc.config] DEBUG Found github.token
2025-07-27 00:40:23,799 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-07-27 00:40:23,799 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-27 00:40:23,839 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:23,839 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:23,841 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-27 00:40:23,880 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-27 00:40:23,883 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9e9c07f6d0> has no local changes
2025-07-27 00:40:23,883 [ 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#489 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/)'
2025-07-27 00:40:23,890 [ scc.git] DEBUG [detached HEAD 8eab309] merge master -Dorg -Ssuccess-only
2025-07-27 00:40:23,890 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:23,890 [ scc.repo] DEBUG ## PRs found:
2025-07-27 00:40:24,042 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:24,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-07-27 00:40:24,235 [ scc.repo] DEBUG ## Branches found:
2025-07-27 00:40:24,235 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-07-27 00:40:24,235 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:24,235 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:24,238 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-27 00:40:24,240 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-27 00:40:24,240 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-27 00:40:24,243 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-27 00:40:24,246 [ scc.git] DEBUG Already up to date.
2025-07-27 00:40:24,246 [ scc.git] DEBUG ## Unique users: []
2025-07-27 00:40:24,246 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:24,246 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:24,249 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-27 00:40:24,290 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:24,290 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:24,293 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-27 00:40:24,332 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-27 00:40:24,336 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9e9e9f0850> has no local changes
2025-07-27 00:40:24,336 [ 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#489 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/)'
2025-07-27 00:40:24,342 [ scc.git] DEBUG [detached HEAD 93cd68f] merge master -Dorg -Ssuccess-only
2025-07-27 00:40:24,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:24,342 [ scc.repo] DEBUG ## PRs found:
2025-07-27 00:40:24,486 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:24,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-07-27 00:40:24,681 [ scc.repo] DEBUG ## Branches found:
2025-07-27 00:40:24,681 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-07-27 00:40:24,681 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:24,681 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:24,683 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-27 00:40:24,685 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-27 00:40:24,685 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-27 00:40:24,688 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-27 00:40:24,691 [ scc.git] DEBUG Already up to date.
2025-07-27 00:40:24,691 [ scc.git] DEBUG ## Unique users: []
2025-07-27 00:40:24,691 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:24,691 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:24,693 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-27 00:40:24,732 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:24,732 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:24,734 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-27 00:40:24,773 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-27 00:40:24,777 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9e9c0d3410> has no local changes
2025-07-27 00:40:24,777 [ 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#489 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/)'
2025-07-27 00:40:24,783 [ scc.git] DEBUG [detached HEAD d5aaa9f] merge master -Dorg -Ssuccess-only
2025-07-27 00:40:24,784 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:24,784 [ scc.repo] DEBUG ## PRs found:
2025-07-27 00:40:24,932 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:25,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-07-27 00:40:25,484 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:25,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-07-27 00:40:25,994 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:26,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-07-27 00:40:26,452 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:26,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-07-27 00:40:26,984 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:27,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-27 00:40:27,450 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:27,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-07-27 00:40:27,931 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:28,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-07-27 00:40:28,114 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-07-27 00:40:28,114 [ scc.repo] DEBUG ## Branches found:
2025-07-27 00:40:28,114 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-07-27 00:40:28,114 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:28,114 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:28,117 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-27 00:40:28,119 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-27 00:40:28,119 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-27 00:40:28,122 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-27 00:40:28,125 [ scc.git] DEBUG Already up to date.
2025-07-27 00:40:28,125 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-07-27 00:40:28,406 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-07-27 00:40:28,406 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-07-27 00:40:28,410 [ scc.git] DEBUG ## Unique users: []
2025-07-27 00:40:28,410 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:28,410 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:28,412 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-07-27 00:40:28,416 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:28,418 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-07-27 00:40:28,427 [ scc.git] DEBUG Auto-merging Dockerfile
2025-07-27 00:40:28,427 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-07-27 00:40:28,428 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-27 00:40:28,428 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-27 00:40:28,431 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-07-27 00:40:28,436 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-07-27 00:40:28,437 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:28,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:28,605 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-07-27 00:40:28,608 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-07-27 00:40:28,611 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#489](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-07-27 00:40:28,613 [ scc.config] DEBUG Found github.token
2025-07-27 00:40:28,613 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-07-27 00:40:28,613 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-27 00:40:28,654 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:28,655 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:28,657 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-27 00:40:28,695 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-27 00:40:28,699 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9e9c01c190> has no local changes
2025-07-27 00:40:28,699 [ 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#489 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/)'
2025-07-27 00:40:28,706 [ scc.git] DEBUG [detached HEAD bf6d8e5] merge master -Dorg -Ssuccess-only
2025-07-27 00:40:28,706 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:28,706 [ scc.git] INFO Overriding base-branch from master to develop
2025-07-27 00:40:28,706 [ scc.repo] DEBUG ## PRs found:
2025-07-27 00:40:28,856 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:29,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-07-27 00:40:29,415 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:29,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-07-27 00:40:29,895 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:30,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-07-27 00:40:30,374 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:30,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-07-27 00:40:30,835 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:31,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-27 00:40:31,352 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:31,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-07-27 00:40:31,850 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:32,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-07-27 00:40:32,370 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:32,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-07-27 00:40:32,559 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-07-27 00:40:32,810 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:33,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-07-27 00:40:33,305 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:33,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-07-27 00:40:33,815 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:34,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-07-27 00:40:34,279 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:34,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-27 00:40:34,744 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:35,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-07-27 00:40:35,259 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:35,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-07-27 00:40:35,447 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-07-27 00:40:35,699 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:35,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-07-27 00:40:36,183 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:36,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-07-27 00:40:36,688 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:36,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-07-27 00:40:37,154 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:37,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-07-27 00:40:37,407 [ scc.repo] DEBUG ## Branches found:
2025-07-27 00:40:37,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-07-27 00:40:37,408 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:37,408 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:37,410 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-07-27 00:40:37,413 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-27 00:40:37,413 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-07-27 00:40:37,416 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-07-27 00:40:37,427 [ scc.git] DEBUG Updating 4b4c755..573db34
2025-07-27 00:40:37,658 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:38,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/227 HTTP/1.1" 200 None
2025-07-27 00:40:38,279 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:38,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-07-27 00:40:38,694 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-07-27 00:40:38,985 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-07-27 00:40:38,985 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-07-27 00:40:38,989 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-07-27 00:40:39,288 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-07-27 00:40:39,288 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-07-27 00:40:39,292 [ scc.git] DEBUG ## Unique users: []
2025-07-27 00:40:39,292 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:39,292 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:39,295 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-07-27 00:40:39,301 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:39,303 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-07-27 00:40:39,315 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-07-27 00:40:39,315 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-27 00:40:39,316 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-27 00:40:39,318 [ scc.git] DEBUG Calling 'git reset --hard 573db340d5d1429fa17c7e486206948412a7c150'
2025-07-27 00:40:39,322 [ scc.git] DEBUG HEAD is now at 573db34 Bump version: 5.9.1 → 5.9.2.dev0
2025-07-27 00:40:39,324 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:39,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:39,518 [ scc.git] DEBUG Calling 'git merge-base 573db340d5d1429fa17c7e486206948412a7c150 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-07-27 00:40:39,524 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..573db340d5d1429fa17c7e486206948412a7c150'
2025-07-27 00:40:39,528 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#489](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-07-27 00:40:39,530 [ scc.config] DEBUG Found github.token
2025-07-27 00:40:39,530 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-07-27 00:40:39,530 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-07-27 00:40:39,535 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:39,537 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-07-27 00:40:39,547 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-27 00:40:39,550 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-07-27 00:40:39,551 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-07-27 00:40:39,769 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:39,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:39,984 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-27 00:40:40,027 [ scc.git] DEBUG Get sha1 of %s
2025-07-27 00:40:40,027 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-27 00:40:40,029 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-27 00:40:40,068 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-27 00:40:40,072 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9e9c0cd390> has no local changes
2025-07-27 00:40:40,072 [ 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#489 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/)'
2025-07-27 00:40:40,078 [ scc.git] DEBUG [detached HEAD 7614622] merge master -Dorg -Ssuccess-only
2025-07-27 00:40:40,078 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:40,078 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-27 00:40:40,155 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-07-27 00:40:40,235 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:40,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:40,417 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-07-27 00:40:40,419 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-07-27 00:40:40,663 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:40,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:40,859 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-07-27 00:40:40,861 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-07-27 00:40:41,106 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:41,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:41,295 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-07-27 00:40:41,297 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-07-27 00:40:41,541 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:41,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:41,715 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-07-27 00:40:41,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:42,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:42,131 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-07-27 00:40:42,133 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-07-27 00:40:42,377 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:42,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:42,556 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-07-27 00:40:42,559 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-07-27 00:40:42,803 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:42,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:42,973 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-07-27 00:40:42,975 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-07-27 00:40:43,219 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:43,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:43,389 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-07-27 00:40:43,391 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-07-27 00:40:43,636 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:43,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:43,840 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-07-27 00:40:43,842 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-07-27 00:40:44,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:44,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:44,275 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-07-27 00:40:44,277 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-07-27 00:40:44,521 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:44,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:44,693 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-07-27 00:40:44,695 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-07-27 00:40:44,940 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:45,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:45,111 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-07-27 00:40:45,114 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-07-27 00:40:45,358 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:45,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:45,531 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-07-27 00:40:45,775 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:45,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:45,962 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-07-27 00:40:46,207 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:46,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:46,384 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-07-27 00:40:46,386 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-07-27 00:40:46,630 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:46,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:46,825 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-07-27 00:40:47,069 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:47,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:47,244 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-07-27 00:40:47,489 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:47,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:47,675 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-07-27 00:40:47,677 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-07-27 00:40:47,921 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:48,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:48,094 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-07-27 00:40:48,096 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-07-27 00:40:48,341 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:48,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:48,561 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-07-27 00:40:48,563 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-07-27 00:40:48,808 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:48,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:48,995 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-07-27 00:40:48,997 [ scc.config] DEBUG Found submodule.scripts.url
2025-07-27 00:40:49,241 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-27 00:40:49,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-27 00:40:49,433 [ scc.config] DEBUG Found submodule.scripts.branch
2025-07-27 00:40:49,433 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-27 00:40:49,523 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9ea07049d0> has local changes
2025-07-27 00:40:49,523 [ 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..f7eea7c
Previously merged:
- PR 179 will-moore 'Changelog 0.6.0'
- PR 177 jburel 'Replace fromstring by frombuffer'
- PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
- PR 147 will-moore 'Name option'
- PR 173 will-moore 'Add test_export_plate_polygons()'
- PR 171 will-moore 'Initial addition of integration tests'
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
Repository: ome/omero-figure
Excluded PRs:
- PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
- PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..3e8fa730
Previously merged:
- PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
- PR 635 dependabot[bot] 'Bump esbuild and vite'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Updating 7a798ce..bb94cf8
Previously merged:
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
- PR 76 will-moore 'Run cli deps'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Updating deab817..160d894
Previously merged:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..573db34
Previously merged:
- PR 227 jburel 'Replace tostring by tobytes'
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#489 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/489/)'
2025-07-27 00:40:49,536 [ scc.git] DEBUG [detached HEAD d912fa0] merge master -Dorg -Ssuccess-only
2025-07-27 00:40:49,536 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-07-27 00:40:49,536 [ scc.merge] INFO Repository: ome/omero-plugins
2025-07-27 00:40:49,536 [ scc.merge] INFO Already up to date.
2025-07-27 00:40:49,536 [ scc.merge] INFO
2025-07-27 00:40:49,537 [ scc.merge] INFO Merged PRs:
2025-07-27 00:40:49,537 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-07-27 00:40:49,537 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-07-27 00:40:49,537 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-07-27 00:40:49,537 [ scc.merge] INFO
2025-07-27 00:40:49,537 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-07-27 00:40:49,537 [ scc.merge] INFO Already up to date.
2025-07-27 00:40:49,537 [ scc.merge] INFO
2025-07-27 00:40:49,537 [ scc.merge] INFO
2025-07-27 00:40:49,537 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-07-27 00:40:49,537 [ scc.merge] INFO Excluded PRs:
2025-07-27 00:40:49,537 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-07-27 00:40:49,537 [ scc.merge] INFO Already up to date.
2025-07-27 00:40:49,537 [ scc.merge] INFO
2025-07-27 00:40:49,537 [ scc.merge] INFO
2025-07-27 00:40:49,537 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-07-27 00:40:49,537 [ scc.merge] INFO Excluded PRs:
2025-07-27 00:40:49,537 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-07-27 00:40:49,537 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-07-27 00:40:49,537 [ scc.merge] INFO Already up to date.
2025-07-27 00:40:49,537 [ scc.merge] INFO
2025-07-27 00:40:49,537 [ scc.merge] INFO Merged PRs:
2025-07-27 00:40:49,537 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-07-27 00:40:49,537 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-07-27 00:40:49,537 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-07-27 00:40:49,537 [ scc.merge] INFO
2025-07-27 00:40:49,537 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-07-27 00:40:49,537 [ scc.merge] INFO Excluded PRs:
2025-07-27 00:40:49,537 [ scc.merge] INFO - PR 174 will-moore 'Skip wells' (stage: draft)
2025-07-27 00:40:49,537 [ scc.merge] INFO - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
2025-07-27 00:40:49,537 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-07-27 00:40:49,537 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-07-27 00:40:49,537 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-07-27 00:40:49,537 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-07-27 00:40:49,537 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-07-27 00:40:49,537 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-07-27 00:40:49,537 [ scc.merge] INFO Updating 11d3587..f7eea7c
2025-07-27 00:40:49,537 [ scc.merge] INFO Previously merged:
2025-07-27 00:40:49,538 [ scc.merge] INFO - PR 179 will-moore 'Changelog 0.6.0'
2025-07-27 00:40:49,538 [ scc.merge] INFO - PR 177 jburel 'Replace fromstring by frombuffer'
2025-07-27 00:40:49,538 [ scc.merge] INFO - PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
2025-07-27 00:40:49,538 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-07-27 00:40:49,538 [ scc.merge] INFO - PR 173 will-moore 'Add test_export_plate_polygons()'
2025-07-27 00:40:49,538 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-07-27 00:40:49,538 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-27 00:40:49,538 [ scc.merge] INFO
2025-07-27 00:40:49,538 [ scc.merge] INFO Merged PRs:
2025-07-27 00:40:49,538 [ scc.merge] INFO - PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
2025-07-27 00:40:49,538 [ scc.merge] INFO
2025-07-27 00:40:49,538 [ scc.merge] INFO Repository: ome/omero-figure
2025-07-27 00:40:49,538 [ scc.merge] INFO Excluded PRs:
2025-07-27 00:40:49,538 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-07-27 00:40:49,538 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-07-27 00:40:49,538 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-07-27 00:40:49,538 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-07-27 00:40:49,538 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-07-27 00:40:49,538 [ scc.merge] INFO Previously merged:
2025-07-27 00:40:49,538 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-07-27 00:40:49,538 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-07-27 00:40:49,538 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-07-27 00:40:49,538 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-27 00:40:49,538 [ scc.merge] INFO
2025-07-27 00:40:49,538 [ scc.merge] INFO Merged PRs:
2025-07-27 00:40:49,538 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-07-27 00:40:49,538 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-07-27 00:40:49,538 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-07-27 00:40:49,538 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-07-27 00:40:49,538 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-07-27 00:40:49,538 [ scc.merge] INFO
2025-07-27 00:40:49,538 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-27 00:40:49,538 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-07-27 00:40:49,538 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-07-27 00:40:49,538 [ scc.merge] INFO
2025-07-27 00:40:49,538 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-07-27 00:40:49,538 [ scc.merge] INFO Already up to date.
2025-07-27 00:40:49,538 [ scc.merge] INFO
2025-07-27 00:40:49,538 [ scc.merge] INFO Merged PRs:
2025-07-27 00:40:49,539 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-07-27 00:40:49,539 [ scc.merge] INFO
2025-07-27 00:40:49,539 [ scc.merge] INFO Repository: ome/omero-gallery
2025-07-27 00:40:49,539 [ scc.merge] INFO Already up to date.
2025-07-27 00:40:49,539 [ scc.merge] INFO
2025-07-27 00:40:49,539 [ scc.merge] INFO Merged PRs:
2025-07-27 00:40:49,539 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-07-27 00:40:49,539 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-07-27 00:40:49,539 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-07-27 00:40:49,539 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-07-27 00:40:49,539 [ scc.merge] INFO
2025-07-27 00:40:49,539 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-27 00:40:49,539 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-07-27 00:40:49,539 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-07-27 00:40:49,539 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-07-27 00:40:49,539 [ scc.merge] INFO
2025-07-27 00:40:49,539 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-07-27 00:40:49,539 [ scc.merge] INFO Excluded PRs:
2025-07-27 00:40:49,539 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-07-27 00:40:49,539 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-07-27 00:40:49,539 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-07-27 00:40:49,539 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-07-27 00:40:49,539 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-07-27 00:40:49,539 [ scc.merge] INFO Updating 7a798ce..bb94cf8
2025-07-27 00:40:49,539 [ scc.merge] INFO Previously merged:
2025-07-27 00:40:49,539 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-27 00:40:49,539 [ scc.merge] INFO
2025-07-27 00:40:49,539 [ scc.merge] INFO Merged PRs:
2025-07-27 00:40:49,539 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-07-27 00:40:49,539 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-07-27 00:40:49,539 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-07-27 00:40:49,539 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-07-27 00:40:49,539 [ scc.merge] INFO
2025-07-27 00:40:49,539 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-27 00:40:49,539 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-07-27 00:40:49,539 [ scc.merge] INFO
2025-07-27 00:40:49,539 [ scc.merge] INFO Repository: ome/omero-mapr
2025-07-27 00:40:49,539 [ scc.merge] INFO Excluded PRs:
2025-07-27 00:40:49,539 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-07-27 00:40:49,539 [ scc.merge] INFO Already up to date.
2025-07-27 00:40:49,539 [ scc.merge] INFO
2025-07-27 00:40:49,540 [ scc.merge] INFO Merged PRs:
2025-07-27 00:40:49,540 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-07-27 00:40:49,540 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-27 00:40:49,540 [ scc.merge] INFO
2025-07-27 00:40:49,540 [ scc.merge] INFO Repository: ome/omero-metadata
2025-07-27 00:40:49,540 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-07-27 00:40:49,540 [ scc.merge] INFO Previously merged:
2025-07-27 00:40:49,540 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-27 00:40:49,540 [ scc.merge] INFO
2025-07-27 00:40:49,540 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-27 00:40:49,540 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-07-27 00:40:49,540 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-07-27 00:40:49,540 [ scc.merge] INFO
2025-07-27 00:40:49,540 [ scc.merge] INFO Repository: ome/omero-parade
2025-07-27 00:40:49,540 [ scc.merge] INFO Excluded PRs:
2025-07-27 00:40:49,540 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-07-27 00:40:49,540 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-07-27 00:40:49,540 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-07-27 00:40:49,540 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-07-27 00:40:49,540 [ scc.merge] INFO Already up to date.
2025-07-27 00:40:49,540 [ scc.merge] INFO
2025-07-27 00:40:49,540 [ scc.merge] INFO Merged PRs:
2025-07-27 00:40:49,540 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-07-27 00:40:49,540 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-07-27 00:40:49,540 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-27 00:40:49,540 [ scc.merge] INFO
2025-07-27 00:40:49,540 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-07-27 00:40:49,540 [ scc.merge] INFO Already up to date.
2025-07-27 00:40:49,540 [ scc.merge] INFO
2025-07-27 00:40:49,540 [ scc.merge] INFO
2025-07-27 00:40:49,540 [ scc.merge] INFO Repository: ome/omero-rois
2025-07-27 00:40:49,540 [ scc.merge] INFO Excluded PRs:
2025-07-27 00:40:49,540 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-07-27 00:40:49,540 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-07-27 00:40:49,540 [ scc.merge] INFO Already up to date.
2025-07-27 00:40:49,540 [ scc.merge] INFO
2025-07-27 00:40:49,540 [ scc.merge] INFO
2025-07-27 00:40:49,540 [ scc.merge] INFO Repository: ome/omero-signup
2025-07-27 00:40:49,540 [ scc.merge] INFO Already up to date.
2025-07-27 00:40:49,540 [ scc.merge] INFO
2025-07-27 00:40:49,541 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-27 00:40:49,541 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-07-27 00:40:49,541 [ scc.merge] INFO
2025-07-27 00:40:49,541 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-07-27 00:40:49,541 [ scc.merge] INFO Excluded PRs:
2025-07-27 00:40:49,541 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-07-27 00:40:49,541 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-07-27 00:40:49,541 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-07-27 00:40:49,541 [ scc.merge] INFO Already up to date.
2025-07-27 00:40:49,541 [ scc.merge] INFO
2025-07-27 00:40:49,541 [ scc.merge] INFO Merged PRs:
2025-07-27 00:40:49,541 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-07-27 00:40:49,541 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-07-27 00:40:49,541 [ scc.merge] INFO
2025-07-27 00:40:49,541 [ scc.merge] INFO Repository: ome/omero-upload
2025-07-27 00:40:49,541 [ scc.merge] INFO Already up to date.
2025-07-27 00:40:49,541 [ scc.merge] INFO
2025-07-27 00:40:49,541 [ scc.merge] INFO
2025-07-27 00:40:49,541 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-07-27 00:40:49,541 [ scc.merge] INFO Updating deab817..160d894
2025-07-27 00:40:49,541 [ scc.merge] INFO Previously merged:
2025-07-27 00:40:49,541 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-07-27 00:40:49,541 [ scc.merge] INFO
2025-07-27 00:40:49,541 [ scc.merge] INFO
2025-07-27 00:40:49,541 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-07-27 00:40:49,541 [ scc.merge] INFO Excluded PRs:
2025-07-27 00:40:49,541 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-07-27 00:40:49,541 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-07-27 00:40:49,541 [ scc.merge] INFO Already up to date.
2025-07-27 00:40:49,541 [ scc.merge] INFO
2025-07-27 00:40:49,541 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-27 00:40:49,541 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-07-27 00:40:49,541 [ scc.merge] INFO
2025-07-27 00:40:49,541 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-07-27 00:40:49,541 [ scc.merge] INFO Already up to date.
2025-07-27 00:40:49,541 [ scc.merge] INFO
2025-07-27 00:40:49,541 [ scc.merge] INFO
2025-07-27 00:40:49,541 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-07-27 00:40:49,541 [ scc.merge] INFO Already up to date.
2025-07-27 00:40:49,541 [ scc.merge] INFO
2025-07-27 00:40:49,542 [ scc.merge] INFO
2025-07-27 00:40:49,542 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-07-27 00:40:49,542 [ scc.merge] INFO Already up to date.
2025-07-27 00:40:49,542 [ scc.merge] INFO
2025-07-27 00:40:49,542 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-27 00:40:49,542 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-07-27 00:40:49,542 [ scc.merge] INFO
2025-07-27 00:40:49,542 [ scc.merge] INFO Repository: ome/scripts
2025-07-27 00:40:49,542 [ scc.merge] INFO Excluded PRs:
2025-07-27 00:40:49,542 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-07-27 00:40:49,542 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-07-27 00:40:49,542 [ scc.merge] INFO Updating 4b4c755..573db34
2025-07-27 00:40:49,542 [ scc.merge] INFO Previously merged:
2025-07-27 00:40:49,542 [ scc.merge] INFO - PR 227 jburel 'Replace tostring by tobytes'
2025-07-27 00:40:49,542 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-07-27 00:40:49,542 [ scc.merge] INFO
2025-07-27 00:40:49,542 [ scc.merge] INFO Merged PRs:
2025-07-27 00:40:49,542 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-07-27 00:40:49,542 [ scc.merge] INFO
2025-07-27 00:40:49,542 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-27 00:40:49,542 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-07-27 00:40:49,542 [ scc.merge] INFO
2025-07-27 00:40:49,542 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-07-27 00:40:49,542 [ scc.git] DEBUG Calling 'git remote'
2025-07-27 00:40:49,544 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-07-27 00:40:49,544 [ scc.git] DEBUG Calling 'git remote'
2025-07-27 00:40:49,546 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:49,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-07-27 00:40:49,547 [ scc.git] DEBUG Calling 'git remote'
2025-07-27 00:40:49,549 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:49,549 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-07-27 00:40:49,549 [ scc.git] DEBUG Calling 'git remote'
2025-07-27 00:40:49,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:49,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-07-27 00:40:49,551 [ scc.git] DEBUG Calling 'git remote'
2025-07-27 00:40:49,553 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:49,553 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-07-27 00:40:49,553 [ scc.git] DEBUG Calling 'git remote'
2025-07-27 00:40:49,555 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:49,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-07-27 00:40:49,556 [ scc.git] DEBUG Calling 'git remote'
2025-07-27 00:40:49,558 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:49,558 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-07-27 00:40:49,558 [ scc.git] DEBUG Calling 'git remote'
2025-07-27 00:40:49,560 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:49,560 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-07-27 00:40:49,560 [ scc.git] DEBUG Calling 'git remote'
2025-07-27 00:40:49,562 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:49,562 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-07-27 00:40:49,562 [ scc.git] DEBUG Calling 'git remote'
2025-07-27 00:40:49,564 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:49,564 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-07-27 00:40:49,564 [ scc.git] DEBUG Calling 'git remote'
2025-07-27 00:40:49,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:49,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-07-27 00:40:49,567 [ scc.git] DEBUG Calling 'git remote'
2025-07-27 00:40:49,569 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:49,569 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-07-27 00:40:49,569 [ scc.git] DEBUG Calling 'git remote'
2025-07-27 00:40:49,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:49,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-07-27 00:40:49,571 [ scc.git] DEBUG Calling 'git remote'
2025-07-27 00:40:49,573 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:49,573 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-07-27 00:40:49,573 [ scc.git] DEBUG Calling 'git remote'
2025-07-27 00:40:49,575 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:49,575 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-07-27 00:40:49,575 [ scc.git] DEBUG Calling 'git remote'
2025-07-27 00:40:49,577 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:49,577 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-07-27 00:40:49,578 [ scc.git] DEBUG Calling 'git remote'
2025-07-27 00:40:49,580 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:49,580 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-07-27 00:40:49,580 [ scc.git] DEBUG Calling 'git remote'
2025-07-27 00:40:49,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:49,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-07-27 00:40:49,582 [ scc.git] DEBUG Calling 'git remote'
2025-07-27 00:40:49,584 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:49,584 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-07-27 00:40:49,584 [ scc.git] DEBUG Calling 'git remote'
2025-07-27 00:40:49,586 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:49,586 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-07-27 00:40:49,586 [ scc.git] DEBUG Calling 'git remote'
2025-07-27 00:40:49,589 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:49,589 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-07-27 00:40:49,589 [ scc.git] DEBUG Calling 'git remote'
2025-07-27 00:40:49,591 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-27 00:40:49,591 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-07-27 00:40:49,591 [ scc.git] DEBUG Calling 'git remote'
2025-07-27 00:40:49,593 [ 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 9abac1c] 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 cf2cb30] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-07-27 00:41:37,843 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2025-07-27 00:41:47,939 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2025-07-27 00:41:50,488 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-07-27 00:41:55,365 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-07-27 00:42:36,268 [ 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