Console Output
Skipping 204 KB..
Full Log798ce..bb94cf8
Previously merged:
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#500 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/)'
2025-08-11 00:46:16,517 [ scc.git] DEBUG [detached HEAD 492c3d7] merge master -Dorg -Ssuccess-only
2025-08-11 00:46:16,518 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:46:16,518 [ scc.repo] DEBUG ## PRs found:
2025-08-11 00:46:16,660 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:16,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-08-11 00:46:17,237 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:17,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-08-11 00:46:17,747 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:18,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-08-11 00:46:18,300 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:18,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-08-11 00:46:18,771 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:19,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-08-11 00:46:19,309 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:19,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-08-11 00:46:19,521 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-11 00:46:19,772 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:20,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-08-11 00:46:20,263 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:20,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-08-11 00:46:20,767 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:21,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-08-11 00:46:21,314 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:21,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-08-11 00:46:21,782 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:22,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-08-11 00:46:22,252 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:22,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-08-11 00:46:22,446 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-08-11 00:46:22,446 [ scc.repo] DEBUG ## Branches found:
2025-08-11 00:46:22,446 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-08-11 00:46:22,446 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:46:22,446 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:22,449 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-11 00:46:22,451 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-11 00:46:22,452 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-11 00:46:22,455 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-11 00:46:22,458 [ scc.git] DEBUG Already up to date.
2025-08-11 00:46:22,458 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-08-11 00:46:22,745 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-08-11 00:46:22,745 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-08-11 00:46:22,749 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-08-11 00:46:23,024 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-08-11 00:46:23,025 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-08-11 00:46:23,029 [ scc.git] DEBUG ## Unique users: []
2025-08-11 00:46:23,029 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:46:23,029 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:23,032 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-08-11 00:46:23,036 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:23,038 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-08-11 00:46:23,047 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-11 00:46:23,051 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-08-11 00:46:23,051 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-08-11 00:46:23,051 [ scc.git] DEBUG requirements.txt | 2 +-
2025-08-11 00:46:23,051 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-08-11 00:46:23,051 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-08-11 00:46:23,051 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-08-11 00:46:23,052 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:23,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:46:23,240 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-08-11 00:46:23,244 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:23,247 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 94 (Use the release/v1 branch for the PyPA action publishing to PyPI) 1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-08-11 00:46:23,256 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-11 00:46:23,259 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-08-11 00:46:23,259 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-08-11 00:46:23,491 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:23,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:46:23,690 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-11 00:46:23,730 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:46:23,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:23,732 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-11 00:46:23,771 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-11 00:46:23,775 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f891821b410> has no local changes
2025-08-11 00:46:23,775 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Generated by OMERO-plugins-push#500 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/)'
2025-08-11 00:46:23,782 [ scc.git] DEBUG [detached HEAD e18c720] merge master -Dorg -Ssuccess-only
2025-08-11 00:46:23,782 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:46:23,782 [ scc.repo] DEBUG ## PRs found:
2025-08-11 00:46:23,941 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:24,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-08-11 00:46:24,469 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:24,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-08-11 00:46:25,012 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:25,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-08-11 00:46:25,502 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:25,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-08-11 00:46:26,029 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:26,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-08-11 00:46:26,503 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:26,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-08-11 00:46:27,078 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:27,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-08-11 00:46:27,295 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-08-11 00:46:27,546 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:27,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-08-11 00:46:28,060 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:28,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-08-11 00:46:28,537 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:28,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-08-11 00:46:29,067 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:29,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-08-11 00:46:29,590 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:29,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-08-11 00:46:30,091 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:30,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-08-11 00:46:30,299 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-08-11 00:46:30,299 [ scc.repo] DEBUG ## Branches found:
2025-08-11 00:46:30,299 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-08-11 00:46:30,299 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:46:30,299 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:30,302 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-11 00:46:30,304 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-11 00:46:30,304 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-11 00:46:30,308 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-11 00:46:30,315 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-08-11 00:46:30,550 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:31,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-08-11 00:46:31,012 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-08-11 00:46:31,296 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-08-11 00:46:31,296 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-08-11 00:46:31,300 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-08-11 00:46:31,573 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-08-11 00:46:31,573 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-08-11 00:46:31,579 [ scc.git] DEBUG ## Unique users: []
2025-08-11 00:46:31,579 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:46:31,579 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:31,581 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-08-11 00:46:31,586 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:31,588 [ 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-08-11 00:46:31,601 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-08-11 00:46:31,601 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-08-11 00:46:31,601 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-08-11 00:46:31,601 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-08-11 00:46:31,602 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-11 00:46:31,602 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-11 00:46:31,605 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-08-11 00:46:31,609 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-08-11 00:46:31,611 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:31,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:46:31,805 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-08-11 00:46:31,809 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-08-11 00:46:31,813 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#500](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-08-11 00:46:31,815 [ scc.config] DEBUG Found github.token
2025-08-11 00:46:31,815 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-08-11 00:46:31,815 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-08-11 00:46:31,820 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:31,822 [ 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-08-11 00:46:31,837 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-08-11 00:46:31,837 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-08-11 00:46:31,837 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-08-11 00:46:31,837 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-11 00:46:31,838 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-11 00:46:31,841 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-08-11 00:46:31,846 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-08-11 00:46:32,056 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:32,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:46:32,229 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-08-11 00:46:32,233 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-08-11 00:46:32,237 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#500](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/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-08-11 00:46:32,239 [ scc.config] DEBUG Found github.token
2025-08-11 00:46:32,239 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-08-11 00:46:32,239 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-11 00:46:32,278 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:46:32,278 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:32,280 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-11 00:46:32,322 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-11 00:46:32,326 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f891a43f250> has no local changes
2025-08-11 00:46:32,326 [ 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#500 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/)'
2025-08-11 00:46:32,333 [ scc.git] DEBUG [detached HEAD 5492690] merge master -Dorg -Ssuccess-only
2025-08-11 00:46:32,333 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:46:32,333 [ scc.repo] DEBUG ## PRs found:
2025-08-11 00:46:32,480 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:32,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-08-11 00:46:33,068 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:33,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-08-11 00:46:33,560 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:33,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-08-11 00:46:34,096 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:34,366 [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-08-11 00:46:34,617 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:34,882 [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-08-11 00:46:35,134 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:35,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-08-11 00:46:35,609 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:35,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-08-11 00:46:35,797 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-11 00:46:36,048 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:36,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-08-11 00:46:36,306 [ scc.repo] DEBUG # ... Include label: dependencies
2025-08-11 00:46:36,557 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:36,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-08-11 00:46:37,181 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:37,497 [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-08-11 00:46:37,748 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:38,070 [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-08-11 00:46:38,322 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:38,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-08-11 00:46:38,804 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:38,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-08-11 00:46:38,996 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-08-11 00:46:39,247 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:39,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-08-11 00:46:39,470 [ scc.repo] DEBUG # ... Include label: dependencies
2025-08-11 00:46:39,721 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:40,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-08-11 00:46:40,331 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:40,672 [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-08-11 00:46:40,923 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:41,203 [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-08-11 00:46:41,455 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:41,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-08-11 00:46:42,034 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:42,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-08-11 00:46:42,230 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-08-11 00:46:42,481 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:42,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-08-11 00:46:42,976 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:43,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-08-11 00:46:43,479 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:43,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-08-11 00:46:43,993 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:44,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-08-11 00:46:44,503 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:44,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-08-11 00:46:44,992 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:45,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-08-11 00:46:45,484 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:45,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-08-11 00:46:45,716 [ scc.repo] DEBUG ## Branches found:
2025-08-11 00:46:45,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-08-11 00:46:45,716 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:46:45,717 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:45,719 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-11 00:46:45,721 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-11 00:46:45,721 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-11 00:46:45,725 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-11 00:46:45,728 [ scc.git] DEBUG Already up to date.
2025-08-11 00:46:45,728 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-08-11 00:46:46,009 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-08-11 00:46:46,009 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-08-11 00:46:46,013 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-08-11 00:46:46,284 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-08-11 00:46:46,284 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-08-11 00:46:46,288 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-08-11 00:46:46,557 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-08-11 00:46:46,557 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-08-11 00:46:46,561 [ scc.git] DEBUG ## Unique users: []
2025-08-11 00:46:46,561 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:46:46,561 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:46,564 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-08-11 00:46:46,567 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:46,569 [ 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-08-11 00:46:46,577 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-11 00:46:46,580 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-08-11 00:46:46,580 [ scc.git] DEBUG package.json | 2 +-
2025-08-11 00:46:46,580 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-08-11 00:46:46,582 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:46,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:46:46,805 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-08-11 00:46:46,808 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:46,810 [ 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-08-11 00:46:46,821 [ scc.git] DEBUG Auto-merging package-lock.json
2025-08-11 00:46:46,821 [ scc.git] DEBUG Auto-merging package.json
2025-08-11 00:46:46,822 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-11 00:46:46,826 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-08-11 00:46:46,826 [ scc.git] DEBUG package.json | 2 +-
2025-08-11 00:46:46,826 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-08-11 00:46:47,056 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:47,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:46:47,232 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-08-11 00:46:47,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:47,239 [ 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-08-11 00:46:47,247 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-11 00:46:47,250 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-08-11 00:46:47,250 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-08-11 00:46:47,483 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:47,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:46:47,659 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-11 00:46:47,701 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:46:47,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:47,703 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-11 00:46:47,743 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-11 00:46:47,747 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8918233610> has no local changes
2025-08-11 00:46:47,747 [ 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#500 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/)'
2025-08-11 00:46:47,754 [ scc.git] DEBUG [detached HEAD 6b6becc] merge master -Dorg -Ssuccess-only
2025-08-11 00:46:47,754 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:46:47,754 [ scc.repo] DEBUG ## PRs found:
2025-08-11 00:46:47,910 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:48,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-08-11 00:46:48,111 [ scc.repo] DEBUG ## Branches found:
2025-08-11 00:46:48,112 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-08-11 00:46:48,112 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:46:48,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:48,114 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-11 00:46:48,117 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-11 00:46:48,117 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-11 00:46:48,120 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-11 00:46:48,123 [ scc.git] DEBUG Already up to date.
2025-08-11 00:46:48,123 [ scc.git] DEBUG ## Unique users: []
2025-08-11 00:46:48,123 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:46:48,123 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:48,125 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-11 00:46:48,165 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:46:48,165 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:48,168 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-11 00:46:48,206 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-11 00:46:48,209 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f891821b450> has no local changes
2025-08-11 00:46:48,209 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-prometheus-tools
Already up to date.
Generated by OMERO-plugins-push#500 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/)'
2025-08-11 00:46:48,216 [ scc.git] DEBUG [detached HEAD c454da4] merge master -Dorg -Ssuccess-only
2025-08-11 00:46:48,216 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:46:48,217 [ scc.repo] DEBUG ## PRs found:
2025-08-11 00:46:48,363 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:48,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-08-11 00:46:48,896 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:49,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-08-11 00:46:49,425 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:49,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-08-11 00:46:49,932 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:50,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3 HTTP/1.1" 200 None
2025-08-11 00:46:50,466 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:50,745 [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-08-11 00:46:50,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:51,250 [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-08-11 00:46:51,501 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:51,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3 HTTP/1.1" 200 None
2025-08-11 00:46:51,976 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:52,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/1122baea98746effd4eb59deed25870f673ce3d3?per_page=1 HTTP/1.1" 200 None
2025-08-11 00:46:52,426 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:52,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3 HTTP/1.1" 200 None
2025-08-11 00:46:52,984 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:53,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3/status HTTP/1.1" 200 None
2025-08-11 00:46:53,216 [ scc.repo] DEBUG - PR 33 jo-mueller 'Add roi to array functions'
2025-08-11 00:46:53,467 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:53,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-08-11 00:46:53,729 [ scc.repo] DEBUG ## Branches found:
2025-08-11 00:46:53,729 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-08-11 00:46:53,729 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:46:53,729 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:53,732 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-11 00:46:53,734 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-11 00:46:53,734 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-11 00:46:53,737 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-11 00:46:53,740 [ scc.git] DEBUG Already up to date.
2025-08-11 00:46:53,741 [ scc.git] DEBUG Calling 'git fetch origin pull/33/head'
2025-08-11 00:46:54,040 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2025-08-11 00:46:54,040 [ scc.git] DEBUG * branch refs/pull/33/head -> FETCH_HEAD
2025-08-11 00:46:54,044 [ scc.git] DEBUG ## Unique users: []
2025-08-11 00:46:54,044 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:46:54,044 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:54,047 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1122baea98746effd4eb59deed25870f673ce3d3'
2025-08-11 00:46:54,050 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:54,052 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 33 (Add roi to array functions) 1122baea98746effd4eb59deed25870f673ce3d3'
2025-08-11 00:46:54,060 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-11 00:46:54,064 [ scc.git] DEBUG setup.py | 4 +-
2025-08-11 00:46:54,064 [ scc.git] DEBUG src/omero_rois/__init__.py | 4 +
2025-08-11 00:46:54,064 [ scc.git] DEBUG src/omero_rois/library.py | 204 +++++++++++++++++++++++++++++++++++++++++++--
2025-08-11 00:46:54,064 [ scc.git] DEBUG 3 files changed, 203 insertions(+), 9 deletions(-)
2025-08-11 00:46:54,065 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:54,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:46:54,250 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-11 00:46:54,290 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:46:54,290 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:54,292 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-11 00:46:54,332 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-11 00:46:54,335 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f891825e750> has no local changes
2025-08-11 00:46:54,335 [ 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'
Generated by OMERO-plugins-push#500 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/)'
2025-08-11 00:46:54,342 [ scc.git] DEBUG [detached HEAD 452967b] merge master -Dorg -Ssuccess-only
2025-08-11 00:46:54,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:46:54,342 [ scc.repo] DEBUG ## PRs found:
2025-08-11 00:46:54,501 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:54,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-08-11 00:46:55,038 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:55,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-08-11 00:46:55,562 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:55,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-08-11 00:46:56,056 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:56,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-08-11 00:46:56,634 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:56,883 [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-08-11 00:46:57,134 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:57,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-08-11 00:46:57,597 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:57,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-08-11 00:46:57,790 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-08-11 00:46:57,790 [ scc.repo] DEBUG ## Branches found:
2025-08-11 00:46:57,790 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-08-11 00:46:57,790 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:46:57,790 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:57,793 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-11 00:46:57,796 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-11 00:46:57,796 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-11 00:46:57,799 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-11 00:46:57,802 [ scc.git] DEBUG Already up to date.
2025-08-11 00:46:57,802 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-08-11 00:46:58,087 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-08-11 00:46:58,087 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-08-11 00:46:58,092 [ scc.git] DEBUG ## Unique users: []
2025-08-11 00:46:58,092 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:46:58,092 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:58,095 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-08-11 00:46:58,098 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:58,100 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-08-11 00:46:58,109 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-08-11 00:46:58,109 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-08-11 00:46:58,109 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-08-11 00:46:58,109 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-08-11 00:46:58,109 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-08-11 00:46:58,109 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-08-11 00:46:58,109 [ scc.git] DEBUG Auto-merging setup.py
2025-08-11 00:46:58,109 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-08-11 00:46:58,110 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-11 00:46:58,110 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-11 00:46:58,113 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-08-11 00:46:58,117 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-08-11 00:46:58,118 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:58,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:46:58,307 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-08-11 00:46:58,310 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-08-11 00:46:58,313 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#500](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- omero_signup/urls.py
- setup.py
--conflicts
2025-08-11 00:46:58,315 [ scc.config] DEBUG Found github.token
2025-08-11 00:46:58,315 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-08-11 00:46:58,315 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-11 00:46:58,357 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:46:58,357 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:46:58,359 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-11 00:46:58,398 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-11 00:46:58,401 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f891825dc90> has no local changes
2025-08-11 00:46:58,402 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Generated by OMERO-plugins-push#500 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/)'
2025-08-11 00:46:58,408 [ scc.git] DEBUG [detached HEAD 2cbac2e] merge master -Dorg -Ssuccess-only
2025-08-11 00:46:58,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:46:58,409 [ scc.repo] DEBUG ## PRs found:
2025-08-11 00:46:58,558 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:58,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-08-11 00:46:59,154 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:59,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-08-11 00:46:59,628 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:46:59,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-08-11 00:47:00,208 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:00,549 [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-08-11 00:47:00,800 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:01,089 [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-08-11 00:47:01,340 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:01,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-08-11 00:47:01,828 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:02,040 [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-08-11 00:47:02,040 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-08-11 00:47:02,291 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:02,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-08-11 00:47:02,779 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:03,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-08-11 00:47:03,272 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:03,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-08-11 00:47:03,805 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:04,102 [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-08-11 00:47:04,353 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:04,598 [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-08-11 00:47:04,850 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:05,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-08-11 00:47:05,364 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:05,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-08-11 00:47:05,839 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:06,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-08-11 00:47:06,339 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:06,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-08-11 00:47:06,830 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:07,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-08-11 00:47:07,418 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:07,631 [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-08-11 00:47:07,882 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:08,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-08-11 00:47:08,430 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:08,620 [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-08-11 00:47:08,621 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-08-11 00:47:08,621 [ scc.repo] DEBUG ## Branches found:
2025-08-11 00:47:08,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-08-11 00:47:08,621 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:47:08,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:08,624 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-11 00:47:08,626 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-11 00:47:08,626 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-11 00:47:08,629 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-11 00:47:08,632 [ scc.git] DEBUG Already up to date.
2025-08-11 00:47:08,633 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-08-11 00:47:08,922 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-08-11 00:47:08,922 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-08-11 00:47:08,927 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-08-11 00:47:09,213 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-08-11 00:47:09,213 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-08-11 00:47:09,217 [ scc.git] DEBUG ## Unique users: []
2025-08-11 00:47:09,217 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:47:09,218 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:09,220 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-08-11 00:47:09,224 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:09,227 [ 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-08-11 00:47:09,239 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-11 00:47:09,243 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-08-11 00:47:09,243 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-08-11 00:47:09,243 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-08-11 00:47:09,243 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-08-11 00:47:09,243 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-08-11 00:47:09,243 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-08-11 00:47:09,243 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-08-11 00:47:09,243 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-08-11 00:47:09,243 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-08-11 00:47:09,244 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:09,244 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-08-11 00:47:09,244 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-08-11 00:47:09,244 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-08-11 00:47:09,244 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-08-11 00:47:09,245 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-08-11 00:47:09,245 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-08-11 00:47:09,245 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-08-11 00:47:09,245 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-08-11 00:47:09,245 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-08-11 00:47:09,245 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-08-11 00:47:09,245 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-08-11 00:47:09,245 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-08-11 00:47:09,245 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-08-11 00:47:09,245 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-08-11 00:47:09,245 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-08-11 00:47:09,245 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-08-11 00:47:09,245 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-08-11 00:47:09,245 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-08-11 00:47:09,245 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-08-11 00:47:09,245 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-08-11 00:47:09,245 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-08-11 00:47:09,245 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-08-11 00:47:09,245 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-08-11 00:47:09,245 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-08-11 00:47:09,245 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-08-11 00:47:09,245 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-08-11 00:47:09,245 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-08-11 00:47:09,245 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-08-11 00:47:09,245 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-08-11 00:47:09,245 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-08-11 00:47:09,245 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-08-11 00:47:09,245 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-08-11 00:47:09,245 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-08-11 00:47:09,245 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-08-11 00:47:09,245 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-08-11 00:47:09,245 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-08-11 00:47:09,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:09,435 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-08-11 00:47:09,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:09,442 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-08-11 00:47:09,452 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-11 00:47:09,455 [ scc.git] DEBUG docker | 1 +
2025-08-11 00:47:09,455 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-08-11 00:47:09,686 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:09,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:09,864 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-11 00:47:09,905 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:47:09,905 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:09,907 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-11 00:47:09,947 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-11 00:47:09,951 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8918249e10> has no local changes
2025-08-11 00:47:09,951 [ 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#500 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/)'
2025-08-11 00:47:09,959 [ scc.git] DEBUG [detached HEAD 87e5199] merge master -Dorg -Ssuccess-only
2025-08-11 00:47:09,959 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:09,959 [ scc.repo] DEBUG ## PRs found:
2025-08-11 00:47:10,115 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:10,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-08-11 00:47:10,326 [ scc.repo] DEBUG ## Branches found:
2025-08-11 00:47:10,326 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-08-11 00:47:10,326 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:47:10,326 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:10,329 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-11 00:47:10,331 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-11 00:47:10,331 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-11 00:47:10,334 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-11 00:47:10,337 [ scc.git] DEBUG Already up to date.
2025-08-11 00:47:10,337 [ scc.git] DEBUG ## Unique users: []
2025-08-11 00:47:10,337 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:47:10,337 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:10,339 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-11 00:47:10,379 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:47:10,379 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:10,381 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-11 00:47:10,420 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-11 00:47:10,423 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f891828c050> has no local changes
2025-08-11 00:47:10,423 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-upload
Already up to date.
Generated by OMERO-plugins-push#500 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/)'
2025-08-11 00:47:10,429 [ scc.git] DEBUG [detached HEAD 70a0a92] merge master -Dorg -Ssuccess-only
2025-08-11 00:47:10,429 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:10,430 [ scc.repo] DEBUG ## PRs found:
2025-08-11 00:47:10,578 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:10,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2025-08-11 00:47:10,784 [ scc.repo] DEBUG ## Branches found:
2025-08-11 00:47:10,784 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-08-11 00:47:10,784 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:47:10,784 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:10,786 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-11 00:47:10,789 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-11 00:47:10,789 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-11 00:47:10,792 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-11 00:47:10,800 [ scc.git] DEBUG Updating deab817..160d894
2025-08-11 00:47:11,035 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:11,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls/20 HTTP/1.1" 200 None
2025-08-11 00:47:11,621 [ scc.git] DEBUG ## Unique users: []
2025-08-11 00:47:11,621 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:47:11,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:11,623 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-11 00:47:11,665 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:47:11,665 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:11,667 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-11 00:47:11,708 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-11 00:47:11,712 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f891828e210> has no local changes
2025-08-11 00:47:11,712 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-virtual-microscope
Updating deab817..160d894
Previously merged:
- PR 20 jburel 'Build'
Generated by OMERO-plugins-push#500 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/)'
2025-08-11 00:47:11,718 [ scc.git] DEBUG [detached HEAD 9e6c00b] merge master -Dorg -Ssuccess-only
2025-08-11 00:47:11,718 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:11,718 [ scc.git] INFO Overriding base-branch from master to main
2025-08-11 00:47:11,718 [ scc.repo] DEBUG ## PRs found:
2025-08-11 00:47:11,871 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:12,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-08-11 00:47:12,437 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:12,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-08-11 00:47:12,935 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:13,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-08-11 00:47:13,437 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:13,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-08-11 00:47:13,981 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:14,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-08-11 00:47:14,485 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:14,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-08-11 00:47:15,002 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:15,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-08-11 00:47:15,543 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:15,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-08-11 00:47:16,023 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:16,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-08-11 00:47:16,492 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:16,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-08-11 00:47:17,044 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:17,251 [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-08-11 00:47:17,503 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:17,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-08-11 00:47:18,089 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:18,279 [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-08-11 00:47:18,279 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-08-11 00:47:18,279 [ scc.repo] DEBUG ## Branches found:
2025-08-11 00:47:18,279 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-08-11 00:47:18,279 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:47:18,280 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:18,283 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-08-11 00:47:18,285 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-11 00:47:18,285 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-08-11 00:47:18,288 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-08-11 00:47:18,291 [ scc.git] DEBUG Already up to date.
2025-08-11 00:47:18,291 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-08-11 00:47:18,584 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-08-11 00:47:18,584 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-08-11 00:47:18,589 [ scc.git] DEBUG ## Unique users: []
2025-08-11 00:47:18,589 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:47:18,589 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:18,591 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-08-11 00:47:18,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:18,597 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-08-11 00:47:18,605 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-08-11 00:47:18,605 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-08-11 00:47:18,605 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-11 00:47:18,605 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-11 00:47:18,608 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-08-11 00:47:18,612 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-08-11 00:47:18,614 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:18,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:18,800 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-08-11 00:47:18,804 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-08-11 00:47:18,807 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#500](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-08-11 00:47:18,809 [ scc.config] DEBUG Found github.token
2025-08-11 00:47:18,809 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-08-11 00:47:18,809 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-11 00:47:18,851 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:47:18,851 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:18,853 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-11 00:47:18,894 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-11 00:47:18,898 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8918256790> has no local changes
2025-08-11 00:47:18,898 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Generated by OMERO-plugins-push#500 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/)'
2025-08-11 00:47:18,904 [ scc.git] DEBUG [detached HEAD 209995c] merge master -Dorg -Ssuccess-only
2025-08-11 00:47:18,905 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:18,905 [ scc.repo] DEBUG ## PRs found:
2025-08-11 00:47:19,051 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:19,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-08-11 00:47:19,257 [ scc.repo] DEBUG ## Branches found:
2025-08-11 00:47:19,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-08-11 00:47:19,257 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:47:19,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:19,260 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-11 00:47:19,262 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-11 00:47:19,262 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-11 00:47:19,265 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-11 00:47:19,268 [ scc.git] DEBUG Already up to date.
2025-08-11 00:47:19,268 [ scc.git] DEBUG ## Unique users: []
2025-08-11 00:47:19,268 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:47:19,268 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:19,271 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-11 00:47:19,310 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:47:19,310 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:19,312 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-11 00:47:19,351 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-11 00:47:19,354 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f89182ac9d0> has no local changes
2025-08-11 00:47:19,354 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-weberror
Already up to date.
Generated by OMERO-plugins-push#500 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/)'
2025-08-11 00:47:19,360 [ scc.git] DEBUG [detached HEAD 0d2f553] merge master -Dorg -Ssuccess-only
2025-08-11 00:47:19,360 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:19,360 [ scc.repo] DEBUG ## PRs found:
2025-08-11 00:47:19,508 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:19,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-08-11 00:47:19,712 [ scc.repo] DEBUG ## Branches found:
2025-08-11 00:47:19,712 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-08-11 00:47:19,713 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:47:19,713 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:19,715 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-11 00:47:19,717 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-11 00:47:19,717 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-11 00:47:19,720 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-11 00:47:19,723 [ scc.git] DEBUG Already up to date.
2025-08-11 00:47:19,723 [ scc.git] DEBUG ## Unique users: []
2025-08-11 00:47:19,723 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:47:19,723 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:19,726 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-11 00:47:19,766 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:47:19,767 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:19,769 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-11 00:47:19,809 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-11 00:47:19,813 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f89182cce90> has no local changes
2025-08-11 00:47:19,813 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-webtest
Already up to date.
Generated by OMERO-plugins-push#500 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/)'
2025-08-11 00:47:19,819 [ scc.git] DEBUG [detached HEAD 3d39d00] merge master -Dorg -Ssuccess-only
2025-08-11 00:47:19,819 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:19,819 [ scc.repo] DEBUG ## PRs found:
2025-08-11 00:47:19,964 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:20,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-08-11 00:47:20,484 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:20,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-08-11 00:47:20,984 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:21,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-08-11 00:47:21,436 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:21,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-08-11 00:47:21,993 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:22,232 [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-08-11 00:47:22,484 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:22,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-08-11 00:47:23,033 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:23,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-08-11 00:47:23,283 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-08-11 00:47:23,283 [ scc.repo] DEBUG ## Branches found:
2025-08-11 00:47:23,283 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-08-11 00:47:23,283 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:47:23,283 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:23,286 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-11 00:47:23,289 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-11 00:47:23,289 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-11 00:47:23,292 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-11 00:47:23,295 [ scc.git] DEBUG Already up to date.
2025-08-11 00:47:23,295 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-08-11 00:47:23,579 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-08-11 00:47:23,579 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-08-11 00:47:23,583 [ scc.git] DEBUG ## Unique users: []
2025-08-11 00:47:23,583 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:47:23,583 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:23,586 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-08-11 00:47:23,589 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:23,591 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-08-11 00:47:23,600 [ scc.git] DEBUG Auto-merging Dockerfile
2025-08-11 00:47:23,600 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-08-11 00:47:23,600 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-11 00:47:23,601 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-11 00:47:23,604 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-08-11 00:47:23,609 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-08-11 00:47:23,610 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:23,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:23,790 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-08-11 00:47:23,793 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-08-11 00:47:23,796 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#500](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-08-11 00:47:23,798 [ scc.config] DEBUG Found github.token
2025-08-11 00:47:23,798 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-08-11 00:47:23,798 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-11 00:47:23,840 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:47:23,840 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:23,843 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-11 00:47:23,883 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-11 00:47:23,887 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8918286c10> has no local changes
2025-08-11 00:47:23,888 [ 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#500 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/)'
2025-08-11 00:47:23,894 [ scc.git] DEBUG [detached HEAD 524f5d8] merge master -Dorg -Ssuccess-only
2025-08-11 00:47:23,895 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:23,895 [ scc.git] INFO Overriding base-branch from master to develop
2025-08-11 00:47:23,895 [ scc.repo] DEBUG ## PRs found:
2025-08-11 00:47:24,041 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:24,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-08-11 00:47:24,598 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:24,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-08-11 00:47:25,076 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:25,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-08-11 00:47:25,587 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:25,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-08-11 00:47:26,082 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:26,332 [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-08-11 00:47:26,583 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:26,862 [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-08-11 00:47:27,114 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:27,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-08-11 00:47:27,589 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:27,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-08-11 00:47:27,801 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-08-11 00:47:28,052 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:28,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-08-11 00:47:28,566 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:28,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-08-11 00:47:29,062 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:29,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-08-11 00:47:29,533 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:29,766 [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-08-11 00:47:30,017 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:30,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-08-11 00:47:30,470 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:30,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-08-11 00:47:30,651 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-08-11 00:47:30,903 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:31,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-08-11 00:47:31,419 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:31,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-08-11 00:47:31,936 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:32,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-08-11 00:47:32,452 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:32,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-08-11 00:47:32,696 [ scc.repo] DEBUG ## Branches found:
2025-08-11 00:47:32,696 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-08-11 00:47:32,696 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:47:32,696 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:32,699 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-08-11 00:47:32,701 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-11 00:47:32,701 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-08-11 00:47:32,705 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-08-11 00:47:32,715 [ scc.git] DEBUG Updating 4b4c755..573db34
2025-08-11 00:47:32,945 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:33,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/227 HTTP/1.1" 200 None
2025-08-11 00:47:33,627 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:34,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-08-11 00:47:34,086 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-08-11 00:47:34,394 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-08-11 00:47:34,394 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-08-11 00:47:34,399 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-08-11 00:47:34,698 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-08-11 00:47:34,698 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-08-11 00:47:34,702 [ scc.git] DEBUG ## Unique users: []
2025-08-11 00:47:34,702 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:47:34,702 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:34,705 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-08-11 00:47:34,711 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:34,713 [ 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-08-11 00:47:34,724 [ 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-08-11 00:47:34,725 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-11 00:47:34,725 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-11 00:47:34,728 [ scc.git] DEBUG Calling 'git reset --hard 573db340d5d1429fa17c7e486206948412a7c150'
2025-08-11 00:47:34,732 [ scc.git] DEBUG HEAD is now at 573db34 Bump version: 5.9.1 → 5.9.2.dev0
2025-08-11 00:47:34,733 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:34,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:34,924 [ scc.git] DEBUG Calling 'git merge-base 573db340d5d1429fa17c7e486206948412a7c150 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-08-11 00:47:34,930 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..573db340d5d1429fa17c7e486206948412a7c150'
2025-08-11 00:47:34,934 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#500](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-08-11 00:47:34,936 [ scc.config] DEBUG Found github.token
2025-08-11 00:47:34,936 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-08-11 00:47:34,937 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-08-11 00:47:34,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:34,944 [ 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-08-11 00:47:34,954 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-11 00:47:34,957 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-08-11 00:47:34,957 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-08-11 00:47:35,175 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:35,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:35,352 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-11 00:47:35,396 [ scc.git] DEBUG Get sha1 of %s
2025-08-11 00:47:35,396 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-11 00:47:35,398 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-11 00:47:35,439 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-11 00:47:35,443 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f891a6105d0> has no local changes
2025-08-11 00:47:35,443 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..573db34
Previously merged:
- PR 227 jburel 'Replace tostring by tobytes'
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#500 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/)'
2025-08-11 00:47:35,450 [ scc.git] DEBUG [detached HEAD 446db6f] merge master -Dorg -Ssuccess-only
2025-08-11 00:47:35,450 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:35,451 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-11 00:47:35,529 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-08-11 00:47:35,603 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:35,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:35,840 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-08-11 00:47:35,842 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-08-11 00:47:36,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:36,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:36,279 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-08-11 00:47:36,281 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-08-11 00:47:36,525 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:36,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:36,729 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-08-11 00:47:36,732 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-08-11 00:47:36,976 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:37,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:37,162 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-08-11 00:47:37,406 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:37,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:37,601 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-08-11 00:47:37,603 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-08-11 00:47:37,848 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:38,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:38,037 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-08-11 00:47:38,039 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-08-11 00:47:38,283 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:38,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:38,473 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-08-11 00:47:38,475 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-08-11 00:47:38,718 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:38,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:38,909 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-08-11 00:47:38,911 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-08-11 00:47:39,155 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:39,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:39,330 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-08-11 00:47:39,332 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-08-11 00:47:39,576 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:39,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:39,768 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-08-11 00:47:39,770 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-08-11 00:47:40,014 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:40,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:40,215 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-08-11 00:47:40,217 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-08-11 00:47:40,460 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:40,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:40,679 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-08-11 00:47:40,681 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-08-11 00:47:40,925 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:41,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:41,112 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-08-11 00:47:41,356 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:41,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:41,544 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-08-11 00:47:41,788 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:41,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:41,971 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-08-11 00:47:41,973 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-08-11 00:47:42,217 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:42,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:42,403 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-08-11 00:47:42,647 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:42,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:42,840 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-08-11 00:47:43,084 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:43,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:43,278 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-08-11 00:47:43,280 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-08-11 00:47:43,524 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:43,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:43,702 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-08-11 00:47:43,704 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-08-11 00:47:43,948 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:44,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:44,165 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-08-11 00:47:44,167 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-08-11 00:47:44,411 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:44,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:44,610 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-08-11 00:47:44,613 [ scc.config] DEBUG Found submodule.scripts.url
2025-08-11 00:47:44,856 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-11 00:47:45,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-11 00:47:45,077 [ scc.config] DEBUG Found submodule.scripts.branch
2025-08-11 00:47:45,077 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-11 00:47:45,171 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f891a4efed0> has local changes
2025-08-11 00:47:45,172 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
- PR 71 dominikl 'Escape slash character in image names'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 174 will-moore 'Skip wells' (stage: draft)
- PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 167 dominikl 'Add extinfo command' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
Updating 11d3587..f7eea7c
Previously merged:
- PR 179 will-moore 'Changelog 0.6.0'
- PR 177 jburel 'Replace fromstring by frombuffer'
- PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
- PR 147 will-moore 'Name option'
- PR 173 will-moore 'Add test_export_plate_polygons()'
- PR 171 will-moore 'Initial addition of integration tests'
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..d2c6f5bc
Previously merged:
- 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 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
- PR 637 Rdornier 'Fix scalebar position'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Updating 7a798ce..bb94cf8
Previously merged:
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 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'
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
- PR 76 will-moore 'Run cli deps'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Updating deab817..160d894
Previously merged:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..573db34
Previously merged:
- PR 227 jburel 'Replace tostring by tobytes'
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#500 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/500/)'
2025-08-11 00:47:45,185 [ scc.git] DEBUG [detached HEAD b998ea4] merge master -Dorg -Ssuccess-only
2025-08-11 00:47:45,185 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-08-11 00:47:45,185 [ scc.merge] INFO Repository: ome/omero-plugins
2025-08-11 00:47:45,185 [ scc.merge] INFO Already up to date.
2025-08-11 00:47:45,185 [ scc.merge] INFO
2025-08-11 00:47:45,185 [ scc.merge] INFO Merged PRs:
2025-08-11 00:47:45,185 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-08-11 00:47:45,185 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-08-11 00:47:45,185 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-08-11 00:47:45,185 [ scc.merge] INFO
2025-08-11 00:47:45,185 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-08-11 00:47:45,185 [ scc.merge] INFO Already up to date.
2025-08-11 00:47:45,185 [ scc.merge] INFO
2025-08-11 00:47:45,185 [ scc.merge] INFO
2025-08-11 00:47:45,185 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-08-11 00:47:45,185 [ scc.merge] INFO Excluded PRs:
2025-08-11 00:47:45,185 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-08-11 00:47:45,185 [ scc.merge] INFO Already up to date.
2025-08-11 00:47:45,185 [ scc.merge] INFO
2025-08-11 00:47:45,185 [ scc.merge] INFO
2025-08-11 00:47:45,185 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-08-11 00:47:45,185 [ scc.merge] INFO Excluded PRs:
2025-08-11 00:47:45,185 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-08-11 00:47:45,185 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-08-11 00:47:45,185 [ scc.merge] INFO Already up to date.
2025-08-11 00:47:45,186 [ scc.merge] INFO
2025-08-11 00:47:45,186 [ scc.merge] INFO Merged PRs:
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-08-11 00:47:45,186 [ scc.merge] INFO
2025-08-11 00:47:45,186 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-08-11 00:47:45,186 [ scc.merge] INFO Excluded PRs:
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 174 will-moore 'Skip wells' (stage: draft)
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-08-11 00:47:45,186 [ scc.merge] INFO Updating 11d3587..f7eea7c
2025-08-11 00:47:45,186 [ scc.merge] INFO Previously merged:
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 179 will-moore 'Changelog 0.6.0'
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 177 jburel 'Replace fromstring by frombuffer'
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 173 will-moore 'Add test_export_plate_polygons()'
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-11 00:47:45,186 [ scc.merge] INFO
2025-08-11 00:47:45,186 [ scc.merge] INFO Merged PRs:
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
2025-08-11 00:47:45,186 [ scc.merge] INFO
2025-08-11 00:47:45,186 [ scc.merge] INFO Repository: ome/omero-figure
2025-08-11 00:47:45,186 [ scc.merge] INFO Excluded PRs:
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-08-11 00:47:45,186 [ scc.merge] INFO Updating 9cc36cde..d2c6f5bc
2025-08-11 00:47:45,186 [ scc.merge] INFO Previously merged:
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity'
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-08-11 00:47:45,186 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-11 00:47:45,187 [ scc.merge] INFO
2025-08-11 00:47:45,187 [ scc.merge] INFO Merged PRs:
2025-08-11 00:47:45,187 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-08-11 00:47:45,187 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-08-11 00:47:45,187 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-08-11 00:47:45,187 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-08-11 00:47:45,187 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-08-11 00:47:45,187 [ scc.merge] INFO
2025-08-11 00:47:45,187 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-11 00:47:45,187 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-08-11 00:47:45,187 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-08-11 00:47:45,187 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position'
2025-08-11 00:47:45,187 [ scc.merge] INFO
2025-08-11 00:47:45,187 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-08-11 00:47:45,187 [ scc.merge] INFO Already up to date.
2025-08-11 00:47:45,187 [ scc.merge] INFO
2025-08-11 00:47:45,187 [ scc.merge] INFO Merged PRs:
2025-08-11 00:47:45,187 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-08-11 00:47:45,187 [ scc.merge] INFO
2025-08-11 00:47:45,187 [ scc.merge] INFO Repository: ome/omero-gallery
2025-08-11 00:47:45,187 [ scc.merge] INFO Already up to date.
2025-08-11 00:47:45,187 [ scc.merge] INFO
2025-08-11 00:47:45,187 [ scc.merge] INFO Merged PRs:
2025-08-11 00:47:45,187 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-08-11 00:47:45,187 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-08-11 00:47:45,187 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-08-11 00:47:45,187 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-08-11 00:47:45,187 [ scc.merge] INFO
2025-08-11 00:47:45,187 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-11 00:47:45,187 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-08-11 00:47:45,187 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-08-11 00:47:45,187 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-08-11 00:47:45,187 [ scc.merge] INFO
2025-08-11 00:47:45,187 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-08-11 00:47:45,187 [ scc.merge] INFO Excluded PRs:
2025-08-11 00:47:45,187 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-08-11 00:47:45,187 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-08-11 00:47:45,187 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-08-11 00:47:45,187 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-08-11 00:47:45,188 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-08-11 00:47:45,188 [ scc.merge] INFO Updating 7a798ce..bb94cf8
2025-08-11 00:47:45,188 [ scc.merge] INFO Previously merged:
2025-08-11 00:47:45,188 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-11 00:47:45,188 [ scc.merge] INFO
2025-08-11 00:47:45,188 [ scc.merge] INFO Merged PRs:
2025-08-11 00:47:45,188 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-08-11 00:47:45,188 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-08-11 00:47:45,188 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-08-11 00:47:45,188 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-08-11 00:47:45,188 [ scc.merge] INFO
2025-08-11 00:47:45,188 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-11 00:47:45,188 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-08-11 00:47:45,188 [ scc.merge] INFO
2025-08-11 00:47:45,188 [ scc.merge] INFO Repository: ome/omero-mapr
2025-08-11 00:47:45,188 [ scc.merge] INFO Excluded PRs:
2025-08-11 00:47:45,188 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-08-11 00:47:45,188 [ scc.merge] INFO Already up to date.
2025-08-11 00:47:45,188 [ scc.merge] INFO
2025-08-11 00:47:45,188 [ scc.merge] INFO Merged PRs:
2025-08-11 00:47:45,188 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-08-11 00:47:45,188 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-11 00:47:45,188 [ scc.merge] INFO
2025-08-11 00:47:45,188 [ scc.merge] INFO Repository: ome/omero-metadata
2025-08-11 00:47:45,188 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-08-11 00:47:45,188 [ scc.merge] INFO Previously merged:
2025-08-11 00:47:45,188 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-11 00:47:45,188 [ scc.merge] INFO
2025-08-11 00:47:45,188 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-11 00:47:45,188 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-08-11 00:47:45,188 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-08-11 00:47:45,188 [ scc.merge] INFO
2025-08-11 00:47:45,188 [ scc.merge] INFO Repository: ome/omero-parade
2025-08-11 00:47:45,188 [ scc.merge] INFO Excluded PRs:
2025-08-11 00:47:45,188 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-08-11 00:47:45,188 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-08-11 00:47:45,188 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-08-11 00:47:45,188 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-08-11 00:47:45,188 [ scc.merge] INFO Already up to date.
2025-08-11 00:47:45,188 [ scc.merge] INFO
2025-08-11 00:47:45,189 [ scc.merge] INFO Merged PRs:
2025-08-11 00:47:45,189 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-08-11 00:47:45,189 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-08-11 00:47:45,189 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-11 00:47:45,189 [ scc.merge] INFO
2025-08-11 00:47:45,189 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-08-11 00:47:45,189 [ scc.merge] INFO Already up to date.
2025-08-11 00:47:45,189 [ scc.merge] INFO
2025-08-11 00:47:45,189 [ scc.merge] INFO
2025-08-11 00:47:45,189 [ scc.merge] INFO Repository: ome/omero-rois
2025-08-11 00:47:45,189 [ scc.merge] INFO Excluded PRs:
2025-08-11 00:47:45,189 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-08-11 00:47:45,189 [ scc.merge] INFO Already up to date.
2025-08-11 00:47:45,189 [ scc.merge] INFO
2025-08-11 00:47:45,189 [ scc.merge] INFO Merged PRs:
2025-08-11 00:47:45,189 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions'
2025-08-11 00:47:45,189 [ scc.merge] INFO
2025-08-11 00:47:45,189 [ scc.merge] INFO Repository: ome/omero-signup
2025-08-11 00:47:45,189 [ scc.merge] INFO Already up to date.
2025-08-11 00:47:45,189 [ scc.merge] INFO
2025-08-11 00:47:45,189 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-11 00:47:45,189 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-08-11 00:47:45,189 [ scc.merge] INFO
2025-08-11 00:47:45,189 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-08-11 00:47:45,189 [ scc.merge] INFO Excluded PRs:
2025-08-11 00:47:45,189 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-08-11 00:47:45,189 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-08-11 00:47:45,189 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-08-11 00:47:45,189 [ scc.merge] INFO Already up to date.
2025-08-11 00:47:45,189 [ scc.merge] INFO
2025-08-11 00:47:45,189 [ scc.merge] INFO Merged PRs:
2025-08-11 00:47:45,189 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-08-11 00:47:45,189 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-08-11 00:47:45,189 [ scc.merge] INFO
2025-08-11 00:47:45,189 [ scc.merge] INFO Repository: ome/omero-upload
2025-08-11 00:47:45,189 [ scc.merge] INFO Already up to date.
2025-08-11 00:47:45,189 [ scc.merge] INFO
2025-08-11 00:47:45,189 [ scc.merge] INFO
2025-08-11 00:47:45,189 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-08-11 00:47:45,189 [ scc.merge] INFO Updating deab817..160d894
2025-08-11 00:47:45,190 [ scc.merge] INFO Previously merged:
2025-08-11 00:47:45,190 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-08-11 00:47:45,190 [ scc.merge] INFO
2025-08-11 00:47:45,190 [ scc.merge] INFO
2025-08-11 00:47:45,190 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-08-11 00:47:45,190 [ scc.merge] INFO Excluded PRs:
2025-08-11 00:47:45,190 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-08-11 00:47:45,190 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-08-11 00:47:45,190 [ scc.merge] INFO Already up to date.
2025-08-11 00:47:45,190 [ scc.merge] INFO
2025-08-11 00:47:45,190 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-11 00:47:45,190 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-08-11 00:47:45,190 [ scc.merge] INFO
2025-08-11 00:47:45,190 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-08-11 00:47:45,190 [ scc.merge] INFO Already up to date.
2025-08-11 00:47:45,190 [ scc.merge] INFO
2025-08-11 00:47:45,190 [ scc.merge] INFO
2025-08-11 00:47:45,190 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-08-11 00:47:45,190 [ scc.merge] INFO Already up to date.
2025-08-11 00:47:45,190 [ scc.merge] INFO
2025-08-11 00:47:45,190 [ scc.merge] INFO
2025-08-11 00:47:45,190 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-08-11 00:47:45,190 [ scc.merge] INFO Already up to date.
2025-08-11 00:47:45,190 [ scc.merge] INFO
2025-08-11 00:47:45,190 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-11 00:47:45,190 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-08-11 00:47:45,190 [ scc.merge] INFO
2025-08-11 00:47:45,190 [ scc.merge] INFO Repository: ome/scripts
2025-08-11 00:47:45,190 [ scc.merge] INFO Excluded PRs:
2025-08-11 00:47:45,190 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-08-11 00:47:45,190 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-08-11 00:47:45,190 [ scc.merge] INFO Updating 4b4c755..573db34
2025-08-11 00:47:45,190 [ scc.merge] INFO Previously merged:
2025-08-11 00:47:45,190 [ scc.merge] INFO - PR 227 jburel 'Replace tostring by tobytes'
2025-08-11 00:47:45,190 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-08-11 00:47:45,190 [ scc.merge] INFO
2025-08-11 00:47:45,190 [ scc.merge] INFO Merged PRs:
2025-08-11 00:47:45,190 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-08-11 00:47:45,190 [ scc.merge] INFO
2025-08-11 00:47:45,190 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-11 00:47:45,190 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-08-11 00:47:45,191 [ scc.merge] INFO
2025-08-11 00:47:45,191 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-08-11 00:47:45,191 [ scc.git] DEBUG Calling 'git remote'
2025-08-11 00:47:45,193 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-08-11 00:47:45,193 [ scc.git] DEBUG Calling 'git remote'
2025-08-11 00:47:45,195 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:45,195 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-08-11 00:47:45,195 [ scc.git] DEBUG Calling 'git remote'
2025-08-11 00:47:45,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:45,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-08-11 00:47:45,198 [ scc.git] DEBUG Calling 'git remote'
2025-08-11 00:47:45,200 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:45,200 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-08-11 00:47:45,200 [ scc.git] DEBUG Calling 'git remote'
2025-08-11 00:47:45,202 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:45,202 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-08-11 00:47:45,202 [ scc.git] DEBUG Calling 'git remote'
2025-08-11 00:47:45,205 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:45,205 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-08-11 00:47:45,205 [ scc.git] DEBUG Calling 'git remote'
2025-08-11 00:47:45,207 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:45,207 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-08-11 00:47:45,207 [ scc.git] DEBUG Calling 'git remote'
2025-08-11 00:47:45,209 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:45,209 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-08-11 00:47:45,209 [ scc.git] DEBUG Calling 'git remote'
2025-08-11 00:47:45,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:45,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-08-11 00:47:45,212 [ scc.git] DEBUG Calling 'git remote'
2025-08-11 00:47:45,214 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:45,214 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-08-11 00:47:45,214 [ scc.git] DEBUG Calling 'git remote'
2025-08-11 00:47:45,216 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:45,216 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-08-11 00:47:45,216 [ scc.git] DEBUG Calling 'git remote'
2025-08-11 00:47:45,218 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:45,218 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-08-11 00:47:45,219 [ scc.git] DEBUG Calling 'git remote'
2025-08-11 00:47:45,221 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:45,221 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-08-11 00:47:45,221 [ scc.git] DEBUG Calling 'git remote'
2025-08-11 00:47:45,223 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:45,223 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-08-11 00:47:45,223 [ scc.git] DEBUG Calling 'git remote'
2025-08-11 00:47:45,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:45,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-08-11 00:47:45,225 [ scc.git] DEBUG Calling 'git remote'
2025-08-11 00:47:45,228 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:45,228 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-08-11 00:47:45,228 [ scc.git] DEBUG Calling 'git remote'
2025-08-11 00:47:45,230 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:45,230 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-08-11 00:47:45,230 [ scc.git] DEBUG Calling 'git remote'
2025-08-11 00:47:45,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:45,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-08-11 00:47:45,232 [ scc.git] DEBUG Calling 'git remote'
2025-08-11 00:47:45,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:45,235 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-08-11 00:47:45,235 [ scc.git] DEBUG Calling 'git remote'
2025-08-11 00:47:45,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:45,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-08-11 00:47:45,237 [ scc.git] DEBUG Calling 'git remote'
2025-08-11 00:47:45,239 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:45,239 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-08-11 00:47:45,239 [ scc.git] DEBUG Calling 'git remote'
2025-08-11 00:47:45,241 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-11 00:47:45,241 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-08-11 00:47:45,241 [ scc.git] DEBUG Calling 'git remote'
2025-08-11 00:47:45,243 [ 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 0e7148b] 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 b1972ac] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-08-11 00:48:34,141 [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-08-11 00:48:43,896 [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-08-11 00:48:46,455 [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-08-11 00:48:51,435 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-08-11 00:49:31,877 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/9bac06d9/images/svgs/logo.svg){kind=logo}
