Skipping 213 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-10-15 00:55:39,129 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-10-15 00:55:39,130 [ scc.repo] DEBUG ## Branches found:
2025-10-15 00:55:39,130 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-10-15 00:55:39,130 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:55:39,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:55:39,132 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-15 00:55:39,134 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-15 00:55:39,134 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-15 00:55:39,137 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-15 00:55:39,143 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-10-15 00:55:39,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-10-15 00:55:39,898 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-10-15 00:55:40,705 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-10-15 00:55:40,705 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-10-15 00:55:40,709 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-10-15 00:55:41,334 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-10-15 00:55:41,334 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-10-15 00:55:41,338 [ scc.git] DEBUG ## Unique users: []
2025-10-15 00:55:41,338 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:55:41,338 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:55:41,340 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-10-15 00:55:41,344 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:55:41,346 [ 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-10-15 00:55:41,536 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-10-15 00:55:41,536 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-10-15 00:55:41,536 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-10-15 00:55:41,536 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-10-15 00:55:41,536 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-10-15 00:55:41,537 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-10-15 00:55:41,539 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-10-15 00:55:41,543 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-10-15 00:55:41,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:55:41,682 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-10-15 00:55:41,687 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-10-15 00:55:41,690 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#558](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-10-15 00:55:41,692 [ scc.config] DEBUG Found github.token
2025-10-15 00:55:41,692 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-10-15 00:55:41,692 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-10-15 00:55:41,696 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:55:41,698 [ 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-10-15 00:55:41,848 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-10-15 00:55:41,848 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-10-15 00:55:41,848 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-10-15 00:55:41,848 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-10-15 00:55:41,848 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-10-15 00:55:41,851 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-10-15 00:55:41,855 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-10-15 00:55:42,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:55:42,100 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-10-15 00:55:42,105 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-10-15 00:55:42,108 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#558](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/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-10-15 00:55:42,110 [ scc.config] DEBUG Found github.token
2025-10-15 00:55:42,110 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-10-15 00:55:42,110 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-15 00:55:42,148 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:55:42,148 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:55:42,150 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-15 00:55:42,185 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-15 00:55:42,188 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa07004b610> has no local changes
2025-10-15 00:55:42,188 [ 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#558 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/)'
2025-10-15 00:55:42,193 [ scc.git] DEBUG [detached HEAD 4c9776c] merge master -Dorg -Ssuccess-only
2025-10-15 00:55:42,194 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:55:42,194 [ scc.repo] DEBUG ## PRs found:
2025-10-15 00:55:42,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-10-15 00:55:43,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-10-15 00:55:43,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-10-15 00:55:44,193 [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-10-15 00:55:44,679 [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-10-15 00:55:45,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-10-15 00:55:45,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-10-15 00:55:45,574 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-10-15 00:55:46,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-10-15 00:55:46,059 [ scc.repo] DEBUG # ... Include label: dependencies
2025-10-15 00:55:46,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-10-15 00:55:47,134 [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-10-15 00:55:47,645 [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-10-15 00:55:48,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-10-15 00:55:48,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-10-15 00:55:48,601 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-10-15 00:55:49,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-10-15 00:55:49,093 [ scc.repo] DEBUG # ... Include label: dependencies
2025-10-15 00:55:49,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-10-15 00:55:50,147 [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-10-15 00:55:50,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-15 00:55:51,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-10-15 00:55:51,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-10-15 00:55:51,635 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-10-15 00:55:52,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-10-15 00:55:52,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-10-15 00:55:53,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-10-15 00:55:53,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-10-15 00:55:54,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-10-15 00:55:54,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-10-15 00:55:55,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-10-15 00:55:55,181 [ scc.repo] DEBUG ## Branches found:
2025-10-15 00:55:55,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-10-15 00:55:55,182 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:55:55,182 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:55:55,184 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-15 00:55:55,186 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-15 00:55:55,186 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-15 00:55:55,189 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-15 00:55:55,191 [ scc.git] DEBUG Already up to date.
2025-10-15 00:55:55,191 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-10-15 00:55:55,486 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-10-15 00:55:55,486 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-10-15 00:55:55,490 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-10-15 00:55:55,767 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-10-15 00:55:55,767 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-10-15 00:55:55,772 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-10-15 00:55:56,138 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-10-15 00:55:56,138 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-10-15 00:55:56,142 [ scc.git] DEBUG ## Unique users: []
2025-10-15 00:55:56,143 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:55:56,143 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:55:56,145 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-10-15 00:55:56,199 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:55:56,201 [ 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-10-15 00:55:56,320 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-15 00:55:56,323 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-10-15 00:55:56,323 [ scc.git] DEBUG package.json | 2 +-
2025-10-15 00:55:56,323 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-10-15 00:55:56,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:55:56,466 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-10-15 00:55:56,522 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:55:56,524 [ 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-10-15 00:55:56,697 [ scc.git] DEBUG Auto-merging package-lock.json
2025-10-15 00:55:56,697 [ scc.git] DEBUG Auto-merging package.json
2025-10-15 00:55:56,698 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-15 00:55:56,701 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-10-15 00:55:56,701 [ scc.git] DEBUG package.json | 2 +-
2025-10-15 00:55:56,701 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-10-15 00:55:56,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:55:56,854 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-10-15 00:55:56,856 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:55:56,858 [ 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-10-15 00:55:56,865 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-15 00:55:56,868 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-10-15 00:55:56,868 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-10-15 00:55:57,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:55:57,281 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-15 00:55:57,317 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:55:57,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:55:57,319 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-15 00:55:57,354 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-15 00:55:57,358 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa06ef1f510> has no local changes
2025-10-15 00:55:57,358 [ 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#558 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/)'
2025-10-15 00:55:57,363 [ scc.git] DEBUG [detached HEAD 679c82f] merge master -Dorg -Ssuccess-only
2025-10-15 00:55:57,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:55:57,364 [ scc.repo] DEBUG ## PRs found:
2025-10-15 00:55:57,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2025-10-15 00:55:58,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/16 HTTP/1.1" 200 None
2025-10-15 00:55:58,248 [ scc.repo] DEBUG # ... Include label: dependencies
2025-10-15 00:55:58,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/5381b9f25e1666d81d236039a1317276291e9b2e HTTP/1.1" 200 None
2025-10-15 00:55:59,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/5381b9f25e1666d81d236039a1317276291e9b2e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-15 00:55:59,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/5381b9f25e1666d81d236039a1317276291e9b2e/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-15 00:56:00,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/5381b9f25e1666d81d236039a1317276291e9b2e HTTP/1.1" 200 None
2025-10-15 00:56:00,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/5381b9f25e1666d81d236039a1317276291e9b2e?per_page=1 HTTP/1.1" 200 2
2025-10-15 00:56:00,769 [ scc.repo] DEBUG - PR 16 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-15 00:56:00,769 [ scc.repo] DEBUG ## Branches found:
2025-10-15 00:56:00,770 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-10-15 00:56:00,770 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:00,770 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:00,772 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-15 00:56:00,774 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-15 00:56:00,775 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-15 00:56:00,777 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-15 00:56:00,780 [ scc.git] DEBUG Already up to date.
2025-10-15 00:56:00,780 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2025-10-15 00:56:01,068 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2025-10-15 00:56:01,068 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2025-10-15 00:56:01,072 [ scc.git] DEBUG ## Unique users: []
2025-10-15 00:56:01,072 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:01,072 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:01,075 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5381b9f25e1666d81d236039a1317276291e9b2e'
2025-10-15 00:56:01,077 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:01,079 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows) 5381b9f25e1666d81d236039a1317276291e9b2e'
2025-10-15 00:56:01,085 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-15 00:56:01,088 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-10-15 00:56:01,088 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-10-15 00:56:01,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:56:01,235 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-15 00:56:01,270 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:01,270 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:01,272 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-15 00:56:01,308 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-15 00:56:01,310 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa06ef32b90> has no local changes
2025-10-15 00:56:01,311 [ 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.
Merged PRs:
- PR 16 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Generated by OMERO-plugins-push#558 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/)'
2025-10-15 00:56:01,316 [ scc.git] DEBUG [detached HEAD f9feb4c] merge master -Dorg -Ssuccess-only
2025-10-15 00:56:01,316 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:56:01,316 [ scc.repo] DEBUG ## PRs found:
2025-10-15 00:56:01,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-10-15 00:56:02,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/34 HTTP/1.1" 200 None
2025-10-15 00:56:02,242 [ scc.repo] DEBUG # ... Include label: dependencies
2025-10-15 00:56:02,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/149bb248277256d589ea0db597c04739e8134301 HTTP/1.1" 200 None
2025-10-15 00:56:03,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/149bb248277256d589ea0db597c04739e8134301/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-15 00:56:03,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/149bb248277256d589ea0db597c04739e8134301/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-15 00:56:04,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/149bb248277256d589ea0db597c04739e8134301 HTTP/1.1" 200 None
2025-10-15 00:56:04,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/149bb248277256d589ea0db597c04739e8134301?per_page=1 HTTP/1.1" 200 None
2025-10-15 00:56:05,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/149bb248277256d589ea0db597c04739e8134301 HTTP/1.1" 200 None
2025-10-15 00:56:05,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/149bb248277256d589ea0db597c04739e8134301/status HTTP/1.1" 200 None
2025-10-15 00:56:05,817 [ scc.repo] DEBUG - PR 34 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-15 00:56:06,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-10-15 00:56:06,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-10-15 00:56:07,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3 HTTP/1.1" 200 None
2025-10-15 00:56:07,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-15 00:56:08,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-15 00:56:08,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3 HTTP/1.1" 200 None
2025-10-15 00:56:09,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/1122baea98746effd4eb59deed25870f673ce3d3?per_page=1 HTTP/1.1" 200 None
2025-10-15 00:56:09,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3 HTTP/1.1" 200 None
2025-10-15 00:56:10,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3/status HTTP/1.1" 200 None
2025-10-15 00:56:10,403 [ scc.repo] DEBUG - PR 33 jo-mueller 'Add roi to array functions'
2025-10-15 00:56:10,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-10-15 00:56:10,892 [ scc.repo] DEBUG ## Branches found:
2025-10-15 00:56:10,892 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-10-15 00:56:10,892 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:10,892 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:10,895 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-15 00:56:10,897 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-15 00:56:10,897 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-15 00:56:10,900 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-15 00:56:10,902 [ scc.git] DEBUG Already up to date.
2025-10-15 00:56:10,902 [ scc.git] DEBUG Calling 'git fetch origin pull/33/head'
2025-10-15 00:56:11,818 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2025-10-15 00:56:11,818 [ scc.git] DEBUG * branch refs/pull/33/head -> FETCH_HEAD
2025-10-15 00:56:11,823 [ scc.git] DEBUG Calling 'git fetch origin pull/34/head'
2025-10-15 00:56:12,108 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2025-10-15 00:56:12,108 [ scc.git] DEBUG * branch refs/pull/34/head -> FETCH_HEAD
2025-10-15 00:56:12,112 [ scc.git] DEBUG ## Unique users: []
2025-10-15 00:56:12,112 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:12,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:12,114 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1122baea98746effd4eb59deed25870f673ce3d3'
2025-10-15 00:56:12,117 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:12,119 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 33 (Add roi to array functions) 1122baea98746effd4eb59deed25870f673ce3d3'
2025-10-15 00:56:12,125 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-15 00:56:12,127 [ scc.git] DEBUG setup.py | 4 +-
2025-10-15 00:56:12,127 [ scc.git] DEBUG src/omero_rois/__init__.py | 4 +
2025-10-15 00:56:12,128 [ scc.git] DEBUG src/omero_rois/library.py | 204 +++++++++++++++++++++++++++++++++++++++++++--
2025-10-15 00:56:12,128 [ scc.git] DEBUG 3 files changed, 203 insertions(+), 9 deletions(-)
2025-10-15 00:56:12,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:56:12,270 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...149bb248277256d589ea0db597c04739e8134301'
2025-10-15 00:56:12,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:12,363 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 34 (Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows) 149bb248277256d589ea0db597c04739e8134301'
2025-10-15 00:56:12,369 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-15 00:56:12,371 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-10-15 00:56:12,371 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-10-15 00:56:12,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:56:12,666 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-15 00:56:12,701 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:12,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:12,703 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-15 00:56:12,737 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-15 00:56:12,740 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa0701212d0> has no local changes
2025-10-15 00:56:12,740 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 33 jo-mueller 'Add roi to array functions'
- PR 34 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Generated by OMERO-plugins-push#558 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/)'
2025-10-15 00:56:12,745 [ scc.git] DEBUG [detached HEAD a8c7408] merge master -Dorg -Ssuccess-only
2025-10-15 00:56:12,746 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:56:12,746 [ scc.repo] DEBUG ## PRs found:
2025-10-15 00:56:13,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-10-15 00:56:13,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/22 HTTP/1.1" 200 None
2025-10-15 00:56:13,832 [ scc.repo] DEBUG # ... Include label: dependencies
2025-10-15 00:56:14,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/8b27e47a330555e99e9594f0c4b546946f4f98aa HTTP/1.1" 200 None
2025-10-15 00:56:14,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/8b27e47a330555e99e9594f0c4b546946f4f98aa/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-15 00:56:15,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/8b27e47a330555e99e9594f0c4b546946f4f98aa/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-15 00:56:15,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/8b27e47a330555e99e9594f0c4b546946f4f98aa HTTP/1.1" 200 None
2025-10-15 00:56:16,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/8b27e47a330555e99e9594f0c4b546946f4f98aa?per_page=1 HTTP/1.1" 200 2
2025-10-15 00:56:16,224 [ scc.repo] DEBUG - PR 22 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-15 00:56:16,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-10-15 00:56:17,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-10-15 00:56:17,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-10-15 00:56:18,294 [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-10-15 00:56:18,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-10-15 00:56:19,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-10-15 00:56:19,271 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-10-15 00:56:19,271 [ scc.repo] DEBUG ## Branches found:
2025-10-15 00:56:19,271 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-10-15 00:56:19,272 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:19,272 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:19,274 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-15 00:56:19,276 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-15 00:56:19,276 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-15 00:56:19,279 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-15 00:56:19,281 [ scc.git] DEBUG Already up to date.
2025-10-15 00:56:19,281 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-10-15 00:56:19,763 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-10-15 00:56:19,763 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-10-15 00:56:19,766 [ scc.git] DEBUG Calling 'git fetch origin pull/22/head'
2025-10-15 00:56:20,047 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-10-15 00:56:20,047 [ scc.git] DEBUG * branch refs/pull/22/head -> FETCH_HEAD
2025-10-15 00:56:20,052 [ scc.git] DEBUG ## Unique users: []
2025-10-15 00:56:20,052 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:20,052 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:20,054 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-10-15 00:56:20,056 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:20,058 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-10-15 00:56:20,298 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-10-15 00:56:20,298 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-10-15 00:56:20,298 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-10-15 00:56:20,298 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-10-15 00:56:20,298 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-10-15 00:56:20,298 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-10-15 00:56:20,298 [ scc.git] DEBUG Auto-merging setup.py
2025-10-15 00:56:20,298 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-10-15 00:56:20,298 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-10-15 00:56:20,298 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-10-15 00:56:20,301 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-10-15 00:56:20,304 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-10-15 00:56:20,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:56:20,449 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-10-15 00:56:20,451 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-10-15 00:56:20,454 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#558](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- setup.py
- omero_signup/views.py
- omero_signup/urls.py
--conflicts
2025-10-15 00:56:20,456 [ scc.config] DEBUG Found github.token
2025-10-15 00:56:20,456 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-10-15 00:56:20,456 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8b27e47a330555e99e9594f0c4b546946f4f98aa'
2025-10-15 00:56:20,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:20,460 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 22 (Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows) 8b27e47a330555e99e9594f0c4b546946f4f98aa'
2025-10-15 00:56:20,467 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-15 00:56:20,469 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-10-15 00:56:20,469 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-10-15 00:56:20,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:56:20,862 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-15 00:56:20,898 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:20,898 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:20,900 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-15 00:56:20,934 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-15 00:56:20,937 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa06ef07110> has no local changes
2025-10-15 00:56:20,937 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-signup
Already up to date.
Merged PRs:
- PR 22 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Generated by OMERO-plugins-push#558 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/)'
2025-10-15 00:56:20,942 [ scc.git] DEBUG [detached HEAD 3dd9c8a] merge master -Dorg -Ssuccess-only
2025-10-15 00:56:20,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:56:20,943 [ scc.repo] DEBUG ## PRs found:
2025-10-15 00:56:21,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-10-15 00:56:21,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-10-15 00:56:22,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-10-15 00:56:23,015 [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-10-15 00:56:23,496 [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-10-15 00:56:24,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-10-15 00:56:24,492 [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-10-15 00:56:24,492 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-10-15 00:56:24,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-10-15 00:56:25,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-10-15 00:56:25,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-10-15 00:56:26,438 [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-10-15 00:56:26,931 [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-10-15 00:56:27,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-10-15 00:56:27,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-10-15 00:56:28,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-10-15 00:56:28,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-10-15 00:56:29,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-10-15 00:56:29,823 [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-10-15 00:56:30,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-10-15 00:56:30,789 [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-10-15 00:56:30,789 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-10-15 00:56:30,789 [ scc.repo] DEBUG ## Branches found:
2025-10-15 00:56:30,789 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-10-15 00:56:30,790 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:30,790 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:30,792 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-15 00:56:30,794 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-15 00:56:30,794 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-15 00:56:30,796 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-15 00:56:30,799 [ scc.git] DEBUG Already up to date.
2025-10-15 00:56:30,799 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-10-15 00:56:31,098 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-10-15 00:56:31,098 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-10-15 00:56:31,102 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-10-15 00:56:31,432 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-10-15 00:56:31,433 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-10-15 00:56:31,437 [ scc.git] DEBUG ## Unique users: []
2025-10-15 00:56:31,437 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:31,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:31,439 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-10-15 00:56:31,443 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:31,445 [ 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-10-15 00:56:31,502 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-15 00:56:31,505 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-10-15 00:56:31,505 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-10-15 00:56:31,505 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-10-15 00:56:31,505 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-10-15 00:56:31,505 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-10-15 00:56:31,505 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-10-15 00:56:31,505 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-10-15 00:56:31,505 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-10-15 00:56:31,505 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-10-15 00:56:31,506 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-10-15 00:56:31,506 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-10-15 00:56:31,506 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-10-15 00:56:31,506 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-10-15 00:56:31,506 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-10-15 00:56:31,506 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-10-15 00:56:31,506 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-10-15 00:56:31,506 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-10-15 00:56:31,506 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-10-15 00:56:31,506 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-10-15 00:56:31,506 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-10-15 00:56:31,506 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-10-15 00:56:31,506 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-10-15 00:56:31,506 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-10-15 00:56:31,506 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-10-15 00:56:31,506 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-10-15 00:56:31,506 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-10-15 00:56:31,506 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-10-15 00:56:31,506 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-10-15 00:56:31,506 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-10-15 00:56:31,506 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-10-15 00:56:31,506 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-10-15 00:56:31,506 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-10-15 00:56:31,506 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-10-15 00:56:31,506 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-10-15 00:56:31,506 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-10-15 00:56:31,507 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-10-15 00:56:31,507 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-10-15 00:56:31,507 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-10-15 00:56:31,507 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-10-15 00:56:31,507 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-10-15 00:56:31,507 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-10-15 00:56:31,507 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-10-15 00:56:31,507 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-10-15 00:56:31,507 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-10-15 00:56:31,507 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-10-15 00:56:31,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:56:31,645 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-10-15 00:56:31,649 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:31,651 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-10-15 00:56:31,659 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-15 00:56:31,661 [ scc.git] DEBUG docker | 1 +
2025-10-15 00:56:31,661 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-10-15 00:56:32,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:56:32,035 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-15 00:56:32,070 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:32,070 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:32,072 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-15 00:56:32,107 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-15 00:56:32,110 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa06ef6fb10> has no local changes
2025-10-15 00:56:32,110 [ 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#558 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/)'
2025-10-15 00:56:32,115 [ scc.git] DEBUG [detached HEAD 6bd69c7] merge master -Dorg -Ssuccess-only
2025-10-15 00:56:32,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:56:32,116 [ scc.repo] DEBUG ## PRs found:
2025-10-15 00:56:32,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 None
2025-10-15 00:56:33,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/issues/14 HTTP/1.1" 200 None
2025-10-15 00:56:33,022 [ scc.repo] DEBUG # ... Include label: dependencies
2025-10-15 00:56:33,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/commits/1a4dbe9a31854f4f65c509ea929debf3319ba1ea HTTP/1.1" 200 None
2025-10-15 00:56:34,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/commits/1a4dbe9a31854f4f65c509ea929debf3319ba1ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-15 00:56:34,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/commits/1a4dbe9a31854f4f65c509ea929debf3319ba1ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-15 00:56:35,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/commits/1a4dbe9a31854f4f65c509ea929debf3319ba1ea HTTP/1.1" 200 None
2025-10-15 00:56:35,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/statuses/1a4dbe9a31854f4f65c509ea929debf3319ba1ea?per_page=1 HTTP/1.1" 200 2
2025-10-15 00:56:35,629 [ scc.repo] DEBUG - PR 14 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-15 00:56:35,629 [ scc.repo] DEBUG ## Branches found:
2025-10-15 00:56:35,629 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-10-15 00:56:35,629 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:35,629 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:35,631 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-15 00:56:35,634 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-15 00:56:35,634 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-15 00:56:35,636 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-15 00:56:35,639 [ scc.git] DEBUG Already up to date.
2025-10-15 00:56:35,639 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-10-15 00:56:35,921 [ scc.git] DEBUG From https://github.com/ome/omero-upload
2025-10-15 00:56:35,921 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-10-15 00:56:35,924 [ scc.git] DEBUG ## Unique users: []
2025-10-15 00:56:35,924 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:35,924 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:35,926 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1a4dbe9a31854f4f65c509ea929debf3319ba1ea'
2025-10-15 00:56:35,929 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:35,930 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows) 1a4dbe9a31854f4f65c509ea929debf3319ba1ea'
2025-10-15 00:56:35,936 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-15 00:56:35,939 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-10-15 00:56:35,939 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-10-15 00:56:36,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:56:36,077 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-15 00:56:36,111 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:36,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:36,113 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-15 00:56:36,148 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-15 00:56:36,150 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa06efac550> has no local changes
2025-10-15 00:56:36,150 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-upload
Already up to date.
Merged PRs:
- PR 14 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Generated by OMERO-plugins-push#558 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/)'
2025-10-15 00:56:36,156 [ scc.git] DEBUG [detached HEAD aa159b1] merge master -Dorg -Ssuccess-only
2025-10-15 00:56:36,156 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:56:36,156 [ scc.repo] DEBUG ## PRs found:
2025-10-15 00:56:36,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-10-15 00:56:37,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/22 HTTP/1.1" 200 None
2025-10-15 00:56:37,078 [ scc.repo] DEBUG # ... Include label: dependencies
2025-10-15 00:56:37,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/2ee819462af52bf2878fadf06d6ebdbafb8f1902 HTTP/1.1" 200 None
2025-10-15 00:56:38,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/2ee819462af52bf2878fadf06d6ebdbafb8f1902/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-15 00:56:38,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/2ee819462af52bf2878fadf06d6ebdbafb8f1902/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-15 00:56:39,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/2ee819462af52bf2878fadf06d6ebdbafb8f1902 HTTP/1.1" 200 None
2025-10-15 00:56:39,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/2ee819462af52bf2878fadf06d6ebdbafb8f1902?per_page=1 HTTP/1.1" 200 2
2025-10-15 00:56:39,574 [ scc.repo] DEBUG - PR 22 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-15 00:56:39,574 [ scc.repo] DEBUG ## Branches found:
2025-10-15 00:56:39,574 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-10-15 00:56:39,574 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:39,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:39,576 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-15 00:56:39,578 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-15 00:56:39,578 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-15 00:56:39,581 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-15 00:56:39,587 [ scc.git] DEBUG Updating deab817..160d894
2025-10-15 00:56:40,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls/20 HTTP/1.1" 200 None
2025-10-15 00:56:40,262 [ scc.git] DEBUG Calling 'git fetch origin pull/22/head'
2025-10-15 00:56:40,540 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-10-15 00:56:40,540 [ scc.git] DEBUG * branch refs/pull/22/head -> FETCH_HEAD
2025-10-15 00:56:40,544 [ scc.git] DEBUG ## Unique users: []
2025-10-15 00:56:40,544 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:40,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:40,546 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2ee819462af52bf2878fadf06d6ebdbafb8f1902'
2025-10-15 00:56:40,549 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:40,551 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 22 (Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows) 2ee819462af52bf2878fadf06d6ebdbafb8f1902'
2025-10-15 00:56:40,557 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-15 00:56:40,559 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-10-15 00:56:40,559 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-10-15 00:56:40,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:56:40,706 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-15 00:56:40,743 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:40,743 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:40,745 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-15 00:56:40,778 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-15 00:56:40,781 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa06ef69a90> has no local changes
2025-10-15 00:56:40,781 [ 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'
Merged PRs:
- PR 22 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Generated by OMERO-plugins-push#558 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/)'
2025-10-15 00:56:40,786 [ scc.git] DEBUG [detached HEAD 13d9f3e] merge master -Dorg -Ssuccess-only
2025-10-15 00:56:40,787 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:56:40,787 [ scc.git] INFO Overriding base-branch from master to main
2025-10-15 00:56:40,787 [ scc.repo] DEBUG ## PRs found:
2025-10-15 00:56:41,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-10-15 00:56:41,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/21 HTTP/1.1" 200 None
2025-10-15 00:56:42,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/21/comments HTTP/1.1" 200 None
2025-10-15 00:56:42,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/d07067753650282c9e8cdbbeae37897b7ed0d4cc HTTP/1.1" 200 None
2025-10-15 00:56:43,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/d07067753650282c9e8cdbbeae37897b7ed0d4cc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-15 00:56:43,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/d07067753650282c9e8cdbbeae37897b7ed0d4cc/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-15 00:56:44,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/d07067753650282c9e8cdbbeae37897b7ed0d4cc HTTP/1.1" 200 None
2025-10-15 00:56:44,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/d07067753650282c9e8cdbbeae37897b7ed0d4cc?per_page=1 HTTP/1.1" 200 2
2025-10-15 00:56:44,741 [ scc.repo] DEBUG - PR 21 will-moore 'Web zarr import'
2025-10-15 00:56:45,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-10-15 00:56:45,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-10-15 00:56:46,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-10-15 00:56:46,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-10-15 00:56:47,142 [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-10-15 00:56:47,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-10-15 00:56:48,034 [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-10-15 00:56:48,034 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-10-15 00:56:48,034 [ scc.repo] DEBUG ## Branches found:
2025-10-15 00:56:48,035 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-10-15 00:56:48,035 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:48,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:48,037 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-10-15 00:56:48,039 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-15 00:56:48,039 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-10-15 00:56:48,042 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-10-15 00:56:48,048 [ scc.git] DEBUG Updating 8f3c313..00e0207
2025-10-15 00:56:48,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls/20 HTTP/1.1" 200 None
2025-10-15 00:56:48,669 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-10-15 00:56:49,057 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-10-15 00:56:49,058 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-10-15 00:56:49,061 [ scc.git] DEBUG Calling 'git fetch origin pull/21/head'
2025-10-15 00:56:50,373 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-10-15 00:56:50,373 [ scc.git] DEBUG * branch refs/pull/21/head -> FETCH_HEAD
2025-10-15 00:56:50,376 [ scc.git] DEBUG ## Unique users: []
2025-10-15 00:56:50,377 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:50,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:50,379 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-10-15 00:56:50,382 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:50,384 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-10-15 00:56:50,549 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-10-15 00:56:50,549 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-10-15 00:56:50,549 [ scc.git] DEBUG Auto-merging omero_web_zarr/views.py
2025-10-15 00:56:50,549 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-10-15 00:56:50,549 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-10-15 00:56:50,552 [ scc.git] DEBUG Calling 'git reset --hard 00e02072dc29b04eba14c080ca8a0175a1499c15'
2025-10-15 00:56:50,556 [ scc.git] DEBUG HEAD is now at 00e0207 Merge pull request #20 from will-moore/zarr_python_v3
2025-10-15 00:56:50,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:56:50,845 [ scc.git] DEBUG Calling 'git merge-base 00e02072dc29b04eba14c080ca8a0175a1499c15 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-10-15 00:56:50,847 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..00e02072dc29b04eba14c080ca8a0175a1499c15'
2025-10-15 00:56:50,850 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#558](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-10-15 00:56:50,852 [ scc.config] DEBUG Found github.token
2025-10-15 00:56:50,852 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-10-15 00:56:50,852 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d07067753650282c9e8cdbbeae37897b7ed0d4cc'
2025-10-15 00:56:50,854 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:50,856 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 21 (Web zarr import) d07067753650282c9e8cdbbeae37897b7ed0d4cc'
2025-10-15 00:56:50,929 [ scc.git] DEBUG Auto-merging omero_web_zarr/views.py
2025-10-15 00:56:50,930 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-15 00:56:50,933 [ scc.git] DEBUG README.rst | 3 +
2025-10-15 00:56:50,933 [ scc.git] DEBUG .../templates/omero_web_zarr/zarr_import.html | 358 +++++++++++++++++++++
2025-10-15 00:56:50,933 [ scc.git] DEBUG omero_web_zarr/urls.py | 2 +
2025-10-15 00:56:50,933 [ scc.git] DEBUG omero_web_zarr/views.py | 43 ++-
2025-10-15 00:56:50,933 [ scc.git] DEBUG setup.py | 5 +-
2025-10-15 00:56:50,933 [ scc.git] DEBUG 5 files changed, 409 insertions(+), 2 deletions(-)
2025-10-15 00:56:50,933 [ scc.git] DEBUG create mode 100644 omero_web_zarr/templates/omero_web_zarr/zarr_import.html
2025-10-15 00:56:51,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:56:51,267 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-15 00:56:51,304 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:51,304 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:51,306 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-15 00:56:51,342 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-15 00:56:51,345 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa06ef72f90> has no local changes
2025-10-15 00:56:51,345 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Updating 8f3c313..00e0207
Previously merged:
- PR 20 will-moore 'Use zarr_format=2 for .zarray and chunk endpoints'
Merged PRs:
- PR 21 will-moore 'Web zarr import'
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Generated by OMERO-plugins-push#558 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/)'
2025-10-15 00:56:51,351 [ scc.git] DEBUG [detached HEAD 4552c20] merge master -Dorg -Ssuccess-only
2025-10-15 00:56:51,351 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:56:51,351 [ scc.repo] DEBUG ## PRs found:
2025-10-15 00:56:51,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 None
2025-10-15 00:56:52,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/issues/25 HTTP/1.1" 200 None
2025-10-15 00:56:52,403 [ scc.repo] DEBUG # ... Include label: dependencies
2025-10-15 00:56:52,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/commits/c73bedb717b9ecce0af666245d3486aa5a2dafe9 HTTP/1.1" 200 None
2025-10-15 00:56:53,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/commits/c73bedb717b9ecce0af666245d3486aa5a2dafe9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-15 00:56:53,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/commits/c73bedb717b9ecce0af666245d3486aa5a2dafe9/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-15 00:56:54,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/commits/c73bedb717b9ecce0af666245d3486aa5a2dafe9 HTTP/1.1" 200 None
2025-10-15 00:56:54,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/statuses/c73bedb717b9ecce0af666245d3486aa5a2dafe9?per_page=1 HTTP/1.1" 200 2
2025-10-15 00:56:54,868 [ scc.repo] DEBUG - PR 25 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-15 00:56:54,868 [ scc.repo] DEBUG ## Branches found:
2025-10-15 00:56:54,868 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-10-15 00:56:54,868 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:54,868 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:54,870 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-15 00:56:54,872 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-15 00:56:54,872 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-15 00:56:54,875 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-15 00:56:54,878 [ scc.git] DEBUG Already up to date.
2025-10-15 00:56:54,878 [ scc.git] DEBUG Calling 'git fetch origin pull/25/head'
2025-10-15 00:56:55,165 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-weberror
2025-10-15 00:56:55,165 [ scc.git] DEBUG * branch refs/pull/25/head -> FETCH_HEAD
2025-10-15 00:56:55,168 [ scc.git] DEBUG ## Unique users: []
2025-10-15 00:56:55,168 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:55,168 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:55,170 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c73bedb717b9ecce0af666245d3486aa5a2dafe9'
2025-10-15 00:56:55,173 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:55,175 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 25 (Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows) c73bedb717b9ecce0af666245d3486aa5a2dafe9'
2025-10-15 00:56:55,181 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-15 00:56:55,183 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-10-15 00:56:55,183 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-10-15 00:56:55,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:56:55,333 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-15 00:56:55,370 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:55,370 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:55,372 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-15 00:56:55,407 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-15 00:56:55,410 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa06efeaa90> has no local changes
2025-10-15 00:56:55,410 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-weberror
Already up to date.
Merged PRs:
- PR 25 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Generated by OMERO-plugins-push#558 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/)'
2025-10-15 00:56:55,415 [ scc.git] DEBUG [detached HEAD 96b3772] merge master -Dorg -Ssuccess-only
2025-10-15 00:56:55,415 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:56:55,415 [ scc.repo] DEBUG ## PRs found:
2025-10-15 00:56:55,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 None
2025-10-15 00:56:56,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/issues/37 HTTP/1.1" 200 None
2025-10-15 00:56:56,282 [ scc.repo] DEBUG # ... Include label: dependencies
2025-10-15 00:56:56,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/commits/8cf5f7e65ae8e945b134e41e77bc13a785aff478 HTTP/1.1" 200 None
2025-10-15 00:56:57,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/commits/8cf5f7e65ae8e945b134e41e77bc13a785aff478/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-15 00:56:57,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/commits/8cf5f7e65ae8e945b134e41e77bc13a785aff478/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-15 00:56:58,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/commits/8cf5f7e65ae8e945b134e41e77bc13a785aff478 HTTP/1.1" 200 None
2025-10-15 00:56:58,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/statuses/8cf5f7e65ae8e945b134e41e77bc13a785aff478?per_page=1 HTTP/1.1" 200 2
2025-10-15 00:56:58,725 [ scc.repo] DEBUG - PR 37 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-15 00:56:58,725 [ scc.repo] DEBUG ## Branches found:
2025-10-15 00:56:58,725 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-10-15 00:56:58,726 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:58,726 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:58,728 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-15 00:56:58,730 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-15 00:56:58,730 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-15 00:56:58,733 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-15 00:56:58,736 [ scc.git] DEBUG Already up to date.
2025-10-15 00:56:58,736 [ scc.git] DEBUG Calling 'git fetch origin pull/37/head'
2025-10-15 00:56:59,020 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-webtest
2025-10-15 00:56:59,020 [ scc.git] DEBUG * branch refs/pull/37/head -> FETCH_HEAD
2025-10-15 00:56:59,023 [ scc.git] DEBUG ## Unique users: []
2025-10-15 00:56:59,023 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:59,024 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:59,026 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8cf5f7e65ae8e945b134e41e77bc13a785aff478'
2025-10-15 00:56:59,028 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:59,031 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 37 (Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows) 8cf5f7e65ae8e945b134e41e77bc13a785aff478'
2025-10-15 00:56:59,037 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-15 00:56:59,039 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-10-15 00:56:59,039 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-10-15 00:56:59,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:56:59,175 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-15 00:56:59,212 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:56:59,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:56:59,214 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-15 00:56:59,250 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-15 00:56:59,252 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa07013e950> has no local changes
2025-10-15 00:56:59,253 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-webtest
Already up to date.
Merged PRs:
- PR 37 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Generated by OMERO-plugins-push#558 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/)'
2025-10-15 00:56:59,258 [ scc.git] DEBUG [detached HEAD de5536d] merge master -Dorg -Ssuccess-only
2025-10-15 00:56:59,258 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:56:59,258 [ scc.repo] DEBUG ## PRs found:
2025-10-15 00:56:59,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-10-15 00:57:00,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-10-15 00:57:00,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-10-15 00:57:01,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-10-15 00:57:01,727 [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-10-15 00:57:02,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-10-15 00:57:02,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-10-15 00:57:02,697 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-10-15 00:57:02,697 [ scc.repo] DEBUG ## Branches found:
2025-10-15 00:57:02,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-10-15 00:57:02,697 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:57:02,697 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:57:02,699 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-15 00:57:02,701 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-15 00:57:02,701 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-15 00:57:02,704 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-15 00:57:02,706 [ scc.git] DEBUG Already up to date.
2025-10-15 00:57:02,706 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-10-15 00:57:03,159 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-10-15 00:57:03,159 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-10-15 00:57:03,162 [ scc.git] DEBUG ## Unique users: []
2025-10-15 00:57:03,162 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:57:03,162 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:57:03,164 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-10-15 00:57:03,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:57:03,169 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-10-15 00:57:03,226 [ scc.git] DEBUG Auto-merging Dockerfile
2025-10-15 00:57:03,226 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-10-15 00:57:03,226 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-10-15 00:57:03,227 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-10-15 00:57:03,229 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-10-15 00:57:03,233 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-10-15 00:57:03,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:03,415 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-10-15 00:57:03,418 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-10-15 00:57:03,420 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#558](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-10-15 00:57:03,422 [ scc.config] DEBUG Found github.token
2025-10-15 00:57:03,422 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-10-15 00:57:03,422 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-15 00:57:03,458 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:57:03,459 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:57:03,460 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-15 00:57:03,494 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-15 00:57:03,498 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa06efe4810> has no local changes
2025-10-15 00:57:03,498 [ 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#558 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/)'
2025-10-15 00:57:03,503 [ scc.git] DEBUG [detached HEAD bd609bb] merge master -Dorg -Ssuccess-only
2025-10-15 00:57:03,504 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:57:03,504 [ scc.git] INFO Overriding base-branch from master to develop
2025-10-15 00:57:03,504 [ scc.repo] DEBUG ## PRs found:
2025-10-15 00:57:03,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-10-15 00:57:04,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-10-15 00:57:04,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-10-15 00:57:05,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-10-15 00:57:05,781 [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-10-15 00:57:06,257 [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-10-15 00:57:06,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-10-15 00:57:07,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-10-15 00:57:07,309 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-10-15 00:57:07,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-10-15 00:57:08,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-10-15 00:57:08,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-10-15 00:57:09,324 [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-10-15 00:57:09,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-10-15 00:57:10,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-10-15 00:57:10,187 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-10-15 00:57:10,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-10-15 00:57:11,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-10-15 00:57:11,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-10-15 00:57:12,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-10-15 00:57:12,130 [ scc.repo] DEBUG ## Branches found:
2025-10-15 00:57:12,130 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-10-15 00:57:12,130 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:57:12,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:57:12,132 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-10-15 00:57:12,134 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-15 00:57:12,134 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-10-15 00:57:12,137 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-10-15 00:57:12,146 [ scc.git] DEBUG Updating 4b4c755..03b9116
2025-10-15 00:57:12,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/228 HTTP/1.1" 200 None
2025-10-15 00:57:13,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/227 HTTP/1.1" 200 None
2025-10-15 00:57:14,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-10-15 00:57:14,141 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-10-15 00:57:15,016 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-10-15 00:57:15,016 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-10-15 00:57:15,020 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-10-15 00:57:15,629 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-10-15 00:57:15,629 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-10-15 00:57:15,634 [ scc.git] DEBUG ## Unique users: []
2025-10-15 00:57:15,634 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:57:15,634 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:57:15,637 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-10-15 00:57:15,642 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:57:15,644 [ 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-10-15 00:57:15,700 [ 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-10-15 00:57:15,700 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-10-15 00:57:15,700 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-10-15 00:57:15,702 [ scc.git] DEBUG Calling 'git reset --hard 03b9116196e1a799dd18a666559613d912be01a5'
2025-10-15 00:57:15,705 [ scc.git] DEBUG HEAD is now at 03b9116 Merge pull request #228 from ome/dependabot/github_actions/dot-github/workflows/pypa/gh-action-pypi-publish-1.13.0
2025-10-15 00:57:15,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:15,881 [ scc.git] DEBUG Calling 'git merge-base 03b9116196e1a799dd18a666559613d912be01a5 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-10-15 00:57:15,886 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..03b9116196e1a799dd18a666559613d912be01a5'
2025-10-15 00:57:15,890 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#558](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-10-15 00:57:15,892 [ scc.config] DEBUG Found github.token
2025-10-15 00:57:15,892 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-10-15 00:57:15,892 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-10-15 00:57:15,896 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:57:15,898 [ 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-10-15 00:57:15,906 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-15 00:57:15,909 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-10-15 00:57:15,909 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-10-15 00:57:16,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:16,278 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-15 00:57:16,313 [ scc.git] DEBUG Get sha1 of %s
2025-10-15 00:57:16,313 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-15 00:57:16,315 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-15 00:57:16,350 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-15 00:57:16,353 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa07013ecd0> has no local changes
2025-10-15 00:57:16,353 [ 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..03b9116
Previously merged:
- PR 228 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.3.0 to 1.13.0 in /.github/workflows'
- 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#558 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/)'
2025-10-15 00:57:16,358 [ scc.git] DEBUG [detached HEAD 9d6dd9b] merge master -Dorg -Ssuccess-only
2025-10-15 00:57:16,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:57:16,358 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-15 00:57:16,423 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-10-15 00:57:16,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:16,678 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-10-15 00:57:16,679 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-10-15 00:57:17,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:17,105 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-10-15 00:57:17,107 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-10-15 00:57:17,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:17,498 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-10-15 00:57:17,500 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-10-15 00:57:17,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:17,896 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-10-15 00:57:18,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:18,292 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-10-15 00:57:18,294 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-10-15 00:57:18,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:18,678 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-10-15 00:57:18,680 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-10-15 00:57:19,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:19,076 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-10-15 00:57:19,077 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-10-15 00:57:19,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:19,486 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-10-15 00:57:19,488 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-10-15 00:57:19,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:19,880 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-10-15 00:57:19,881 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-10-15 00:57:20,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:20,269 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-10-15 00:57:20,271 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-10-15 00:57:20,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:20,669 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-10-15 00:57:20,670 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-10-15 00:57:21,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:21,064 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-10-15 00:57:21,066 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-10-15 00:57:21,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:21,613 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-10-15 00:57:22,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:22,013 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-10-15 00:57:22,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:22,414 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-10-15 00:57:22,416 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-10-15 00:57:22,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:22,803 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-10-15 00:57:23,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:23,199 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-10-15 00:57:23,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:23,596 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-10-15 00:57:23,598 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-10-15 00:57:23,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:23,982 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-10-15 00:57:23,983 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-10-15 00:57:24,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:24,370 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-10-15 00:57:24,372 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-10-15 00:57:24,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:24,767 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-10-15 00:57:24,769 [ scc.config] DEBUG Found submodule.scripts.url
2025-10-15 00:57:25,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-15 00:57:25,183 [ scc.config] DEBUG Found submodule.scripts.branch
2025-10-15 00:57:25,183 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-15 00:57:25,257 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa07011a210> has local changes
2025-10-15 00:57:25,257 [ 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.
Merged PRs:
- PR 29 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
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'
- PR 73 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 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..37ea700
Previously merged:
- PR 180 will-moore 'Import command'
- 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 172 will-moore 'Use zarr v3 and updated ome-zarr-py'
Conflicting PRs (not included):
- PR 174 will-moore 'Skip wells'
- PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
- PR 181 will-moore 'Add labels support for import'
- PR 182 will-moore 'Revert "Remove support for Plate import"'
Repository: ome/omero-figure
Excluded PRs:
- PR 641 Rdornier 'OMERO ROIs improvements : filtering visible and adding all' (user: Rdornier)
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..baab5c06
Previously merged:
- PR 612 will-moore 'Script version'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
- PR 616 Rdornier 'Fix labels around border'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 638 Rdornier 'Fix arrow opacity'
- 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 610 will-moore 'Add docs/contributing.rst'
- PR 642 dependabot[bot] 'Bump vite from 6.2.6 to 6.3.6'
Conflicting PRs (not included):
- PR 637 Rdornier 'Fix scalebar position'
- PR 643 Rdornier 'Shape scaling'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
- PR 31 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
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 508 will-moore 'Broadcast channel demo' (stage: draft)
- PR 503 will-moore 'Basic working tile-coordinates grid 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'
Conflicting PRs (not included):
- PR 95 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
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.
Merged PRs:
- PR 16 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Repository: ome/omero-rois
Excluded PRs:
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 33 jo-mueller 'Add roi to array functions'
- PR 34 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Repository: ome/omero-signup
Already up to date.
Merged PRs:
- PR 22 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
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.
Merged PRs:
- PR 14 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Repository: ome/omero-virtual-microscope
Updating deab817..160d894
Previously merged:
- PR 20 jburel 'Build'
Merged PRs:
- PR 22 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Updating 8f3c313..00e0207
Previously merged:
- PR 20 will-moore 'Use zarr_format=2 for .zarray and chunk endpoints'
Merged PRs:
- PR 21 will-moore 'Web zarr import'
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Merged PRs:
- PR 25 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Repository: openmicroscopy/omero-webtest
Already up to date.
Merged PRs:
- PR 37 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
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..03b9116
Previously merged:
- PR 228 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.3.0 to 1.13.0 in /.github/workflows'
- 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#558 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/558/)'
2025-10-15 00:57:25,267 [ scc.git] DEBUG [detached HEAD 089bb24] merge master -Dorg -Ssuccess-only
2025-10-15 00:57:25,267 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-10-15 00:57:25,267 [ scc.merge] INFO Repository: ome/omero-plugins
2025-10-15 00:57:25,267 [ scc.merge] INFO Already up to date.
2025-10-15 00:57:25,267 [ scc.merge] INFO
2025-10-15 00:57:25,267 [ scc.merge] INFO Merged PRs:
2025-10-15 00:57:25,267 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-10-15 00:57:25,267 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-10-15 00:57:25,267 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-10-15 00:57:25,267 [ scc.merge] INFO
2025-10-15 00:57:25,267 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-10-15 00:57:25,267 [ scc.merge] INFO Already up to date.
2025-10-15 00:57:25,267 [ scc.merge] INFO
2025-10-15 00:57:25,267 [ scc.merge] INFO
2025-10-15 00:57:25,267 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-10-15 00:57:25,267 [ scc.merge] INFO Excluded PRs:
2025-10-15 00:57:25,267 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-10-15 00:57:25,267 [ scc.merge] INFO Already up to date.
2025-10-15 00:57:25,267 [ scc.merge] INFO
2025-10-15 00:57:25,267 [ scc.merge] INFO Merged PRs:
2025-10-15 00:57:25,267 [ scc.merge] INFO - PR 29 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-15 00:57:25,268 [ scc.merge] INFO
2025-10-15 00:57:25,268 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-10-15 00:57:25,268 [ scc.merge] INFO Excluded PRs:
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-10-15 00:57:25,268 [ scc.merge] INFO Already up to date.
2025-10-15 00:57:25,268 [ scc.merge] INFO
2025-10-15 00:57:25,268 [ scc.merge] INFO Merged PRs:
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 73 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-15 00:57:25,268 [ scc.merge] INFO
2025-10-15 00:57:25,268 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-10-15 00:57:25,268 [ scc.merge] INFO Excluded PRs:
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-10-15 00:57:25,268 [ scc.merge] INFO Updating 11d3587..37ea700
2025-10-15 00:57:25,268 [ scc.merge] INFO Previously merged:
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 180 will-moore 'Import command'
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 179 will-moore 'Changelog 0.6.0'
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 177 jburel 'Replace fromstring by frombuffer'
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 173 will-moore 'Add test_export_plate_polygons()'
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-10-15 00:57:25,268 [ scc.merge] INFO
2025-10-15 00:57:25,268 [ scc.merge] INFO Merged PRs:
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py'
2025-10-15 00:57:25,268 [ scc.merge] INFO
2025-10-15 00:57:25,268 [ scc.merge] INFO Conflicting PRs (not included):
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 174 will-moore 'Skip wells'
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 181 will-moore 'Add labels support for import'
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 182 will-moore 'Revert "Remove support for Plate import"'
2025-10-15 00:57:25,268 [ scc.merge] INFO
2025-10-15 00:57:25,268 [ scc.merge] INFO Repository: ome/omero-figure
2025-10-15 00:57:25,268 [ scc.merge] INFO Excluded PRs:
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 641 Rdornier 'OMERO ROIs improvements : filtering visible and adding all' (user: Rdornier)
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-10-15 00:57:25,268 [ scc.merge] INFO Updating 9cc36cde..baab5c06
2025-10-15 00:57:25,268 [ scc.merge] INFO Previously merged:
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-10-15 00:57:25,268 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity'
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-10-15 00:57:25,269 [ scc.merge] INFO
2025-10-15 00:57:25,269 [ scc.merge] INFO Merged PRs:
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 642 dependabot[bot] 'Bump vite from 6.2.6 to 6.3.6'
2025-10-15 00:57:25,269 [ scc.merge] INFO
2025-10-15 00:57:25,269 [ scc.merge] INFO Conflicting PRs (not included):
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position'
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 643 Rdornier 'Shape scaling'
2025-10-15 00:57:25,269 [ scc.merge] INFO
2025-10-15 00:57:25,269 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-10-15 00:57:25,269 [ scc.merge] INFO Already up to date.
2025-10-15 00:57:25,269 [ scc.merge] INFO
2025-10-15 00:57:25,269 [ scc.merge] INFO Merged PRs:
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 31 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-15 00:57:25,269 [ scc.merge] INFO
2025-10-15 00:57:25,269 [ scc.merge] INFO Repository: ome/omero-gallery
2025-10-15 00:57:25,269 [ scc.merge] INFO Already up to date.
2025-10-15 00:57:25,269 [ scc.merge] INFO
2025-10-15 00:57:25,269 [ scc.merge] INFO Merged PRs:
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-10-15 00:57:25,269 [ scc.merge] INFO
2025-10-15 00:57:25,269 [ scc.merge] INFO Conflicting PRs (not included):
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-10-15 00:57:25,269 [ scc.merge] INFO
2025-10-15 00:57:25,269 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-10-15 00:57:25,269 [ scc.merge] INFO Excluded PRs:
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 508 will-moore 'Broadcast channel demo' (stage: draft)
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates grid shown over the image' (stage: draft)
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-10-15 00:57:25,269 [ scc.merge] INFO Updating 7a798ce..bb94cf8
2025-10-15 00:57:25,269 [ scc.merge] INFO Previously merged:
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-10-15 00:57:25,269 [ scc.merge] INFO
2025-10-15 00:57:25,269 [ scc.merge] INFO Merged PRs:
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-10-15 00:57:25,269 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-10-15 00:57:25,270 [ scc.merge] INFO
2025-10-15 00:57:25,270 [ scc.merge] INFO Conflicting PRs (not included):
2025-10-15 00:57:25,270 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-10-15 00:57:25,270 [ scc.merge] INFO
2025-10-15 00:57:25,270 [ scc.merge] INFO Repository: ome/omero-mapr
2025-10-15 00:57:25,270 [ scc.merge] INFO Excluded PRs:
2025-10-15 00:57:25,270 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-10-15 00:57:25,270 [ scc.merge] INFO Already up to date.
2025-10-15 00:57:25,270 [ scc.merge] INFO
2025-10-15 00:57:25,270 [ scc.merge] INFO Merged PRs:
2025-10-15 00:57:25,270 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-10-15 00:57:25,270 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-10-15 00:57:25,270 [ scc.merge] INFO
2025-10-15 00:57:25,270 [ scc.merge] INFO Conflicting PRs (not included):
2025-10-15 00:57:25,270 [ scc.merge] INFO - PR 95 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-15 00:57:25,270 [ scc.merge] INFO
2025-10-15 00:57:25,270 [ scc.merge] INFO Repository: ome/omero-metadata
2025-10-15 00:57:25,270 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-10-15 00:57:25,270 [ scc.merge] INFO Previously merged:
2025-10-15 00:57:25,270 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-10-15 00:57:25,270 [ scc.merge] INFO
2025-10-15 00:57:25,270 [ scc.merge] INFO Conflicting PRs (not included):
2025-10-15 00:57:25,270 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-10-15 00:57:25,270 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-10-15 00:57:25,270 [ scc.merge] INFO
2025-10-15 00:57:25,270 [ scc.merge] INFO Repository: ome/omero-parade
2025-10-15 00:57:25,270 [ scc.merge] INFO Excluded PRs:
2025-10-15 00:57:25,270 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-10-15 00:57:25,270 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-10-15 00:57:25,270 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-10-15 00:57:25,270 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-10-15 00:57:25,270 [ scc.merge] INFO Already up to date.
2025-10-15 00:57:25,270 [ scc.merge] INFO
2025-10-15 00:57:25,270 [ scc.merge] INFO Merged PRs:
2025-10-15 00:57:25,270 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-10-15 00:57:25,270 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-10-15 00:57:25,270 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-10-15 00:57:25,270 [ scc.merge] INFO
2025-10-15 00:57:25,270 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-10-15 00:57:25,270 [ scc.merge] INFO Already up to date.
2025-10-15 00:57:25,270 [ scc.merge] INFO
2025-10-15 00:57:25,270 [ scc.merge] INFO Merged PRs:
2025-10-15 00:57:25,270 [ scc.merge] INFO - PR 16 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-15 00:57:25,270 [ scc.merge] INFO
2025-10-15 00:57:25,270 [ scc.merge] INFO Repository: ome/omero-rois
2025-10-15 00:57:25,270 [ scc.merge] INFO Excluded PRs:
2025-10-15 00:57:25,270 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-10-15 00:57:25,270 [ scc.merge] INFO Already up to date.
2025-10-15 00:57:25,270 [ scc.merge] INFO
2025-10-15 00:57:25,270 [ scc.merge] INFO Merged PRs:
2025-10-15 00:57:25,270 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions'
2025-10-15 00:57:25,270 [ scc.merge] INFO - PR 34 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-15 00:57:25,270 [ scc.merge] INFO
2025-10-15 00:57:25,270 [ scc.merge] INFO Repository: ome/omero-signup
2025-10-15 00:57:25,271 [ scc.merge] INFO Already up to date.
2025-10-15 00:57:25,271 [ scc.merge] INFO
2025-10-15 00:57:25,271 [ scc.merge] INFO Merged PRs:
2025-10-15 00:57:25,271 [ scc.merge] INFO - PR 22 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-15 00:57:25,271 [ scc.merge] INFO
2025-10-15 00:57:25,271 [ scc.merge] INFO Conflicting PRs (not included):
2025-10-15 00:57:25,271 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-10-15 00:57:25,271 [ scc.merge] INFO
2025-10-15 00:57:25,271 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-10-15 00:57:25,271 [ scc.merge] INFO Excluded PRs:
2025-10-15 00:57:25,271 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-10-15 00:57:25,271 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-10-15 00:57:25,271 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-10-15 00:57:25,271 [ scc.merge] INFO Already up to date.
2025-10-15 00:57:25,271 [ scc.merge] INFO
2025-10-15 00:57:25,271 [ scc.merge] INFO Merged PRs:
2025-10-15 00:57:25,271 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-10-15 00:57:25,271 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-10-15 00:57:25,271 [ scc.merge] INFO
2025-10-15 00:57:25,271 [ scc.merge] INFO Repository: ome/omero-upload
2025-10-15 00:57:25,271 [ scc.merge] INFO Already up to date.
2025-10-15 00:57:25,271 [ scc.merge] INFO
2025-10-15 00:57:25,271 [ scc.merge] INFO Merged PRs:
2025-10-15 00:57:25,271 [ scc.merge] INFO - PR 14 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-15 00:57:25,271 [ scc.merge] INFO
2025-10-15 00:57:25,271 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-10-15 00:57:25,271 [ scc.merge] INFO Updating deab817..160d894
2025-10-15 00:57:25,271 [ scc.merge] INFO Previously merged:
2025-10-15 00:57:25,271 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-10-15 00:57:25,271 [ scc.merge] INFO
2025-10-15 00:57:25,271 [ scc.merge] INFO Merged PRs:
2025-10-15 00:57:25,271 [ scc.merge] INFO - PR 22 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-15 00:57:25,271 [ scc.merge] INFO
2025-10-15 00:57:25,271 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-10-15 00:57:25,271 [ scc.merge] INFO Excluded PRs:
2025-10-15 00:57:25,271 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-10-15 00:57:25,271 [ scc.merge] INFO Updating 8f3c313..00e0207
2025-10-15 00:57:25,271 [ scc.merge] INFO Previously merged:
2025-10-15 00:57:25,271 [ scc.merge] INFO - PR 20 will-moore 'Use zarr_format=2 for .zarray and chunk endpoints'
2025-10-15 00:57:25,271 [ scc.merge] INFO
2025-10-15 00:57:25,271 [ scc.merge] INFO Merged PRs:
2025-10-15 00:57:25,271 [ scc.merge] INFO - PR 21 will-moore 'Web zarr import'
2025-10-15 00:57:25,271 [ scc.merge] INFO
2025-10-15 00:57:25,271 [ scc.merge] INFO Conflicting PRs (not included):
2025-10-15 00:57:25,271 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-10-15 00:57:25,271 [ scc.merge] INFO
2025-10-15 00:57:25,271 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-10-15 00:57:25,271 [ scc.merge] INFO Already up to date.
2025-10-15 00:57:25,271 [ scc.merge] INFO
2025-10-15 00:57:25,271 [ scc.merge] INFO Merged PRs:
2025-10-15 00:57:25,271 [ scc.merge] INFO - PR 25 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-15 00:57:25,271 [ scc.merge] INFO
2025-10-15 00:57:25,271 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-10-15 00:57:25,271 [ scc.merge] INFO Already up to date.
2025-10-15 00:57:25,272 [ scc.merge] INFO
2025-10-15 00:57:25,272 [ scc.merge] INFO Merged PRs:
2025-10-15 00:57:25,272 [ scc.merge] INFO - PR 37 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-15 00:57:25,272 [ scc.merge] INFO
2025-10-15 00:57:25,272 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-10-15 00:57:25,272 [ scc.merge] INFO Already up to date.
2025-10-15 00:57:25,272 [ scc.merge] INFO
2025-10-15 00:57:25,272 [ scc.merge] INFO Conflicting PRs (not included):
2025-10-15 00:57:25,272 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-10-15 00:57:25,272 [ scc.merge] INFO
2025-10-15 00:57:25,272 [ scc.merge] INFO Repository: ome/scripts
2025-10-15 00:57:25,272 [ scc.merge] INFO Excluded PRs:
2025-10-15 00:57:25,272 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-10-15 00:57:25,272 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-10-15 00:57:25,272 [ scc.merge] INFO Updating 4b4c755..03b9116
2025-10-15 00:57:25,272 [ scc.merge] INFO Previously merged:
2025-10-15 00:57:25,272 [ scc.merge] INFO - PR 228 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.3.0 to 1.13.0 in /.github/workflows'
2025-10-15 00:57:25,272 [ scc.merge] INFO - PR 227 jburel 'Replace tostring by tobytes'
2025-10-15 00:57:25,272 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-10-15 00:57:25,272 [ scc.merge] INFO
2025-10-15 00:57:25,272 [ scc.merge] INFO Merged PRs:
2025-10-15 00:57:25,272 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-10-15 00:57:25,272 [ scc.merge] INFO
2025-10-15 00:57:25,272 [ scc.merge] INFO Conflicting PRs (not included):
2025-10-15 00:57:25,272 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-10-15 00:57:25,272 [ scc.merge] INFO
2025-10-15 00:57:25,272 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-10-15 00:57:25,272 [ scc.git] DEBUG Calling 'git remote'
2025-10-15 00:57:25,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-10-15 00:57:25,274 [ scc.git] DEBUG Calling 'git remote'
2025-10-15 00:57:25,276 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:57:25,276 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-10-15 00:57:25,276 [ scc.git] DEBUG Calling 'git remote'
2025-10-15 00:57:25,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:57:25,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-10-15 00:57:25,278 [ scc.git] DEBUG Calling 'git remote'
2025-10-15 00:57:25,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:57:25,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-10-15 00:57:25,280 [ scc.git] DEBUG Calling 'git remote'
2025-10-15 00:57:25,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:57:25,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-10-15 00:57:25,282 [ scc.git] DEBUG Calling 'git remote'
2025-10-15 00:57:25,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:57:25,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-10-15 00:57:25,284 [ scc.git] DEBUG Calling 'git remote'
2025-10-15 00:57:25,286 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:57:25,286 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-10-15 00:57:25,286 [ scc.git] DEBUG Calling 'git remote'
2025-10-15 00:57:25,288 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:57:25,288 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-10-15 00:57:25,288 [ scc.git] DEBUG Calling 'git remote'
2025-10-15 00:57:25,290 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:57:25,290 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-10-15 00:57:25,290 [ scc.git] DEBUG Calling 'git remote'
2025-10-15 00:57:25,291 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:57:25,292 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-10-15 00:57:25,292 [ scc.git] DEBUG Calling 'git remote'
2025-10-15 00:57:25,294 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:57:25,294 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-10-15 00:57:25,294 [ scc.git] DEBUG Calling 'git remote'
2025-10-15 00:57:25,296 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:57:25,296 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-10-15 00:57:25,296 [ scc.git] DEBUG Calling 'git remote'
2025-10-15 00:57:25,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:57:25,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-10-15 00:57:25,298 [ scc.git] DEBUG Calling 'git remote'
2025-10-15 00:57:25,300 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:57:25,300 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-10-15 00:57:25,300 [ scc.git] DEBUG Calling 'git remote'
2025-10-15 00:57:25,302 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:57:25,302 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-10-15 00:57:25,302 [ scc.git] DEBUG Calling 'git remote'
2025-10-15 00:57:25,304 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:57:25,304 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-10-15 00:57:25,304 [ scc.git] DEBUG Calling 'git remote'
2025-10-15 00:57:25,306 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:57:25,306 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-10-15 00:57:25,306 [ scc.git] DEBUG Calling 'git remote'
2025-10-15 00:57:25,308 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:57:25,308 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-10-15 00:57:25,308 [ scc.git] DEBUG Calling 'git remote'
2025-10-15 00:57:25,310 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:57:25,310 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-10-15 00:57:25,310 [ scc.git] DEBUG Calling 'git remote'
2025-10-15 00:57:25,312 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:57:25,312 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-10-15 00:57:25,312 [ scc.git] DEBUG Calling 'git remote'
2025-10-15 00:57:25,314 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:57:25,314 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-10-15 00:57:25,314 [ scc.git] DEBUG Calling 'git remote'
2025-10-15 00:57:25,316 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-10-15 00:57:25,316 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-10-15 00:57:25,316 [ scc.git] DEBUG Calling 'git remote'
2025-10-15 00:57:25,318 [ 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 69fb964] 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 e4c22e9] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-10-15 00:58:12,070 [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-10-15 00:58:22,020 [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-10-15 00:58:24,491 [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-10-15 00:58:29,303 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-10-15 00:59:09,129 [ 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/9161e9ff/images/svgs/logo.svg){kind=logo}
