Skipping 217 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-07-28 00:43:55,958 [ scc.git] DEBUG Calling 'git merge-base bb94cf8da960e3283090038b04432f301560f5e4 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-07-28 00:43:55,961 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..bb94cf8da960e3283090038b04432f301560f5e4'
2025-07-28 00:43:55,964 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#490](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-07-28 00:43:55,966 [ scc.config] DEBUG Found github.token
2025-07-28 00:43:55,966 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-07-28 00:43:55,966 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-28 00:43:56,005 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:43:56,005 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:43:56,007 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-28 00:43:56,047 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-28 00:43:56,054 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8d33d65110> has no local changes
2025-07-28 00:43:56,054 [ 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#490 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/)'
2025-07-28 00:43:56,061 [ scc.git] DEBUG [detached HEAD 592bd45] merge master -Dorg -Ssuccess-only
2025-07-28 00:43:56,062 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:43:56,062 [ scc.repo] DEBUG ## PRs found:
2025-07-28 00:43:56,209 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:43:56,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-07-28 00:43:56,753 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:43:56,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-07-28 00:43:57,235 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:43:57,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-07-28 00:43:57,796 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:43:58,062 [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-28 00:43:58,313 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:43:58,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-07-28 00:43:58,784 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:43:58,971 [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-28 00:43:58,972 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-28 00:43:59,223 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:43:59,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-07-28 00:43:59,725 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:43:59,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-07-28 00:44:00,238 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:00,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-07-28 00:44:00,758 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:00,962 [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-28 00:44:01,214 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:01,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-07-28 00:44:01,685 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:01,893 [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-28 00:44:01,893 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-07-28 00:44:01,893 [ scc.repo] DEBUG ## Branches found:
2025-07-28 00:44:01,893 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-07-28 00:44:01,894 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:01,894 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:01,896 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-28 00:44:01,899 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-28 00:44:01,899 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-28 00:44:01,902 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-28 00:44:01,905 [ scc.git] DEBUG Already up to date.
2025-07-28 00:44:01,905 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-07-28 00:44:02,180 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-07-28 00:44:02,181 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-07-28 00:44:02,185 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-07-28 00:44:02,468 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-07-28 00:44:02,468 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-07-28 00:44:02,472 [ scc.git] DEBUG ## Unique users: []
2025-07-28 00:44:02,472 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:02,472 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:02,475 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-07-28 00:44:02,479 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:02,481 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-07-28 00:44:02,490 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-28 00:44:02,494 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-07-28 00:44:02,494 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-07-28 00:44:02,494 [ scc.git] DEBUG requirements.txt | 2 +-
2025-07-28 00:44:02,494 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-07-28 00:44:02,494 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-07-28 00:44:02,494 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-07-28 00:44:02,495 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:02,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:44:02,664 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-07-28 00:44:02,668 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:02,671 [ 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-28 00:44:02,680 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-28 00:44:02,683 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-07-28 00:44:02,683 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-07-28 00:44:02,915 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:03,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:44:03,090 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-28 00:44:03,130 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:03,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:03,132 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-28 00:44:03,172 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-28 00:44:03,176 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8d33ef3990> has no local changes
2025-07-28 00:44:03,176 [ 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#490 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/)'
2025-07-28 00:44:03,182 [ scc.git] DEBUG [detached HEAD 278a9a9] merge master -Dorg -Ssuccess-only
2025-07-28 00:44:03,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:44:03,182 [ scc.repo] DEBUG ## PRs found:
2025-07-28 00:44:03,341 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:03,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-07-28 00:44:03,893 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:04,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-07-28 00:44:04,382 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:04,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-07-28 00:44:04,865 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:05,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-07-28 00:44:05,407 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:05,629 [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-28 00:44:05,881 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:06,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-07-28 00:44:06,468 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:06,700 [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-28 00:44:06,700 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-07-28 00:44:06,951 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:07,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-07-28 00:44:07,421 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:07,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-07-28 00:44:07,884 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:08,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-07-28 00:44:08,431 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:08,664 [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-28 00:44:08,915 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:09,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-07-28 00:44:09,441 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:09,640 [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-28 00:44:09,641 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-07-28 00:44:09,641 [ scc.repo] DEBUG ## Branches found:
2025-07-28 00:44:09,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-07-28 00:44:09,641 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:09,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:09,644 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-28 00:44:09,646 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-28 00:44:09,646 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-28 00:44:09,649 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-28 00:44:09,656 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-07-28 00:44:09,892 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:10,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-07-28 00:44:10,331 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-07-28 00:44:10,620 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-07-28 00:44:10,620 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-07-28 00:44:10,624 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-07-28 00:44:10,908 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-07-28 00:44:10,908 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-07-28 00:44:10,913 [ scc.git] DEBUG ## Unique users: []
2025-07-28 00:44:10,913 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:10,913 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:10,916 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-07-28 00:44:10,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:10,922 [ 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-28 00:44:10,936 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-07-28 00:44:10,936 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-07-28 00:44:10,936 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-07-28 00:44:10,936 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-07-28 00:44:10,936 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-28 00:44:10,936 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-28 00:44:10,939 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-28 00:44:10,944 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-07-28 00:44:10,945 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:11,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:44:11,152 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-07-28 00:44:11,156 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-28 00:44:11,160 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#490](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-07-28 00:44:11,162 [ scc.config] DEBUG Found github.token
2025-07-28 00:44:11,162 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-07-28 00:44:11,162 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-07-28 00:44:11,166 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:11,169 [ 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-28 00:44:11,183 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-07-28 00:44:11,183 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-07-28 00:44:11,183 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-07-28 00:44:11,183 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-28 00:44:11,184 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-28 00:44:11,187 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-28 00:44:11,191 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-07-28 00:44:11,403 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:11,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:44:11,587 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-07-28 00:44:11,591 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-28 00:44:11,594 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#490](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/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-28 00:44:11,596 [ scc.config] DEBUG Found github.token
2025-07-28 00:44:11,596 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-07-28 00:44:11,596 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-28 00:44:11,636 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:11,636 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:11,639 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-28 00:44:11,677 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-28 00:44:11,682 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8d33d52590> has no local changes
2025-07-28 00:44:11,682 [ 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#490 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/)'
2025-07-28 00:44:11,689 [ scc.git] DEBUG [detached HEAD 052d454] merge master -Dorg -Ssuccess-only
2025-07-28 00:44:11,689 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:44:11,689 [ scc.repo] DEBUG ## PRs found:
2025-07-28 00:44:11,837 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:12,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-07-28 00:44:12,399 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:12,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-07-28 00:44:12,873 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:13,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-07-28 00:44:13,427 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:13,685 [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-28 00:44:13,937 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:14,165 [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-28 00:44:14,416 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:14,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-07-28 00:44:14,886 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:15,084 [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-28 00:44:15,084 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-28 00:44:15,335 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:15,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-07-28 00:44:15,593 [ scc.repo] DEBUG # ... Include label: dependencies
2025-07-28 00:44:15,844 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:16,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-07-28 00:44:16,391 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:16,662 [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-28 00:44:16,914 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:17,228 [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-28 00:44:17,480 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:17,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-07-28 00:44:18,108 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:18,332 [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-28 00:44:18,333 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-07-28 00:44:18,583 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:18,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-07-28 00:44:18,833 [ scc.repo] DEBUG # ... Include label: dependencies
2025-07-28 00:44:19,084 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:19,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-07-28 00:44:19,709 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:19,968 [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-28 00:44:20,220 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:20,500 [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-28 00:44:20,751 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:21,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-07-28 00:44:21,312 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:21,508 [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-28 00:44:21,508 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-07-28 00:44:21,759 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:21,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-07-28 00:44:22,229 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:22,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-07-28 00:44:22,740 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:23,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-07-28 00:44:23,287 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:23,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-07-28 00:44:23,767 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:24,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-07-28 00:44:24,284 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:24,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-07-28 00:44:24,753 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:25,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-07-28 00:44:25,037 [ scc.repo] DEBUG ## Branches found:
2025-07-28 00:44:25,038 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-07-28 00:44:25,038 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:25,038 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:25,041 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-28 00:44:25,043 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-28 00:44:25,043 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-28 00:44:25,046 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-28 00:44:25,049 [ scc.git] DEBUG Already up to date.
2025-07-28 00:44:25,049 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-07-28 00:44:25,328 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-07-28 00:44:25,329 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-07-28 00:44:25,333 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-07-28 00:44:25,626 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-07-28 00:44:25,626 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-07-28 00:44:25,631 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-07-28 00:44:25,903 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-07-28 00:44:25,904 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-07-28 00:44:25,908 [ scc.git] DEBUG ## Unique users: []
2025-07-28 00:44:25,909 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:25,909 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:25,911 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-07-28 00:44:25,914 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:25,916 [ 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-28 00:44:25,924 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-28 00:44:25,928 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-07-28 00:44:25,928 [ scc.git] DEBUG package.json | 2 +-
2025-07-28 00:44:25,928 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-07-28 00:44:25,929 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:26,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:44:26,175 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-07-28 00:44:26,178 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:26,181 [ 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-28 00:44:26,191 [ scc.git] DEBUG Auto-merging package-lock.json
2025-07-28 00:44:26,191 [ scc.git] DEBUG Auto-merging package.json
2025-07-28 00:44:26,192 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-28 00:44:26,195 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-07-28 00:44:26,195 [ scc.git] DEBUG package.json | 2 +-
2025-07-28 00:44:26,195 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-07-28 00:44:26,426 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:26,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:44:26,598 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-07-28 00:44:26,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:26,604 [ 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-28 00:44:26,613 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-28 00:44:26,616 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-07-28 00:44:26,616 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-07-28 00:44:26,849 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:27,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:44:27,030 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-28 00:44:27,072 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:27,072 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:27,075 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-28 00:44:27,114 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-28 00:44:27,118 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8d369b8890> has no local changes
2025-07-28 00:44:27,118 [ 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#490 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/)'
2025-07-28 00:44:27,125 [ scc.git] DEBUG [detached HEAD 01ad4ec] merge master -Dorg -Ssuccess-only
2025-07-28 00:44:27,125 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:44:27,125 [ scc.repo] DEBUG ## PRs found:
2025-07-28 00:44:27,281 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:27,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-07-28 00:44:27,464 [ scc.repo] DEBUG ## Branches found:
2025-07-28 00:44:27,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-07-28 00:44:27,464 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:27,464 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:27,466 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-28 00:44:27,469 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-28 00:44:27,469 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-28 00:44:27,471 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-28 00:44:27,474 [ scc.git] DEBUG Already up to date.
2025-07-28 00:44:27,474 [ scc.git] DEBUG ## Unique users: []
2025-07-28 00:44:27,475 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:27,475 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:27,477 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-28 00:44:27,514 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:27,515 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:27,517 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-28 00:44:27,555 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-28 00:44:27,630 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8d32c4d490> has no local changes
2025-07-28 00:44:27,630 [ 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#490 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/)'
2025-07-28 00:44:27,645 [ scc.git] DEBUG [detached HEAD 2eb26f7] merge master -Dorg -Ssuccess-only
2025-07-28 00:44:27,645 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:44:27,645 [ scc.repo] DEBUG ## PRs found:
2025-07-28 00:44:27,715 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:28,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-07-28 00:44:28,299 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:28,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-07-28 00:44:28,836 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:29,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-07-28 00:44:29,308 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:29,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-07-28 00:44:29,591 [ scc.repo] DEBUG ## Branches found:
2025-07-28 00:44:29,591 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-07-28 00:44:29,592 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:29,592 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:29,594 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-28 00:44:29,597 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-28 00:44:29,597 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-28 00:44:29,600 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-28 00:44:29,603 [ scc.git] DEBUG Already up to date.
2025-07-28 00:44:29,603 [ scc.git] DEBUG ## Unique users: []
2025-07-28 00:44:29,603 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:29,603 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:29,605 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-28 00:44:29,646 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:29,646 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:29,648 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-28 00:44:29,686 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-28 00:44:29,689 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8d32c72350> has no local changes
2025-07-28 00:44:29,689 [ 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#490 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/)'
2025-07-28 00:44:29,695 [ scc.git] DEBUG [detached HEAD d6bcc1c] merge master -Dorg -Ssuccess-only
2025-07-28 00:44:29,696 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:44:29,696 [ scc.repo] DEBUG ## PRs found:
2025-07-28 00:44:29,842 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:30,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-07-28 00:44:30,454 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:30,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-07-28 00:44:30,936 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:31,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-07-28 00:44:31,409 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:31,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-07-28 00:44:32,002 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:32,287 [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-28 00:44:32,539 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:32,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-07-28 00:44:33,122 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:33,304 [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-28 00:44:33,305 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-07-28 00:44:33,305 [ scc.repo] DEBUG ## Branches found:
2025-07-28 00:44:33,305 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-07-28 00:44:33,305 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:33,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:33,308 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-28 00:44:33,311 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-28 00:44:33,311 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-28 00:44:33,313 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-28 00:44:33,317 [ scc.git] DEBUG Already up to date.
2025-07-28 00:44:33,317 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-07-28 00:44:33,601 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-07-28 00:44:33,601 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-07-28 00:44:33,605 [ scc.git] DEBUG ## Unique users: []
2025-07-28 00:44:33,605 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:33,605 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:33,608 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-07-28 00:44:33,611 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:33,613 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-07-28 00:44:33,622 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-07-28 00:44:33,622 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-07-28 00:44:33,622 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-07-28 00:44:33,622 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-07-28 00:44:33,622 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-07-28 00:44:33,622 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-07-28 00:44:33,622 [ scc.git] DEBUG Auto-merging setup.py
2025-07-28 00:44:33,622 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-07-28 00:44:33,622 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-28 00:44:33,623 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-28 00:44:33,625 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-07-28 00:44:33,630 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-07-28 00:44:33,632 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:33,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:44:33,807 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-07-28 00:44:33,810 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-07-28 00:44:33,814 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#490](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- setup.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
--conflicts
2025-07-28 00:44:33,816 [ scc.config] DEBUG Found github.token
2025-07-28 00:44:33,816 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-07-28 00:44:33,816 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-28 00:44:33,856 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:33,856 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:33,858 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-28 00:44:33,897 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-28 00:44:33,901 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8d33e4a710> has no local changes
2025-07-28 00:44:33,901 [ 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#490 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/)'
2025-07-28 00:44:33,907 [ scc.git] DEBUG [detached HEAD df6abbc] merge master -Dorg -Ssuccess-only
2025-07-28 00:44:33,908 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:44:33,908 [ scc.repo] DEBUG ## PRs found:
2025-07-28 00:44:34,058 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:34,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-07-28 00:44:34,658 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:34,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-07-28 00:44:35,133 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:35,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-07-28 00:44:35,682 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:35,928 [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-28 00:44:36,179 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:36,425 [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-28 00:44:36,676 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:37,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-07-28 00:44:37,274 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:37,467 [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-28 00:44:37,468 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-07-28 00:44:37,719 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:37,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-07-28 00:44:38,202 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:38,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-07-28 00:44:38,678 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:38,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-07-28 00:44:39,225 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:39,513 [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-28 00:44:39,765 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:39,985 [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-28 00:44:40,237 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:40,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-07-28 00:44:40,754 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:40,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-07-28 00:44:41,214 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:41,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-07-28 00:44:41,690 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:41,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-07-28 00:44:42,174 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:42,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-07-28 00:44:42,715 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:42,947 [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-28 00:44:43,198 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:43,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-07-28 00:44:43,647 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:43,837 [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-28 00:44:43,837 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-07-28 00:44:43,838 [ scc.repo] DEBUG ## Branches found:
2025-07-28 00:44:43,838 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-07-28 00:44:43,838 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:43,838 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:43,840 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-28 00:44:43,843 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-28 00:44:43,843 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-28 00:44:43,846 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-28 00:44:43,849 [ scc.git] DEBUG Already up to date.
2025-07-28 00:44:43,849 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-07-28 00:44:44,164 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-07-28 00:44:44,164 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-07-28 00:44:44,168 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-07-28 00:44:44,457 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-07-28 00:44:44,457 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-07-28 00:44:44,461 [ scc.git] DEBUG ## Unique users: []
2025-07-28 00:44:44,461 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:44,461 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:44,463 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-07-28 00:44:44,468 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:44,470 [ 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-28 00:44:44,482 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-28 00:44:44,485 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-07-28 00:44:44,485 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-07-28 00:44:44,485 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-07-28 00:44:44,485 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-07-28 00:44:44,485 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-07-28 00:44:44,485 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-07-28 00:44:44,485 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-07-28 00:44:44,486 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-07-28 00:44:44,486 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:44,487 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-07-28 00:44:44,487 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-07-28 00:44:44,487 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-07-28 00:44:44,487 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-07-28 00:44:44,487 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-07-28 00:44:44,487 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-07-28 00:44:44,487 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-07-28 00:44:44,487 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-07-28 00:44:44,487 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-07-28 00:44:44,487 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-07-28 00:44:44,487 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-07-28 00:44:44,487 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-07-28 00:44:44,487 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-07-28 00:44:44,487 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-07-28 00:44:44,487 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-07-28 00:44:44,487 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-07-28 00:44:44,487 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-07-28 00:44:44,487 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-07-28 00:44:44,487 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-07-28 00:44:44,487 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-07-28 00:44:44,487 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-07-28 00:44:44,487 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-07-28 00:44:44,487 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-07-28 00:44:44,487 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-07-28 00:44:44,487 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-07-28 00:44:44,487 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-07-28 00:44:44,487 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-07-28 00:44:44,487 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-07-28 00:44:44,487 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-07-28 00:44:44,487 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-07-28 00:44:44,487 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-07-28 00:44:44,488 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-07-28 00:44:44,488 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-07-28 00:44:44,488 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-07-28 00:44:44,488 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-07-28 00:44:44,488 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-07-28 00:44:44,488 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-07-28 00:44:44,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:44:44,652 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-07-28 00:44:44,656 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:44,658 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-07-28 00:44:44,669 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-28 00:44:44,672 [ scc.git] DEBUG docker | 1 +
2025-07-28 00:44:44,672 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-07-28 00:44:44,903 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:45,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:44:45,097 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-28 00:44:45,139 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:45,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:45,142 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-28 00:44:45,182 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-28 00:44:45,186 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8d33ef2650> has no local changes
2025-07-28 00:44:45,186 [ 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#490 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/)'
2025-07-28 00:44:45,192 [ scc.git] DEBUG [detached HEAD 1b936f1] merge master -Dorg -Ssuccess-only
2025-07-28 00:44:45,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:44:45,192 [ scc.repo] DEBUG ## PRs found:
2025-07-28 00:44:45,348 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:45,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-07-28 00:44:45,545 [ scc.repo] DEBUG ## Branches found:
2025-07-28 00:44:45,545 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-07-28 00:44:45,545 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:45,545 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:45,548 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-28 00:44:45,550 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-28 00:44:45,550 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-28 00:44:45,553 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-28 00:44:45,556 [ scc.git] DEBUG Already up to date.
2025-07-28 00:44:45,556 [ scc.git] DEBUG ## Unique users: []
2025-07-28 00:44:45,556 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:45,556 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:45,558 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-28 00:44:45,596 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:45,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:45,598 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-28 00:44:45,635 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-28 00:44:45,638 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8d32c9f690> has no local changes
2025-07-28 00:44:45,638 [ 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#490 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/)'
2025-07-28 00:44:45,644 [ scc.git] DEBUG [detached HEAD d4af581] merge master -Dorg -Ssuccess-only
2025-07-28 00:44:45,645 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:44:45,645 [ scc.repo] DEBUG ## PRs found:
2025-07-28 00:44:45,796 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:46,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2025-07-28 00:44:46,005 [ scc.repo] DEBUG ## Branches found:
2025-07-28 00:44:46,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-07-28 00:44:46,005 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:46,005 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:46,008 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-28 00:44:46,010 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-28 00:44:46,010 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-28 00:44:46,013 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-28 00:44:46,021 [ scc.git] DEBUG Updating deab817..160d894
2025-07-28 00:44:46,256 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:46,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls/20 HTTP/1.1" 200 None
2025-07-28 00:44:46,696 [ scc.git] DEBUG ## Unique users: []
2025-07-28 00:44:46,696 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:46,696 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:46,698 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-28 00:44:46,739 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:46,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:46,741 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-28 00:44:46,780 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-28 00:44:46,783 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8d33e5ad50> has no local changes
2025-07-28 00:44:46,783 [ 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#490 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/)'
2025-07-28 00:44:46,790 [ scc.git] DEBUG [detached HEAD e07d4ec] merge master -Dorg -Ssuccess-only
2025-07-28 00:44:46,790 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:44:46,790 [ scc.git] INFO Overriding base-branch from master to main
2025-07-28 00:44:46,790 [ scc.repo] DEBUG ## PRs found:
2025-07-28 00:44:46,946 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:47,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-07-28 00:44:47,497 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:47,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-07-28 00:44:48,006 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:48,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-07-28 00:44:48,464 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:48,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-07-28 00:44:49,081 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:49,336 [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-28 00:44:49,587 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:49,818 [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-28 00:44:50,070 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:50,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-07-28 00:44:50,555 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:50,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-07-28 00:44:51,041 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:51,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-07-28 00:44:51,531 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:51,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-07-28 00:44:52,133 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:52,347 [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-28 00:44:52,598 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:52,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-07-28 00:44:53,113 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:53,307 [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-28 00:44:53,307 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-07-28 00:44:53,307 [ scc.repo] DEBUG ## Branches found:
2025-07-28 00:44:53,307 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-07-28 00:44:53,307 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:53,307 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:53,310 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-07-28 00:44:53,313 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-28 00:44:53,313 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-07-28 00:44:53,316 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-07-28 00:44:53,319 [ scc.git] DEBUG Already up to date.
2025-07-28 00:44:53,319 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-07-28 00:44:53,609 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-07-28 00:44:53,609 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-07-28 00:44:53,613 [ scc.git] DEBUG ## Unique users: []
2025-07-28 00:44:53,613 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:53,613 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:53,615 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-07-28 00:44:53,618 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:53,621 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-07-28 00:44:53,628 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-07-28 00:44:53,628 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-07-28 00:44:53,629 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-28 00:44:53,629 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-28 00:44:53,632 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-07-28 00:44:53,636 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-07-28 00:44:53,637 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:53,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:44:53,810 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-07-28 00:44:53,813 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-07-28 00:44:53,816 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#490](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-07-28 00:44:53,818 [ scc.config] DEBUG Found github.token
2025-07-28 00:44:53,818 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-07-28 00:44:53,819 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-28 00:44:53,859 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:53,859 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:53,861 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-28 00:44:53,899 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-28 00:44:53,902 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8d32c755d0> has no local changes
2025-07-28 00:44:53,902 [ 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#490 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/)'
2025-07-28 00:44:53,908 [ scc.git] DEBUG [detached HEAD 52c33c3] merge master -Dorg -Ssuccess-only
2025-07-28 00:44:53,909 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:44:53,909 [ scc.repo] DEBUG ## PRs found:
2025-07-28 00:44:54,061 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:54,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-07-28 00:44:54,241 [ scc.repo] DEBUG ## Branches found:
2025-07-28 00:44:54,241 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-07-28 00:44:54,241 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:54,241 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:54,243 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-28 00:44:54,245 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-28 00:44:54,246 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-28 00:44:54,248 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-28 00:44:54,252 [ scc.git] DEBUG Already up to date.
2025-07-28 00:44:54,252 [ scc.git] DEBUG ## Unique users: []
2025-07-28 00:44:54,252 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:54,252 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:54,254 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-28 00:44:54,295 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:54,295 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:54,297 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-28 00:44:54,337 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-28 00:44:54,340 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8d33f78590> has no local changes
2025-07-28 00:44:54,340 [ 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#490 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/)'
2025-07-28 00:44:54,347 [ scc.git] DEBUG [detached HEAD 227602b] merge master -Dorg -Ssuccess-only
2025-07-28 00:44:54,348 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:44:54,348 [ scc.repo] DEBUG ## PRs found:
2025-07-28 00:44:54,492 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:54,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-07-28 00:44:54,752 [ scc.repo] DEBUG ## Branches found:
2025-07-28 00:44:54,752 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-07-28 00:44:54,752 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:54,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:54,755 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-28 00:44:54,757 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-28 00:44:54,757 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-28 00:44:54,760 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-28 00:44:54,764 [ scc.git] DEBUG Already up to date.
2025-07-28 00:44:54,764 [ scc.git] DEBUG ## Unique users: []
2025-07-28 00:44:54,764 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:54,764 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:54,766 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-28 00:44:54,804 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:54,804 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:54,806 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-28 00:44:54,844 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-28 00:44:54,847 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8d33e48610> has no local changes
2025-07-28 00:44:54,847 [ 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#490 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/)'
2025-07-28 00:44:54,854 [ scc.git] DEBUG [detached HEAD 21f1ad7] merge master -Dorg -Ssuccess-only
2025-07-28 00:44:54,854 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:44:54,854 [ scc.repo] DEBUG ## PRs found:
2025-07-28 00:44:55,003 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:55,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-07-28 00:44:55,648 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:55,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-07-28 00:44:56,188 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:56,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-07-28 00:44:56,638 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:56,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-07-28 00:44:57,162 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:57,396 [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-28 00:44:57,647 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:57,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-07-28 00:44:58,179 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:58,387 [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-28 00:44:58,387 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-07-28 00:44:58,387 [ scc.repo] DEBUG ## Branches found:
2025-07-28 00:44:58,387 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-07-28 00:44:58,387 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:58,387 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:58,390 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-28 00:44:58,392 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-28 00:44:58,393 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-28 00:44:58,395 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-28 00:44:58,398 [ scc.git] DEBUG Already up to date.
2025-07-28 00:44:58,398 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-07-28 00:44:58,683 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-07-28 00:44:58,683 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-07-28 00:44:58,687 [ scc.git] DEBUG ## Unique users: []
2025-07-28 00:44:58,688 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:58,688 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:58,690 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-07-28 00:44:58,693 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:58,695 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-07-28 00:44:58,704 [ scc.git] DEBUG Auto-merging Dockerfile
2025-07-28 00:44:58,704 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-07-28 00:44:58,704 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-28 00:44:58,704 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-28 00:44:58,707 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-07-28 00:44:58,712 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-07-28 00:44:58,713 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:58,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:44:58,904 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-07-28 00:44:58,907 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-07-28 00:44:58,910 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#490](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-07-28 00:44:58,912 [ scc.config] DEBUG Found github.token
2025-07-28 00:44:58,912 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-07-28 00:44:58,913 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-28 00:44:58,953 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:44:58,953 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:44:58,955 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-28 00:44:58,994 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-28 00:44:58,998 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8d33e35cd0> has no local changes
2025-07-28 00:44:58,998 [ 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#490 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/)'
2025-07-28 00:44:59,004 [ scc.git] DEBUG [detached HEAD a4ff913] merge master -Dorg -Ssuccess-only
2025-07-28 00:44:59,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:44:59,005 [ scc.git] INFO Overriding base-branch from master to develop
2025-07-28 00:44:59,005 [ scc.repo] DEBUG ## PRs found:
2025-07-28 00:44:59,155 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:44:59,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-07-28 00:44:59,788 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:00,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-07-28 00:45:00,283 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:00,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-07-28 00:45:00,748 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:00,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-07-28 00:45:01,222 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:01,455 [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-28 00:45:01,706 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:01,957 [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-28 00:45:02,209 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:02,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-07-28 00:45:02,732 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:02,943 [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-28 00:45:02,944 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-07-28 00:45:03,195 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:03,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-07-28 00:45:03,676 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:03,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-07-28 00:45:04,138 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:04,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-07-28 00:45:04,659 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:04,884 [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-28 00:45:05,135 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:05,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-07-28 00:45:05,644 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:05,848 [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-28 00:45:05,848 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-07-28 00:45:06,099 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:06,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-07-28 00:45:06,617 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:06,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-07-28 00:45:07,117 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:07,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-07-28 00:45:07,641 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:07,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-07-28 00:45:07,908 [ scc.repo] DEBUG ## Branches found:
2025-07-28 00:45:07,909 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-07-28 00:45:07,909 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:45:07,909 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:45:07,911 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-07-28 00:45:07,914 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-28 00:45:07,914 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-07-28 00:45:07,917 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-07-28 00:45:07,928 [ scc.git] DEBUG Updating 4b4c755..573db34
2025-07-28 00:45:08,159 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:08,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/227 HTTP/1.1" 200 None
2025-07-28 00:45:08,807 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:09,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-07-28 00:45:09,302 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-07-28 00:45:09,620 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-07-28 00:45:09,620 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-07-28 00:45:09,625 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-07-28 00:45:09,930 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-07-28 00:45:09,930 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-07-28 00:45:09,934 [ scc.git] DEBUG ## Unique users: []
2025-07-28 00:45:09,934 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:45:09,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:45:09,937 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-07-28 00:45:09,943 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:45:09,945 [ 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-28 00:45:09,956 [ 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-28 00:45:09,957 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-28 00:45:09,957 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-28 00:45:09,959 [ scc.git] DEBUG Calling 'git reset --hard 573db340d5d1429fa17c7e486206948412a7c150'
2025-07-28 00:45:09,963 [ scc.git] DEBUG HEAD is now at 573db34 Bump version: 5.9.1 → 5.9.2.dev0
2025-07-28 00:45:09,965 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:10,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:45:10,140 [ scc.git] DEBUG Calling 'git merge-base 573db340d5d1429fa17c7e486206948412a7c150 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-07-28 00:45:10,146 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..573db340d5d1429fa17c7e486206948412a7c150'
2025-07-28 00:45:10,151 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#490](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-07-28 00:45:10,153 [ scc.config] DEBUG Found github.token
2025-07-28 00:45:10,153 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-07-28 00:45:10,153 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-07-28 00:45:10,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:45:10,160 [ 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-28 00:45:10,170 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-28 00:45:10,173 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-07-28 00:45:10,173 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-07-28 00:45:10,391 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:10,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:45:10,578 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-28 00:45:10,619 [ scc.git] DEBUG Get sha1 of %s
2025-07-28 00:45:10,619 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-28 00:45:10,622 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-28 00:45:10,660 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-28 00:45:10,664 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8d32ce9f10> has no local changes
2025-07-28 00:45:10,664 [ 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#490 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/)'
2025-07-28 00:45:10,670 [ scc.git] DEBUG [detached HEAD a404b7f] merge master -Dorg -Ssuccess-only
2025-07-28 00:45:10,671 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:45:10,671 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-28 00:45:10,747 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-07-28 00:45:10,829 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:11,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:45:11,007 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-07-28 00:45:11,009 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-07-28 00:45:11,253 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:11,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:45:11,431 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-07-28 00:45:11,433 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-07-28 00:45:11,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:11,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:45:11,855 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-07-28 00:45:11,857 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-07-28 00:45:12,101 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:12,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:45:12,294 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-07-28 00:45:12,538 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:12,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:45:12,713 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-07-28 00:45:12,716 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-07-28 00:45:12,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:13,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:45:13,154 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-07-28 00:45:13,156 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-07-28 00:45:13,400 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:13,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:45:13,621 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-07-28 00:45:13,623 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-07-28 00:45:13,868 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:14,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:45:14,062 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-07-28 00:45:14,064 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-07-28 00:45:14,308 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:14,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:45:14,505 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-07-28 00:45:14,507 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-07-28 00:45:14,752 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:14,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:45:14,960 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-07-28 00:45:14,962 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-07-28 00:45:15,205 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:15,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:45:15,384 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-07-28 00:45:15,386 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-07-28 00:45:15,630 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:15,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:45:15,828 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-07-28 00:45:15,830 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-07-28 00:45:16,074 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:16,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:45:16,275 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-07-28 00:45:16,519 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:16,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:45:16,693 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-07-28 00:45:16,937 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:17,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:45:17,122 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-07-28 00:45:17,124 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-07-28 00:45:17,367 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:17,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:45:17,545 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-07-28 00:45:17,789 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:17,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:45:17,973 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-07-28 00:45:18,218 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:18,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:45:18,401 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-07-28 00:45:18,403 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-07-28 00:45:18,647 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:18,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:45:18,829 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-07-28 00:45:18,831 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-07-28 00:45:19,075 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:19,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:45:19,259 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-07-28 00:45:19,261 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-07-28 00:45:19,506 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:19,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:45:19,671 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-07-28 00:45:19,673 [ scc.config] DEBUG Found submodule.scripts.url
2025-07-28 00:45:19,918 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-28 00:45:20,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-28 00:45:20,108 [ scc.config] DEBUG Found submodule.scripts.branch
2025-07-28 00:45:20,108 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-28 00:45:20,195 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8d33e2bb90> has local changes
2025-07-28 00:45:20,195 [ 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#490 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/490/)'
2025-07-28 00:45:20,208 [ scc.git] DEBUG [detached HEAD 2f99ab3] merge master -Dorg -Ssuccess-only
2025-07-28 00:45:20,208 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-07-28 00:45:20,208 [ scc.merge] INFO Repository: ome/omero-plugins
2025-07-28 00:45:20,208 [ scc.merge] INFO Already up to date.
2025-07-28 00:45:20,208 [ scc.merge] INFO
2025-07-28 00:45:20,209 [ scc.merge] INFO Merged PRs:
2025-07-28 00:45:20,209 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-07-28 00:45:20,209 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-07-28 00:45:20,209 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-07-28 00:45:20,209 [ scc.merge] INFO
2025-07-28 00:45:20,209 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-07-28 00:45:20,209 [ scc.merge] INFO Already up to date.
2025-07-28 00:45:20,209 [ scc.merge] INFO
2025-07-28 00:45:20,209 [ scc.merge] INFO
2025-07-28 00:45:20,209 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-07-28 00:45:20,209 [ scc.merge] INFO Excluded PRs:
2025-07-28 00:45:20,209 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-07-28 00:45:20,209 [ scc.merge] INFO Already up to date.
2025-07-28 00:45:20,209 [ scc.merge] INFO
2025-07-28 00:45:20,209 [ scc.merge] INFO
2025-07-28 00:45:20,209 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-07-28 00:45:20,209 [ scc.merge] INFO Excluded PRs:
2025-07-28 00:45:20,209 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-07-28 00:45:20,209 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-07-28 00:45:20,209 [ scc.merge] INFO Already up to date.
2025-07-28 00:45:20,209 [ scc.merge] INFO
2025-07-28 00:45:20,209 [ scc.merge] INFO Merged PRs:
2025-07-28 00:45:20,209 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-07-28 00:45:20,209 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-07-28 00:45:20,209 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-07-28 00:45:20,209 [ scc.merge] INFO
2025-07-28 00:45:20,209 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-07-28 00:45:20,209 [ scc.merge] INFO Excluded PRs:
2025-07-28 00:45:20,209 [ scc.merge] INFO - PR 174 will-moore 'Skip wells' (stage: draft)
2025-07-28 00:45:20,209 [ scc.merge] INFO - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
2025-07-28 00:45:20,209 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-07-28 00:45:20,209 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-07-28 00:45:20,209 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-07-28 00:45:20,209 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-07-28 00:45:20,209 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-07-28 00:45:20,209 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-07-28 00:45:20,209 [ scc.merge] INFO Updating 11d3587..f7eea7c
2025-07-28 00:45:20,209 [ scc.merge] INFO Previously merged:
2025-07-28 00:45:20,209 [ scc.merge] INFO - PR 179 will-moore 'Changelog 0.6.0'
2025-07-28 00:45:20,210 [ scc.merge] INFO - PR 177 jburel 'Replace fromstring by frombuffer'
2025-07-28 00:45:20,210 [ scc.merge] INFO - PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
2025-07-28 00:45:20,210 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-07-28 00:45:20,210 [ scc.merge] INFO - PR 173 will-moore 'Add test_export_plate_polygons()'
2025-07-28 00:45:20,210 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-07-28 00:45:20,210 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-28 00:45:20,210 [ scc.merge] INFO
2025-07-28 00:45:20,210 [ scc.merge] INFO Merged PRs:
2025-07-28 00:45:20,210 [ scc.merge] INFO - PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
2025-07-28 00:45:20,210 [ scc.merge] INFO
2025-07-28 00:45:20,210 [ scc.merge] INFO Repository: ome/omero-figure
2025-07-28 00:45:20,210 [ scc.merge] INFO Excluded PRs:
2025-07-28 00:45:20,210 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-07-28 00:45:20,210 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-07-28 00:45:20,210 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-07-28 00:45:20,210 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-07-28 00:45:20,210 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-07-28 00:45:20,210 [ scc.merge] INFO Previously merged:
2025-07-28 00:45:20,210 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-07-28 00:45:20,210 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-07-28 00:45:20,210 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-07-28 00:45:20,210 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-28 00:45:20,210 [ scc.merge] INFO
2025-07-28 00:45:20,210 [ scc.merge] INFO Merged PRs:
2025-07-28 00:45:20,210 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-07-28 00:45:20,210 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-07-28 00:45:20,210 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-07-28 00:45:20,210 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-07-28 00:45:20,210 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-07-28 00:45:20,210 [ scc.merge] INFO
2025-07-28 00:45:20,210 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-28 00:45:20,210 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-07-28 00:45:20,210 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-07-28 00:45:20,210 [ scc.merge] INFO
2025-07-28 00:45:20,210 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-07-28 00:45:20,210 [ scc.merge] INFO Already up to date.
2025-07-28 00:45:20,210 [ scc.merge] INFO
2025-07-28 00:45:20,210 [ scc.merge] INFO Merged PRs:
2025-07-28 00:45:20,210 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-07-28 00:45:20,210 [ scc.merge] INFO
2025-07-28 00:45:20,211 [ scc.merge] INFO Repository: ome/omero-gallery
2025-07-28 00:45:20,211 [ scc.merge] INFO Already up to date.
2025-07-28 00:45:20,211 [ scc.merge] INFO
2025-07-28 00:45:20,211 [ scc.merge] INFO Merged PRs:
2025-07-28 00:45:20,211 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-07-28 00:45:20,211 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-07-28 00:45:20,211 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-07-28 00:45:20,211 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-07-28 00:45:20,211 [ scc.merge] INFO
2025-07-28 00:45:20,211 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-28 00:45:20,211 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-07-28 00:45:20,211 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-07-28 00:45:20,211 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-07-28 00:45:20,211 [ scc.merge] INFO
2025-07-28 00:45:20,211 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-07-28 00:45:20,211 [ scc.merge] INFO Excluded PRs:
2025-07-28 00:45:20,211 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-07-28 00:45:20,211 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-07-28 00:45:20,211 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-07-28 00:45:20,211 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-07-28 00:45:20,211 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-07-28 00:45:20,211 [ scc.merge] INFO Updating 7a798ce..bb94cf8
2025-07-28 00:45:20,211 [ scc.merge] INFO Previously merged:
2025-07-28 00:45:20,211 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-28 00:45:20,211 [ scc.merge] INFO
2025-07-28 00:45:20,211 [ scc.merge] INFO Merged PRs:
2025-07-28 00:45:20,211 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-07-28 00:45:20,211 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-07-28 00:45:20,211 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-07-28 00:45:20,211 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-07-28 00:45:20,211 [ scc.merge] INFO
2025-07-28 00:45:20,211 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-28 00:45:20,211 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-07-28 00:45:20,211 [ scc.merge] INFO
2025-07-28 00:45:20,211 [ scc.merge] INFO Repository: ome/omero-mapr
2025-07-28 00:45:20,211 [ scc.merge] INFO Excluded PRs:
2025-07-28 00:45:20,211 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-07-28 00:45:20,211 [ scc.merge] INFO Already up to date.
2025-07-28 00:45:20,211 [ scc.merge] INFO
2025-07-28 00:45:20,211 [ scc.merge] INFO Merged PRs:
2025-07-28 00:45:20,211 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-07-28 00:45:20,212 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-28 00:45:20,212 [ scc.merge] INFO
2025-07-28 00:45:20,212 [ scc.merge] INFO Repository: ome/omero-metadata
2025-07-28 00:45:20,212 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-07-28 00:45:20,212 [ scc.merge] INFO Previously merged:
2025-07-28 00:45:20,212 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-28 00:45:20,212 [ scc.merge] INFO
2025-07-28 00:45:20,212 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-28 00:45:20,212 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-07-28 00:45:20,212 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-07-28 00:45:20,212 [ scc.merge] INFO
2025-07-28 00:45:20,212 [ scc.merge] INFO Repository: ome/omero-parade
2025-07-28 00:45:20,212 [ scc.merge] INFO Excluded PRs:
2025-07-28 00:45:20,212 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-07-28 00:45:20,212 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-07-28 00:45:20,212 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-07-28 00:45:20,212 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-07-28 00:45:20,212 [ scc.merge] INFO Already up to date.
2025-07-28 00:45:20,212 [ scc.merge] INFO
2025-07-28 00:45:20,212 [ scc.merge] INFO Merged PRs:
2025-07-28 00:45:20,212 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-07-28 00:45:20,212 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-07-28 00:45:20,212 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-28 00:45:20,212 [ scc.merge] INFO
2025-07-28 00:45:20,212 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-07-28 00:45:20,212 [ scc.merge] INFO Already up to date.
2025-07-28 00:45:20,212 [ scc.merge] INFO
2025-07-28 00:45:20,212 [ scc.merge] INFO
2025-07-28 00:45:20,212 [ scc.merge] INFO Repository: ome/omero-rois
2025-07-28 00:45:20,212 [ scc.merge] INFO Excluded PRs:
2025-07-28 00:45:20,212 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-07-28 00:45:20,212 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-07-28 00:45:20,212 [ scc.merge] INFO Already up to date.
2025-07-28 00:45:20,212 [ scc.merge] INFO
2025-07-28 00:45:20,212 [ scc.merge] INFO
2025-07-28 00:45:20,212 [ scc.merge] INFO Repository: ome/omero-signup
2025-07-28 00:45:20,212 [ scc.merge] INFO Already up to date.
2025-07-28 00:45:20,212 [ scc.merge] INFO
2025-07-28 00:45:20,212 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-28 00:45:20,212 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-07-28 00:45:20,212 [ scc.merge] INFO
2025-07-28 00:45:20,213 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-07-28 00:45:20,213 [ scc.merge] INFO Excluded PRs:
2025-07-28 00:45:20,213 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-07-28 00:45:20,213 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-07-28 00:45:20,213 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-07-28 00:45:20,213 [ scc.merge] INFO Already up to date.
2025-07-28 00:45:20,213 [ scc.merge] INFO
2025-07-28 00:45:20,213 [ scc.merge] INFO Merged PRs:
2025-07-28 00:45:20,213 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-07-28 00:45:20,213 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-07-28 00:45:20,213 [ scc.merge] INFO
2025-07-28 00:45:20,213 [ scc.merge] INFO Repository: ome/omero-upload
2025-07-28 00:45:20,213 [ scc.merge] INFO Already up to date.
2025-07-28 00:45:20,213 [ scc.merge] INFO
2025-07-28 00:45:20,213 [ scc.merge] INFO
2025-07-28 00:45:20,213 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-07-28 00:45:20,213 [ scc.merge] INFO Updating deab817..160d894
2025-07-28 00:45:20,213 [ scc.merge] INFO Previously merged:
2025-07-28 00:45:20,213 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-07-28 00:45:20,213 [ scc.merge] INFO
2025-07-28 00:45:20,213 [ scc.merge] INFO
2025-07-28 00:45:20,213 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-07-28 00:45:20,213 [ scc.merge] INFO Excluded PRs:
2025-07-28 00:45:20,213 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-07-28 00:45:20,213 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-07-28 00:45:20,213 [ scc.merge] INFO Already up to date.
2025-07-28 00:45:20,213 [ scc.merge] INFO
2025-07-28 00:45:20,213 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-28 00:45:20,213 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-07-28 00:45:20,213 [ scc.merge] INFO
2025-07-28 00:45:20,213 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-07-28 00:45:20,213 [ scc.merge] INFO Already up to date.
2025-07-28 00:45:20,213 [ scc.merge] INFO
2025-07-28 00:45:20,213 [ scc.merge] INFO
2025-07-28 00:45:20,213 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-07-28 00:45:20,213 [ scc.merge] INFO Already up to date.
2025-07-28 00:45:20,213 [ scc.merge] INFO
2025-07-28 00:45:20,213 [ scc.merge] INFO
2025-07-28 00:45:20,213 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-07-28 00:45:20,213 [ scc.merge] INFO Already up to date.
2025-07-28 00:45:20,213 [ scc.merge] INFO
2025-07-28 00:45:20,213 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-28 00:45:20,214 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-07-28 00:45:20,214 [ scc.merge] INFO
2025-07-28 00:45:20,214 [ scc.merge] INFO Repository: ome/scripts
2025-07-28 00:45:20,214 [ scc.merge] INFO Excluded PRs:
2025-07-28 00:45:20,214 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-07-28 00:45:20,214 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-07-28 00:45:20,214 [ scc.merge] INFO Updating 4b4c755..573db34
2025-07-28 00:45:20,214 [ scc.merge] INFO Previously merged:
2025-07-28 00:45:20,214 [ scc.merge] INFO - PR 227 jburel 'Replace tostring by tobytes'
2025-07-28 00:45:20,214 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-07-28 00:45:20,214 [ scc.merge] INFO
2025-07-28 00:45:20,214 [ scc.merge] INFO Merged PRs:
2025-07-28 00:45:20,214 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-07-28 00:45:20,214 [ scc.merge] INFO
2025-07-28 00:45:20,214 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-28 00:45:20,214 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-07-28 00:45:20,214 [ scc.merge] INFO
2025-07-28 00:45:20,214 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-07-28 00:45:20,214 [ scc.git] DEBUG Calling 'git remote'
2025-07-28 00:45:20,216 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-07-28 00:45:20,216 [ scc.git] DEBUG Calling 'git remote'
2025-07-28 00:45:20,218 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:45:20,219 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-07-28 00:45:20,219 [ scc.git] DEBUG Calling 'git remote'
2025-07-28 00:45:20,221 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:45:20,221 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-07-28 00:45:20,221 [ scc.git] DEBUG Calling 'git remote'
2025-07-28 00:45:20,223 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:45:20,223 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-07-28 00:45:20,223 [ scc.git] DEBUG Calling 'git remote'
2025-07-28 00:45:20,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:45:20,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-07-28 00:45:20,225 [ scc.git] DEBUG Calling 'git remote'
2025-07-28 00:45:20,227 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:45:20,227 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-07-28 00:45:20,228 [ scc.git] DEBUG Calling 'git remote'
2025-07-28 00:45:20,230 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:45:20,230 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-07-28 00:45:20,230 [ scc.git] DEBUG Calling 'git remote'
2025-07-28 00:45:20,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:45:20,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-07-28 00:45:20,232 [ scc.git] DEBUG Calling 'git remote'
2025-07-28 00:45:20,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:45:20,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-07-28 00:45:20,234 [ scc.git] DEBUG Calling 'git remote'
2025-07-28 00:45:20,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:45:20,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-07-28 00:45:20,237 [ scc.git] DEBUG Calling 'git remote'
2025-07-28 00:45:20,239 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:45:20,239 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-07-28 00:45:20,239 [ scc.git] DEBUG Calling 'git remote'
2025-07-28 00:45:20,241 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:45:20,241 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-07-28 00:45:20,241 [ scc.git] DEBUG Calling 'git remote'
2025-07-28 00:45:20,244 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:45:20,244 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-07-28 00:45:20,244 [ scc.git] DEBUG Calling 'git remote'
2025-07-28 00:45:20,246 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:45:20,246 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-07-28 00:45:20,246 [ scc.git] DEBUG Calling 'git remote'
2025-07-28 00:45:20,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:45:20,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-07-28 00:45:20,248 [ scc.git] DEBUG Calling 'git remote'
2025-07-28 00:45:20,250 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:45:20,250 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-07-28 00:45:20,250 [ scc.git] DEBUG Calling 'git remote'
2025-07-28 00:45:20,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:45:20,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-07-28 00:45:20,253 [ scc.git] DEBUG Calling 'git remote'
2025-07-28 00:45:20,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:45:20,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-07-28 00:45:20,255 [ scc.git] DEBUG Calling 'git remote'
2025-07-28 00:45:20,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:45:20,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-07-28 00:45:20,257 [ scc.git] DEBUG Calling 'git remote'
2025-07-28 00:45:20,259 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:45:20,259 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-07-28 00:45:20,260 [ scc.git] DEBUG Calling 'git remote'
2025-07-28 00:45:20,262 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:45:20,262 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-07-28 00:45:20,262 [ scc.git] DEBUG Calling 'git remote'
2025-07-28 00:45:20,264 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-28 00:45:20,264 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-07-28 00:45:20,264 [ scc.git] DEBUG Calling 'git remote'
2025-07-28 00:45:20,266 [ 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 d5a91cd] 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 b1b359a] 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-28 00:46:08,615 [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-28 00:46:18,340 [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-28 00:46:20,839 [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-28 00:46:25,852 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-07-28 00:47:07,452 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/eb00aee0/images/svgs/logo.svg){kind=logo}
