Skipping 223 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-08-07 00:46:08,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-08-07 00:46:08,473 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:08,745 [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-07 00:46:08,996 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:09,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-08-07 00:46:09,545 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:09,747 [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-07 00:46:09,748 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-07 00:46:09,999 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:10,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-08-07 00:46:10,534 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:10,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-08-07 00:46:11,095 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:11,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-08-07 00:46:11,649 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:11,916 [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-07 00:46:12,168 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:12,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-08-07 00:46:12,644 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:12,845 [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-07 00:46:12,845 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-08-07 00:46:12,845 [ scc.repo] DEBUG ## Branches found:
2025-08-07 00:46:12,846 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-08-07 00:46:12,846 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:46:12,846 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:12,848 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-07 00:46:12,851 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-07 00:46:12,851 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-07 00:46:12,854 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-07 00:46:12,857 [ scc.git] DEBUG Already up to date.
2025-08-07 00:46:12,857 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-08-07 00:46:13,170 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-08-07 00:46:13,170 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-08-07 00:46:13,174 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-08-07 00:46:13,448 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-08-07 00:46:13,448 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-08-07 00:46:13,453 [ scc.git] DEBUG ## Unique users: []
2025-08-07 00:46:13,453 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:46:13,453 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:13,455 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-08-07 00:46:13,459 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:13,461 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-08-07 00:46:13,471 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-07 00:46:13,474 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-08-07 00:46:13,474 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-08-07 00:46:13,474 [ scc.git] DEBUG requirements.txt | 2 +-
2025-08-07 00:46:13,474 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-08-07 00:46:13,474 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-08-07 00:46:13,474 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-08-07 00:46:13,476 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:13,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:46:13,659 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-08-07 00:46:13,663 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:13,665 [ 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-07 00:46:13,674 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-07 00:46:13,677 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-08-07 00:46:13,677 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-08-07 00:46:13,910 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:14,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:46:14,081 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-07 00:46:14,122 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:46:14,122 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:14,125 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-07 00:46:14,166 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-07 00:46:14,169 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd5be88a3d0> has no local changes
2025-08-07 00:46:14,170 [ 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#497 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/)'
2025-08-07 00:46:14,176 [ scc.git] DEBUG [detached HEAD 84832c4] merge master -Dorg -Ssuccess-only
2025-08-07 00:46:14,176 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:46:14,176 [ scc.repo] DEBUG ## PRs found:
2025-08-07 00:46:14,332 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:14,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-08-07 00:46:14,862 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:15,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-08-07 00:46:15,344 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:15,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-08-07 00:46:15,858 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:16,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-08-07 00:46:16,384 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:16,626 [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-07 00:46:16,878 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:17,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-08-07 00:46:17,362 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:17,586 [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-07 00:46:17,587 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-08-07 00:46:17,838 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:18,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-08-07 00:46:18,308 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:18,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-08-07 00:46:18,789 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:19,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-08-07 00:46:19,339 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:19,555 [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-07 00:46:19,807 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:20,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-08-07 00:46:20,280 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:20,493 [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-07 00:46:20,494 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-08-07 00:46:20,494 [ scc.repo] DEBUG ## Branches found:
2025-08-07 00:46:20,494 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-08-07 00:46:20,494 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:46:20,494 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:20,497 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-07 00:46:20,499 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-07 00:46:20,499 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-07 00:46:20,502 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-07 00:46:20,510 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-08-07 00:46:20,745 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:21,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-08-07 00:46:21,163 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-08-07 00:46:21,468 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-08-07 00:46:21,468 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-08-07 00:46:21,473 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-08-07 00:46:21,744 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-08-07 00:46:21,744 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-08-07 00:46:21,748 [ scc.git] DEBUG ## Unique users: []
2025-08-07 00:46:21,748 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:46:21,748 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:21,751 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-08-07 00:46:21,756 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:21,758 [ 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-07 00:46:21,771 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-08-07 00:46:21,771 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-08-07 00:46:21,771 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-08-07 00:46:21,772 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-08-07 00:46:21,772 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-07 00:46:21,772 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-07 00:46:21,775 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-08-07 00:46:21,780 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-08-07 00:46:21,781 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:21,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:46:21,956 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-08-07 00:46:21,960 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-08-07 00:46:21,963 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#497](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-08-07 00:46:21,966 [ scc.config] DEBUG Found github.token
2025-08-07 00:46:21,966 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-08-07 00:46:21,966 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-08-07 00:46:21,970 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:21,972 [ 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-07 00:46:21,988 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-08-07 00:46:21,988 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-08-07 00:46:21,988 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-08-07 00:46:21,988 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-07 00:46:21,988 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-07 00:46:21,991 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-08-07 00:46:21,996 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-08-07 00:46:22,207 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:22,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:46:22,371 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-08-07 00:46:22,376 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-08-07 00:46:22,379 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#497](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/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-07 00:46:22,381 [ scc.config] DEBUG Found github.token
2025-08-07 00:46:22,381 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-08-07 00:46:22,381 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-07 00:46:22,421 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:46:22,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:22,424 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-07 00:46:22,462 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-07 00:46:22,466 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd5be8d6590> has no local changes
2025-08-07 00:46:22,466 [ 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#497 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/)'
2025-08-07 00:46:22,472 [ scc.git] DEBUG [detached HEAD 147f613] merge master -Dorg -Ssuccess-only
2025-08-07 00:46:22,473 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:46:22,473 [ scc.repo] DEBUG ## PRs found:
2025-08-07 00:46:22,622 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:22,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-08-07 00:46:23,247 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:23,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-08-07 00:46:23,759 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:24,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-08-07 00:46:24,317 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:24,582 [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-07 00:46:24,834 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:25,102 [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-07 00:46:25,353 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:25,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-08-07 00:46:25,903 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:26,113 [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-07 00:46:26,113 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-07 00:46:26,364 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:26,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-08-07 00:46:26,620 [ scc.repo] DEBUG # ... Include label: dependencies
2025-08-07 00:46:26,871 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:27,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-08-07 00:46:27,482 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:27,761 [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-07 00:46:28,012 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:28,292 [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-07 00:46:28,544 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:28,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-08-07 00:46:29,153 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:29,390 [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-07 00:46:29,391 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-08-07 00:46:29,642 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:29,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-08-07 00:46:29,920 [ scc.repo] DEBUG # ... Include label: dependencies
2025-08-07 00:46:30,171 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:30,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-08-07 00:46:30,766 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:31,068 [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-07 00:46:31,320 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:31,608 [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-07 00:46:31,859 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:32,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-08-07 00:46:32,429 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:32,629 [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-07 00:46:32,629 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-08-07 00:46:32,880 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:33,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-08-07 00:46:33,359 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:33,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-08-07 00:46:33,859 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:34,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-08-07 00:46:34,350 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:34,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-08-07 00:46:34,828 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:35,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-08-07 00:46:35,313 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:35,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-08-07 00:46:35,822 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:36,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-08-07 00:46:36,099 [ scc.repo] DEBUG ## Branches found:
2025-08-07 00:46:36,099 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-08-07 00:46:36,100 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:46:36,100 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:36,103 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-07 00:46:36,105 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-07 00:46:36,106 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-07 00:46:36,109 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-07 00:46:36,112 [ scc.git] DEBUG Already up to date.
2025-08-07 00:46:36,112 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-08-07 00:46:36,393 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-08-07 00:46:36,393 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-08-07 00:46:36,397 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-08-07 00:46:36,685 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-08-07 00:46:36,685 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-08-07 00:46:36,689 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-08-07 00:46:36,960 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-08-07 00:46:36,960 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-08-07 00:46:36,964 [ scc.git] DEBUG ## Unique users: []
2025-08-07 00:46:36,964 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:46:36,964 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:36,966 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-08-07 00:46:36,969 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:36,971 [ 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-07 00:46:36,979 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-07 00:46:36,983 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-08-07 00:46:36,983 [ scc.git] DEBUG package.json | 2 +-
2025-08-07 00:46:36,983 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-08-07 00:46:36,985 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:37,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:46:37,167 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-08-07 00:46:37,170 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:37,172 [ 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-07 00:46:37,182 [ scc.git] DEBUG Auto-merging package-lock.json
2025-08-07 00:46:37,182 [ scc.git] DEBUG Auto-merging package.json
2025-08-07 00:46:37,183 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-07 00:46:37,186 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-08-07 00:46:37,186 [ scc.git] DEBUG package.json | 2 +-
2025-08-07 00:46:37,186 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-08-07 00:46:37,418 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:37,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:46:37,606 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-08-07 00:46:37,609 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:37,612 [ 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-07 00:46:37,620 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-07 00:46:37,624 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-08-07 00:46:37,624 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-08-07 00:46:37,857 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:38,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:46:38,037 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-07 00:46:38,078 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:46:38,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:38,080 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-07 00:46:38,118 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-07 00:46:38,123 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd5bc6cd490> has no local changes
2025-08-07 00:46:38,123 [ 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#497 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/)'
2025-08-07 00:46:38,129 [ scc.git] DEBUG [detached HEAD 7a51741] merge master -Dorg -Ssuccess-only
2025-08-07 00:46:38,130 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:46:38,130 [ scc.repo] DEBUG ## PRs found:
2025-08-07 00:46:38,289 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:38,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-08-07 00:46:38,506 [ scc.repo] DEBUG ## Branches found:
2025-08-07 00:46:38,506 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-08-07 00:46:38,506 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:46:38,506 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:38,508 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-07 00:46:38,511 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-07 00:46:38,511 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-07 00:46:38,514 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-07 00:46:38,517 [ scc.git] DEBUG Already up to date.
2025-08-07 00:46:38,517 [ scc.git] DEBUG ## Unique users: []
2025-08-07 00:46:38,517 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:46:38,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:38,519 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-07 00:46:38,557 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:46:38,557 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:38,559 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-07 00:46:38,597 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-07 00:46:38,600 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd5bc6f0590> has no local changes
2025-08-07 00:46:38,601 [ 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#497 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/)'
2025-08-07 00:46:38,606 [ scc.git] DEBUG [detached HEAD 91b9183] merge master -Dorg -Ssuccess-only
2025-08-07 00:46:38,607 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:46:38,607 [ scc.repo] DEBUG ## PRs found:
2025-08-07 00:46:38,757 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:39,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-08-07 00:46:39,336 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:39,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-08-07 00:46:39,840 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:40,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-08-07 00:46:40,415 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:40,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3 HTTP/1.1" 200 None
2025-08-07 00:46:41,071 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:41,310 [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-07 00:46:41,562 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:41,831 [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-07 00:46:42,083 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:42,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3 HTTP/1.1" 200 None
2025-08-07 00:46:42,584 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:42,800 [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-07 00:46:43,051 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:43,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3 HTTP/1.1" 200 None
2025-08-07 00:46:43,511 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:43,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3/status HTTP/1.1" 200 None
2025-08-07 00:46:43,746 [ scc.repo] DEBUG - PR 33 jo-mueller 'Add roi to array functions'
2025-08-07 00:46:43,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:44,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-08-07 00:46:44,245 [ scc.repo] DEBUG ## Branches found:
2025-08-07 00:46:44,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-08-07 00:46:44,245 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:46:44,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:44,248 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-07 00:46:44,251 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-07 00:46:44,251 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-07 00:46:44,254 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-07 00:46:44,257 [ scc.git] DEBUG Already up to date.
2025-08-07 00:46:44,257 [ scc.git] DEBUG Calling 'git fetch origin pull/33/head'
2025-08-07 00:46:44,538 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2025-08-07 00:46:44,538 [ scc.git] DEBUG * branch refs/pull/33/head -> FETCH_HEAD
2025-08-07 00:46:44,543 [ scc.git] DEBUG ## Unique users: []
2025-08-07 00:46:44,543 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:46:44,543 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:44,545 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1122baea98746effd4eb59deed25870f673ce3d3'
2025-08-07 00:46:44,548 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:44,550 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 33 (Add roi to array functions) 1122baea98746effd4eb59deed25870f673ce3d3'
2025-08-07 00:46:44,558 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-07 00:46:44,561 [ scc.git] DEBUG setup.py | 4 +-
2025-08-07 00:46:44,561 [ scc.git] DEBUG src/omero_rois/__init__.py | 4 +
2025-08-07 00:46:44,561 [ scc.git] DEBUG src/omero_rois/library.py | 204 +++++++++++++++++++++++++++++++++++++++++++--
2025-08-07 00:46:44,561 [ scc.git] DEBUG 3 files changed, 203 insertions(+), 9 deletions(-)
2025-08-07 00:46:44,562 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:44,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:46:44,745 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-07 00:46:44,786 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:46:44,786 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:44,788 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-07 00:46:44,828 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-07 00:46:44,832 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd5bc6f1ad0> has no local changes
2025-08-07 00:46:44,832 [ 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#497 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/)'
2025-08-07 00:46:44,839 [ scc.git] DEBUG [detached HEAD b9f1832] merge master -Dorg -Ssuccess-only
2025-08-07 00:46:44,839 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:46:44,839 [ scc.repo] DEBUG ## PRs found:
2025-08-07 00:46:44,996 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:45,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-08-07 00:46:45,536 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:45,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-08-07 00:46:46,062 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:46,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-08-07 00:46:46,532 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:46,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-08-07 00:46:47,094 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:47,316 [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-07 00:46:47,567 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:47,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-08-07 00:46:48,040 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:48,238 [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-07 00:46:48,238 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-08-07 00:46:48,238 [ scc.repo] DEBUG ## Branches found:
2025-08-07 00:46:48,238 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-08-07 00:46:48,238 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:46:48,238 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:48,241 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-07 00:46:48,243 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-07 00:46:48,243 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-07 00:46:48,246 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-07 00:46:48,249 [ scc.git] DEBUG Already up to date.
2025-08-07 00:46:48,249 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-08-07 00:46:48,534 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-08-07 00:46:48,534 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-08-07 00:46:48,538 [ scc.git] DEBUG ## Unique users: []
2025-08-07 00:46:48,538 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:46:48,538 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:48,540 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-08-07 00:46:48,543 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:48,546 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-08-07 00:46:48,555 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-08-07 00:46:48,555 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-08-07 00:46:48,555 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-08-07 00:46:48,555 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-08-07 00:46:48,555 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-08-07 00:46:48,555 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-08-07 00:46:48,555 [ scc.git] DEBUG Auto-merging setup.py
2025-08-07 00:46:48,555 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-08-07 00:46:48,555 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-07 00:46:48,555 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-07 00:46:48,558 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-08-07 00:46:48,562 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-08-07 00:46:48,564 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:48,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:46:48,818 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-08-07 00:46:48,821 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-08-07 00:46:48,824 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#497](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/views.py
- omero_signup/urls.py
- omero_signup/signup_settings.py
--conflicts
2025-08-07 00:46:48,826 [ scc.config] DEBUG Found github.token
2025-08-07 00:46:48,826 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-08-07 00:46:48,826 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-07 00:46:48,868 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:46:48,868 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:48,870 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-07 00:46:48,912 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-07 00:46:48,916 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd5be8617d0> has no local changes
2025-08-07 00:46:48,916 [ 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#497 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/)'
2025-08-07 00:46:48,986 [ scc.git] DEBUG [detached HEAD 4857749] merge master -Dorg -Ssuccess-only
2025-08-07 00:46:48,986 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:46:48,986 [ scc.repo] DEBUG ## PRs found:
2025-08-07 00:46:49,069 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:49,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-08-07 00:46:49,661 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:49,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-08-07 00:46:50,145 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:50,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-08-07 00:46:50,715 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:50,995 [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-07 00:46:51,247 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:51,478 [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-07 00:46:51,730 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:52,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-08-07 00:46:52,342 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:52,541 [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-07 00:46:52,541 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-08-07 00:46:52,792 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:53,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-08-07 00:46:53,293 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:53,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-08-07 00:46:53,823 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:54,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-08-07 00:46:54,360 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:54,623 [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-07 00:46:54,874 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:55,141 [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-07 00:46:55,393 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:55,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-08-07 00:46:55,903 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:56,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-08-07 00:46:56,389 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:56,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-08-07 00:46:56,874 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:57,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-08-07 00:46:57,347 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:57,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-08-07 00:46:57,863 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:58,196 [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-07 00:46:58,447 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:58,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-08-07 00:46:58,920 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:59,105 [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-07 00:46:59,106 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-08-07 00:46:59,106 [ scc.repo] DEBUG ## Branches found:
2025-08-07 00:46:59,106 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-08-07 00:46:59,106 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:46:59,106 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:59,109 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-07 00:46:59,111 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-07 00:46:59,111 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-07 00:46:59,114 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-07 00:46:59,118 [ scc.git] DEBUG Already up to date.
2025-08-07 00:46:59,118 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-08-07 00:46:59,410 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-08-07 00:46:59,410 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-08-07 00:46:59,414 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-08-07 00:46:59,699 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-08-07 00:46:59,699 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-08-07 00:46:59,703 [ scc.git] DEBUG ## Unique users: []
2025-08-07 00:46:59,703 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:46:59,703 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:59,706 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-08-07 00:46:59,710 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:59,712 [ 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-07 00:46:59,724 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-07 00:46:59,728 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-08-07 00:46:59,728 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-08-07 00:46:59,728 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-08-07 00:46:59,729 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-08-07 00:46:59,729 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-08-07 00:46:59,729 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-08-07 00:46:59,729 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-08-07 00:46:59,729 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-08-07 00:46:59,730 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:46:59,730 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-08-07 00:46:59,730 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-08-07 00:46:59,730 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-08-07 00:46:59,730 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-08-07 00:46:59,730 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-08-07 00:46:59,730 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-08-07 00:46:59,730 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-08-07 00:46:59,730 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-08-07 00:46:59,730 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-08-07 00:46:59,730 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-08-07 00:46:59,730 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-08-07 00:46:59,730 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-08-07 00:46:59,730 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-08-07 00:46:59,730 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-08-07 00:46:59,730 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-08-07 00:46:59,730 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-08-07 00:46:59,730 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-08-07 00:46:59,730 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-08-07 00:46:59,730 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-08-07 00:46:59,730 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-08-07 00:46:59,730 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-08-07 00:46:59,730 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-08-07 00:46:59,730 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-08-07 00:46:59,730 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-08-07 00:46:59,730 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-08-07 00:46:59,730 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-08-07 00:46:59,731 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-08-07 00:46:59,731 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-08-07 00:46:59,731 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-08-07 00:46:59,731 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-08-07 00:46:59,731 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-08-07 00:46:59,731 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-08-07 00:46:59,731 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-08-07 00:46:59,731 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-08-07 00:46:59,731 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-08-07 00:46:59,731 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-08-07 00:46:59,731 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-08-07 00:46:59,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:46:59,899 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-08-07 00:46:59,903 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:46:59,905 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-08-07 00:46:59,916 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-07 00:46:59,919 [ scc.git] DEBUG docker | 1 +
2025-08-07 00:46:59,919 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-08-07 00:47:00,150 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:00,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:00,335 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-07 00:47:00,377 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:47:00,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:00,379 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-07 00:47:00,420 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-07 00:47:00,424 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd5bc70c6d0> has no local changes
2025-08-07 00:47:00,424 [ 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#497 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/)'
2025-08-07 00:47:00,431 [ scc.git] DEBUG [detached HEAD 9ba411b] merge master -Dorg -Ssuccess-only
2025-08-07 00:47:00,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:00,431 [ scc.repo] DEBUG ## PRs found:
2025-08-07 00:47:00,586 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:00,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-08-07 00:47:00,789 [ scc.repo] DEBUG ## Branches found:
2025-08-07 00:47:00,789 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-08-07 00:47:00,789 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:47:00,789 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:00,791 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-07 00:47:00,793 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-07 00:47:00,794 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-07 00:47:00,796 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-07 00:47:00,799 [ scc.git] DEBUG Already up to date.
2025-08-07 00:47:00,799 [ scc.git] DEBUG ## Unique users: []
2025-08-07 00:47:00,800 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:47:00,800 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:00,802 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-07 00:47:00,840 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:47:00,840 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:00,842 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-07 00:47:00,879 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-07 00:47:00,882 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd5bc6cd710> has no local changes
2025-08-07 00:47:00,882 [ 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#497 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/)'
2025-08-07 00:47:00,888 [ scc.git] DEBUG [detached HEAD 309d25a] merge master -Dorg -Ssuccess-only
2025-08-07 00:47:00,889 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:00,889 [ scc.repo] DEBUG ## PRs found:
2025-08-07 00:47:01,040 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:01,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2025-08-07 00:47:01,257 [ scc.repo] DEBUG ## Branches found:
2025-08-07 00:47:01,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-08-07 00:47:01,257 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:47:01,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:01,259 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-07 00:47:01,261 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-07 00:47:01,262 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-07 00:47:01,264 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-07 00:47:01,272 [ scc.git] DEBUG Updating deab817..160d894
2025-08-07 00:47:01,508 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:02,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls/20 HTTP/1.1" 200 None
2025-08-07 00:47:02,015 [ scc.git] DEBUG ## Unique users: []
2025-08-07 00:47:02,015 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:47:02,015 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:02,018 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-07 00:47:02,060 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:47:02,060 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:02,062 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-07 00:47:02,103 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-07 00:47:02,107 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd5bc7123d0> has no local changes
2025-08-07 00:47:02,107 [ 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#497 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/)'
2025-08-07 00:47:02,114 [ scc.git] DEBUG [detached HEAD fd9e53e] merge master -Dorg -Ssuccess-only
2025-08-07 00:47:02,114 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:02,114 [ scc.git] INFO Overriding base-branch from master to main
2025-08-07 00:47:02,114 [ scc.repo] DEBUG ## PRs found:
2025-08-07 00:47:02,266 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:02,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-08-07 00:47:02,802 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:03,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-08-07 00:47:03,326 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:03,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-08-07 00:47:03,808 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:04,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-08-07 00:47:04,389 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:04,626 [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-07 00:47:04,878 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:05,130 [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-07 00:47:05,381 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:05,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-08-07 00:47:05,851 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:06,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-08-07 00:47:06,379 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:06,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-08-07 00:47:06,845 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:07,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-08-07 00:47:07,620 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:07,850 [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-07 00:47:08,101 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:08,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-08-07 00:47:08,586 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:08,817 [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-07 00:47:08,817 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-08-07 00:47:08,817 [ scc.repo] DEBUG ## Branches found:
2025-08-07 00:47:08,817 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-08-07 00:47:08,818 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:47:08,818 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:08,820 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-08-07 00:47:08,823 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-07 00:47:08,823 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-08-07 00:47:08,826 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-08-07 00:47:08,829 [ scc.git] DEBUG Already up to date.
2025-08-07 00:47:08,829 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-08-07 00:47:09,114 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-08-07 00:47:09,114 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-08-07 00:47:09,118 [ scc.git] DEBUG ## Unique users: []
2025-08-07 00:47:09,118 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:47:09,118 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:09,121 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-08-07 00:47:09,124 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:09,126 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-08-07 00:47:09,134 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-08-07 00:47:09,134 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-08-07 00:47:09,134 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-07 00:47:09,135 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-07 00:47:09,137 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-08-07 00:47:09,141 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-08-07 00:47:09,143 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:09,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:09,305 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-08-07 00:47:09,308 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-08-07 00:47:09,311 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#497](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-08-07 00:47:09,313 [ scc.config] DEBUG Found github.token
2025-08-07 00:47:09,313 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-08-07 00:47:09,313 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-07 00:47:09,353 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:47:09,353 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:09,355 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-07 00:47:09,395 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-07 00:47:09,398 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd5bc6dcd90> has no local changes
2025-08-07 00:47:09,398 [ 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#497 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/)'
2025-08-07 00:47:09,405 [ scc.git] DEBUG [detached HEAD ee0092b] merge master -Dorg -Ssuccess-only
2025-08-07 00:47:09,405 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:09,405 [ scc.repo] DEBUG ## PRs found:
2025-08-07 00:47:09,556 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:09,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-08-07 00:47:09,758 [ scc.repo] DEBUG ## Branches found:
2025-08-07 00:47:09,759 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-08-07 00:47:09,759 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:47:09,759 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:09,761 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-07 00:47:09,763 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-07 00:47:09,763 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-07 00:47:09,766 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-07 00:47:09,769 [ scc.git] DEBUG Already up to date.
2025-08-07 00:47:09,769 [ scc.git] DEBUG ## Unique users: []
2025-08-07 00:47:09,769 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:47:09,769 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:09,771 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-07 00:47:09,809 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:47:09,809 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:09,811 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-07 00:47:09,850 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-07 00:47:09,853 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd5be7d2e50> has no local changes
2025-08-07 00:47:09,854 [ 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#497 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/)'
2025-08-07 00:47:09,859 [ scc.git] DEBUG [detached HEAD 5392cfb] merge master -Dorg -Ssuccess-only
2025-08-07 00:47:09,860 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:09,860 [ scc.repo] DEBUG ## PRs found:
2025-08-07 00:47:10,009 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:10,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-08-07 00:47:10,208 [ scc.repo] DEBUG ## Branches found:
2025-08-07 00:47:10,208 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-08-07 00:47:10,208 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:47:10,208 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:10,211 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-07 00:47:10,213 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-07 00:47:10,213 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-07 00:47:10,216 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-07 00:47:10,219 [ scc.git] DEBUG Already up to date.
2025-08-07 00:47:10,219 [ scc.git] DEBUG ## Unique users: []
2025-08-07 00:47:10,219 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:47:10,219 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:10,221 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-07 00:47:10,263 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:47:10,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:10,265 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-07 00:47:10,306 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-07 00:47:10,309 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd5bc75ced0> has no local changes
2025-08-07 00:47:10,309 [ 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#497 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/)'
2025-08-07 00:47:10,315 [ scc.git] DEBUG [detached HEAD fe1236d] merge master -Dorg -Ssuccess-only
2025-08-07 00:47:10,316 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:10,316 [ scc.repo] DEBUG ## PRs found:
2025-08-07 00:47:10,459 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:10,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-08-07 00:47:10,994 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:11,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-08-07 00:47:11,529 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:11,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-08-07 00:47:12,048 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:12,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-08-07 00:47:12,601 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:12,824 [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-07 00:47:13,075 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:13,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-08-07 00:47:13,605 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:13,812 [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-07 00:47:13,812 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-08-07 00:47:13,812 [ scc.repo] DEBUG ## Branches found:
2025-08-07 00:47:13,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-08-07 00:47:13,812 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:47:13,812 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:13,815 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-07 00:47:13,817 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-07 00:47:13,817 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-07 00:47:13,820 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-07 00:47:13,823 [ scc.git] DEBUG Already up to date.
2025-08-07 00:47:13,823 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-08-07 00:47:14,129 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-08-07 00:47:14,129 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-08-07 00:47:14,134 [ scc.git] DEBUG ## Unique users: []
2025-08-07 00:47:14,134 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:47:14,134 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:14,136 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-08-07 00:47:14,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:14,142 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-08-07 00:47:14,151 [ scc.git] DEBUG Auto-merging Dockerfile
2025-08-07 00:47:14,151 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-08-07 00:47:14,151 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-07 00:47:14,152 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-07 00:47:14,155 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-08-07 00:47:14,159 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-08-07 00:47:14,161 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:14,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:14,391 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-08-07 00:47:14,394 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-08-07 00:47:14,397 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#497](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-08-07 00:47:14,399 [ scc.config] DEBUG Found github.token
2025-08-07 00:47:14,399 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-08-07 00:47:14,399 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-07 00:47:14,440 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:47:14,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:14,443 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-07 00:47:14,481 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-07 00:47:14,485 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd5beabe710> has no local changes
2025-08-07 00:47:14,485 [ 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#497 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/)'
2025-08-07 00:47:14,492 [ scc.git] DEBUG [detached HEAD c274ae0] merge master -Dorg -Ssuccess-only
2025-08-07 00:47:14,492 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:14,493 [ scc.git] INFO Overriding base-branch from master to develop
2025-08-07 00:47:14,493 [ scc.repo] DEBUG ## PRs found:
2025-08-07 00:47:14,642 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:14,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-08-07 00:47:15,220 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:15,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-08-07 00:47:15,723 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:16,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-08-07 00:47:16,252 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:16,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-08-07 00:47:16,752 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:17,013 [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-07 00:47:17,265 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:17,520 [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-07 00:47:17,772 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:17,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-08-07 00:47:18,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:18,429 [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-07 00:47:18,429 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-08-07 00:47:18,680 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:19,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-08-07 00:47:19,267 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:19,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-08-07 00:47:19,773 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:19,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-08-07 00:47:20,251 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:20,479 [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-07 00:47:20,731 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:20,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-08-07 00:47:21,216 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:21,411 [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-07 00:47:21,412 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-08-07 00:47:21,663 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:21,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-08-07 00:47:22,195 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:22,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-08-07 00:47:22,695 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:22,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-08-07 00:47:23,197 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:23,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-08-07 00:47:23,463 [ scc.repo] DEBUG ## Branches found:
2025-08-07 00:47:23,463 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-08-07 00:47:23,463 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:47:23,463 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:23,466 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-08-07 00:47:23,468 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-07 00:47:23,468 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-08-07 00:47:23,472 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-08-07 00:47:23,482 [ scc.git] DEBUG Updating 4b4c755..573db34
2025-08-07 00:47:23,712 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:24,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/227 HTTP/1.1" 200 None
2025-08-07 00:47:24,386 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:24,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-08-07 00:47:24,818 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-08-07 00:47:25,109 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-08-07 00:47:25,109 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-08-07 00:47:25,114 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-08-07 00:47:25,415 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-08-07 00:47:25,416 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-08-07 00:47:25,420 [ scc.git] DEBUG ## Unique users: []
2025-08-07 00:47:25,420 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:47:25,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:25,423 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-08-07 00:47:25,428 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:25,431 [ 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-07 00:47:25,442 [ 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-07 00:47:25,442 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-07 00:47:25,443 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-07 00:47:25,445 [ scc.git] DEBUG Calling 'git reset --hard 573db340d5d1429fa17c7e486206948412a7c150'
2025-08-07 00:47:25,449 [ scc.git] DEBUG HEAD is now at 573db34 Bump version: 5.9.1 → 5.9.2.dev0
2025-08-07 00:47:25,450 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:25,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:25,623 [ scc.git] DEBUG Calling 'git merge-base 573db340d5d1429fa17c7e486206948412a7c150 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-08-07 00:47:25,628 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..573db340d5d1429fa17c7e486206948412a7c150'
2025-08-07 00:47:25,632 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#497](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-08-07 00:47:25,634 [ scc.config] DEBUG Found github.token
2025-08-07 00:47:25,634 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-08-07 00:47:25,634 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-08-07 00:47:25,639 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:25,641 [ 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-07 00:47:25,651 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-07 00:47:25,654 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-08-07 00:47:25,654 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-08-07 00:47:25,874 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:26,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:26,065 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-07 00:47:26,106 [ scc.git] DEBUG Get sha1 of %s
2025-08-07 00:47:26,106 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-07 00:47:26,108 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-07 00:47:26,148 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-07 00:47:26,151 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd5bc719710> has no local changes
2025-08-07 00:47:26,152 [ 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#497 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/)'
2025-08-07 00:47:26,158 [ scc.git] DEBUG [detached HEAD df2f5ce] merge master -Dorg -Ssuccess-only
2025-08-07 00:47:26,158 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:26,159 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-07 00:47:26,241 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-08-07 00:47:26,316 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:26,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:26,495 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-08-07 00:47:26,497 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-08-07 00:47:26,742 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:26,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:26,910 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-08-07 00:47:26,912 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-08-07 00:47:27,157 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:27,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:27,351 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-08-07 00:47:27,353 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-08-07 00:47:27,598 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:27,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:27,781 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-08-07 00:47:28,026 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:28,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:28,201 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-08-07 00:47:28,203 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-08-07 00:47:28,447 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:28,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:28,618 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-08-07 00:47:28,620 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-08-07 00:47:28,864 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:29,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:29,050 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-08-07 00:47:29,052 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-08-07 00:47:29,297 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:29,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:29,475 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-08-07 00:47:29,477 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-08-07 00:47:29,722 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:29,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:29,912 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-08-07 00:47:29,914 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-08-07 00:47:30,158 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:30,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:30,381 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-08-07 00:47:30,383 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-08-07 00:47:30,628 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:30,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:30,810 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-08-07 00:47:30,812 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-08-07 00:47:31,057 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:31,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:31,230 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-08-07 00:47:31,232 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-08-07 00:47:31,476 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:31,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:31,659 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-08-07 00:47:31,903 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:32,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:32,084 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-08-07 00:47:32,329 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:32,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:32,511 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-08-07 00:47:32,513 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-08-07 00:47:32,757 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:32,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:32,938 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-08-07 00:47:33,183 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:33,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:33,381 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-08-07 00:47:33,626 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:33,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:33,808 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-08-07 00:47:33,810 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-08-07 00:47:34,054 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:34,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:34,231 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-08-07 00:47:34,233 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-08-07 00:47:34,477 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:34,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:34,678 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-08-07 00:47:34,680 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-08-07 00:47:34,925 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:35,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:35,103 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-08-07 00:47:35,105 [ scc.config] DEBUG Found submodule.scripts.url
2025-08-07 00:47:35,350 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-07 00:47:35,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-07 00:47:35,522 [ scc.config] DEBUG Found submodule.scripts.branch
2025-08-07 00:47:35,522 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-07 00:47:35,614 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd5be98d590> has local changes
2025-08-07 00:47:35,614 [ 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#497 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/497/)'
2025-08-07 00:47:35,627 [ scc.git] DEBUG [detached HEAD 5eb7e3d] merge master -Dorg -Ssuccess-only
2025-08-07 00:47:35,627 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-08-07 00:47:35,627 [ scc.merge] INFO Repository: ome/omero-plugins
2025-08-07 00:47:35,627 [ scc.merge] INFO Already up to date.
2025-08-07 00:47:35,627 [ scc.merge] INFO
2025-08-07 00:47:35,627 [ scc.merge] INFO Merged PRs:
2025-08-07 00:47:35,628 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-08-07 00:47:35,628 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-08-07 00:47:35,628 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-08-07 00:47:35,628 [ scc.merge] INFO
2025-08-07 00:47:35,628 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-08-07 00:47:35,628 [ scc.merge] INFO Already up to date.
2025-08-07 00:47:35,628 [ scc.merge] INFO
2025-08-07 00:47:35,628 [ scc.merge] INFO
2025-08-07 00:47:35,628 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-08-07 00:47:35,628 [ scc.merge] INFO Excluded PRs:
2025-08-07 00:47:35,628 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-08-07 00:47:35,628 [ scc.merge] INFO Already up to date.
2025-08-07 00:47:35,628 [ scc.merge] INFO
2025-08-07 00:47:35,628 [ scc.merge] INFO
2025-08-07 00:47:35,628 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-08-07 00:47:35,628 [ scc.merge] INFO Excluded PRs:
2025-08-07 00:47:35,628 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-08-07 00:47:35,628 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-08-07 00:47:35,628 [ scc.merge] INFO Already up to date.
2025-08-07 00:47:35,628 [ scc.merge] INFO
2025-08-07 00:47:35,628 [ scc.merge] INFO Merged PRs:
2025-08-07 00:47:35,628 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-08-07 00:47:35,628 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-08-07 00:47:35,628 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-08-07 00:47:35,628 [ scc.merge] INFO
2025-08-07 00:47:35,628 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-08-07 00:47:35,628 [ scc.merge] INFO Excluded PRs:
2025-08-07 00:47:35,628 [ scc.merge] INFO - PR 174 will-moore 'Skip wells' (stage: draft)
2025-08-07 00:47:35,628 [ scc.merge] INFO - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
2025-08-07 00:47:35,628 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-08-07 00:47:35,628 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-08-07 00:47:35,628 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-08-07 00:47:35,628 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-08-07 00:47:35,628 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-08-07 00:47:35,628 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-08-07 00:47:35,628 [ scc.merge] INFO Updating 11d3587..f7eea7c
2025-08-07 00:47:35,628 [ scc.merge] INFO Previously merged:
2025-08-07 00:47:35,628 [ scc.merge] INFO - PR 179 will-moore 'Changelog 0.6.0'
2025-08-07 00:47:35,628 [ scc.merge] INFO - PR 177 jburel 'Replace fromstring by frombuffer'
2025-08-07 00:47:35,628 [ scc.merge] INFO - PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
2025-08-07 00:47:35,628 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-08-07 00:47:35,629 [ scc.merge] INFO - PR 173 will-moore 'Add test_export_plate_polygons()'
2025-08-07 00:47:35,629 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-08-07 00:47:35,629 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-07 00:47:35,629 [ scc.merge] INFO
2025-08-07 00:47:35,629 [ scc.merge] INFO Merged PRs:
2025-08-07 00:47:35,629 [ scc.merge] INFO - PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
2025-08-07 00:47:35,629 [ scc.merge] INFO
2025-08-07 00:47:35,629 [ scc.merge] INFO Repository: ome/omero-figure
2025-08-07 00:47:35,629 [ scc.merge] INFO Excluded PRs:
2025-08-07 00:47:35,629 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-08-07 00:47:35,629 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-08-07 00:47:35,629 [ scc.merge] INFO Updating 9cc36cde..d2c6f5bc
2025-08-07 00:47:35,629 [ scc.merge] INFO Previously merged:
2025-08-07 00:47:35,629 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity'
2025-08-07 00:47:35,629 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-08-07 00:47:35,629 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-08-07 00:47:35,629 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-08-07 00:47:35,629 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-07 00:47:35,629 [ scc.merge] INFO
2025-08-07 00:47:35,629 [ scc.merge] INFO Merged PRs:
2025-08-07 00:47:35,629 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-08-07 00:47:35,629 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-08-07 00:47:35,629 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-08-07 00:47:35,629 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-08-07 00:47:35,629 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-08-07 00:47:35,629 [ scc.merge] INFO
2025-08-07 00:47:35,629 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-07 00:47:35,629 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-08-07 00:47:35,629 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-08-07 00:47:35,629 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position'
2025-08-07 00:47:35,629 [ scc.merge] INFO
2025-08-07 00:47:35,629 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-08-07 00:47:35,629 [ scc.merge] INFO Already up to date.
2025-08-07 00:47:35,629 [ scc.merge] INFO
2025-08-07 00:47:35,629 [ scc.merge] INFO Merged PRs:
2025-08-07 00:47:35,629 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-08-07 00:47:35,629 [ scc.merge] INFO
2025-08-07 00:47:35,629 [ scc.merge] INFO Repository: ome/omero-gallery
2025-08-07 00:47:35,629 [ scc.merge] INFO Already up to date.
2025-08-07 00:47:35,629 [ scc.merge] INFO
2025-08-07 00:47:35,629 [ scc.merge] INFO Merged PRs:
2025-08-07 00:47:35,629 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-08-07 00:47:35,630 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-08-07 00:47:35,630 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-08-07 00:47:35,630 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-08-07 00:47:35,630 [ scc.merge] INFO
2025-08-07 00:47:35,630 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-07 00:47:35,630 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-08-07 00:47:35,630 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-08-07 00:47:35,630 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-08-07 00:47:35,630 [ scc.merge] INFO
2025-08-07 00:47:35,630 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-08-07 00:47:35,630 [ scc.merge] INFO Excluded PRs:
2025-08-07 00:47:35,630 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-08-07 00:47:35,630 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-08-07 00:47:35,630 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-08-07 00:47:35,630 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-08-07 00:47:35,630 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-08-07 00:47:35,630 [ scc.merge] INFO Updating 7a798ce..bb94cf8
2025-08-07 00:47:35,630 [ scc.merge] INFO Previously merged:
2025-08-07 00:47:35,630 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-07 00:47:35,630 [ scc.merge] INFO
2025-08-07 00:47:35,630 [ scc.merge] INFO Merged PRs:
2025-08-07 00:47:35,630 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-08-07 00:47:35,630 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-08-07 00:47:35,630 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-08-07 00:47:35,630 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-08-07 00:47:35,630 [ scc.merge] INFO
2025-08-07 00:47:35,630 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-07 00:47:35,630 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-08-07 00:47:35,630 [ scc.merge] INFO
2025-08-07 00:47:35,630 [ scc.merge] INFO Repository: ome/omero-mapr
2025-08-07 00:47:35,630 [ scc.merge] INFO Excluded PRs:
2025-08-07 00:47:35,630 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-08-07 00:47:35,630 [ scc.merge] INFO Already up to date.
2025-08-07 00:47:35,630 [ scc.merge] INFO
2025-08-07 00:47:35,630 [ scc.merge] INFO Merged PRs:
2025-08-07 00:47:35,630 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-08-07 00:47:35,630 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-07 00:47:35,630 [ scc.merge] INFO
2025-08-07 00:47:35,630 [ scc.merge] INFO Repository: ome/omero-metadata
2025-08-07 00:47:35,630 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-08-07 00:47:35,630 [ scc.merge] INFO Previously merged:
2025-08-07 00:47:35,630 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-07 00:47:35,631 [ scc.merge] INFO
2025-08-07 00:47:35,631 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-07 00:47:35,631 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-08-07 00:47:35,631 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-08-07 00:47:35,631 [ scc.merge] INFO
2025-08-07 00:47:35,631 [ scc.merge] INFO Repository: ome/omero-parade
2025-08-07 00:47:35,631 [ scc.merge] INFO Excluded PRs:
2025-08-07 00:47:35,631 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-08-07 00:47:35,631 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-08-07 00:47:35,631 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-08-07 00:47:35,631 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-08-07 00:47:35,631 [ scc.merge] INFO Already up to date.
2025-08-07 00:47:35,631 [ scc.merge] INFO
2025-08-07 00:47:35,631 [ scc.merge] INFO Merged PRs:
2025-08-07 00:47:35,631 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-08-07 00:47:35,631 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-08-07 00:47:35,631 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-07 00:47:35,631 [ scc.merge] INFO
2025-08-07 00:47:35,631 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-08-07 00:47:35,631 [ scc.merge] INFO Already up to date.
2025-08-07 00:47:35,631 [ scc.merge] INFO
2025-08-07 00:47:35,631 [ scc.merge] INFO
2025-08-07 00:47:35,631 [ scc.merge] INFO Repository: ome/omero-rois
2025-08-07 00:47:35,631 [ scc.merge] INFO Excluded PRs:
2025-08-07 00:47:35,631 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-08-07 00:47:35,631 [ scc.merge] INFO Already up to date.
2025-08-07 00:47:35,631 [ scc.merge] INFO
2025-08-07 00:47:35,631 [ scc.merge] INFO Merged PRs:
2025-08-07 00:47:35,631 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions'
2025-08-07 00:47:35,631 [ scc.merge] INFO
2025-08-07 00:47:35,631 [ scc.merge] INFO Repository: ome/omero-signup
2025-08-07 00:47:35,631 [ scc.merge] INFO Already up to date.
2025-08-07 00:47:35,631 [ scc.merge] INFO
2025-08-07 00:47:35,631 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-07 00:47:35,631 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-08-07 00:47:35,631 [ scc.merge] INFO
2025-08-07 00:47:35,631 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-08-07 00:47:35,631 [ scc.merge] INFO Excluded PRs:
2025-08-07 00:47:35,631 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-08-07 00:47:35,631 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-08-07 00:47:35,631 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-08-07 00:47:35,631 [ scc.merge] INFO Already up to date.
2025-08-07 00:47:35,631 [ scc.merge] INFO
2025-08-07 00:47:35,632 [ scc.merge] INFO Merged PRs:
2025-08-07 00:47:35,632 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-08-07 00:47:35,632 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-08-07 00:47:35,632 [ scc.merge] INFO
2025-08-07 00:47:35,632 [ scc.merge] INFO Repository: ome/omero-upload
2025-08-07 00:47:35,632 [ scc.merge] INFO Already up to date.
2025-08-07 00:47:35,632 [ scc.merge] INFO
2025-08-07 00:47:35,632 [ scc.merge] INFO
2025-08-07 00:47:35,632 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-08-07 00:47:35,632 [ scc.merge] INFO Updating deab817..160d894
2025-08-07 00:47:35,632 [ scc.merge] INFO Previously merged:
2025-08-07 00:47:35,632 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-08-07 00:47:35,632 [ scc.merge] INFO
2025-08-07 00:47:35,632 [ scc.merge] INFO
2025-08-07 00:47:35,632 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-08-07 00:47:35,632 [ scc.merge] INFO Excluded PRs:
2025-08-07 00:47:35,632 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-08-07 00:47:35,632 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-08-07 00:47:35,632 [ scc.merge] INFO Already up to date.
2025-08-07 00:47:35,632 [ scc.merge] INFO
2025-08-07 00:47:35,632 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-07 00:47:35,632 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-08-07 00:47:35,632 [ scc.merge] INFO
2025-08-07 00:47:35,632 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-08-07 00:47:35,632 [ scc.merge] INFO Already up to date.
2025-08-07 00:47:35,632 [ scc.merge] INFO
2025-08-07 00:47:35,632 [ scc.merge] INFO
2025-08-07 00:47:35,632 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-08-07 00:47:35,632 [ scc.merge] INFO Already up to date.
2025-08-07 00:47:35,632 [ scc.merge] INFO
2025-08-07 00:47:35,632 [ scc.merge] INFO
2025-08-07 00:47:35,632 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-08-07 00:47:35,632 [ scc.merge] INFO Already up to date.
2025-08-07 00:47:35,632 [ scc.merge] INFO
2025-08-07 00:47:35,632 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-07 00:47:35,632 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-08-07 00:47:35,632 [ scc.merge] INFO
2025-08-07 00:47:35,632 [ scc.merge] INFO Repository: ome/scripts
2025-08-07 00:47:35,632 [ scc.merge] INFO Excluded PRs:
2025-08-07 00:47:35,632 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-08-07 00:47:35,632 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-08-07 00:47:35,632 [ scc.merge] INFO Updating 4b4c755..573db34
2025-08-07 00:47:35,632 [ scc.merge] INFO Previously merged:
2025-08-07 00:47:35,633 [ scc.merge] INFO - PR 227 jburel 'Replace tostring by tobytes'
2025-08-07 00:47:35,633 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-08-07 00:47:35,633 [ scc.merge] INFO
2025-08-07 00:47:35,633 [ scc.merge] INFO Merged PRs:
2025-08-07 00:47:35,633 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-08-07 00:47:35,633 [ scc.merge] INFO
2025-08-07 00:47:35,633 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-07 00:47:35,633 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-08-07 00:47:35,633 [ scc.merge] INFO
2025-08-07 00:47:35,633 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-08-07 00:47:35,633 [ scc.git] DEBUG Calling 'git remote'
2025-08-07 00:47:35,635 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-08-07 00:47:35,635 [ scc.git] DEBUG Calling 'git remote'
2025-08-07 00:47:35,637 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:35,637 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-08-07 00:47:35,637 [ scc.git] DEBUG Calling 'git remote'
2025-08-07 00:47:35,639 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:35,639 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-08-07 00:47:35,640 [ scc.git] DEBUG Calling 'git remote'
2025-08-07 00:47:35,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:35,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-08-07 00:47:35,642 [ scc.git] DEBUG Calling 'git remote'
2025-08-07 00:47:35,644 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:35,644 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-08-07 00:47:35,644 [ scc.git] DEBUG Calling 'git remote'
2025-08-07 00:47:35,646 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:35,646 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-08-07 00:47:35,646 [ scc.git] DEBUG Calling 'git remote'
2025-08-07 00:47:35,649 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:35,649 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-08-07 00:47:35,649 [ scc.git] DEBUG Calling 'git remote'
2025-08-07 00:47:35,651 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:35,651 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-08-07 00:47:35,651 [ scc.git] DEBUG Calling 'git remote'
2025-08-07 00:47:35,653 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:35,653 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-08-07 00:47:35,653 [ scc.git] DEBUG Calling 'git remote'
2025-08-07 00:47:35,655 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:35,655 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-08-07 00:47:35,655 [ scc.git] DEBUG Calling 'git remote'
2025-08-07 00:47:35,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:35,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-08-07 00:47:35,658 [ scc.git] DEBUG Calling 'git remote'
2025-08-07 00:47:35,660 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:35,660 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-08-07 00:47:35,660 [ scc.git] DEBUG Calling 'git remote'
2025-08-07 00:47:35,662 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:35,662 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-08-07 00:47:35,662 [ scc.git] DEBUG Calling 'git remote'
2025-08-07 00:47:35,664 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:35,664 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-08-07 00:47:35,664 [ scc.git] DEBUG Calling 'git remote'
2025-08-07 00:47:35,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:35,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-08-07 00:47:35,666 [ scc.git] DEBUG Calling 'git remote'
2025-08-07 00:47:35,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:35,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-08-07 00:47:35,669 [ scc.git] DEBUG Calling 'git remote'
2025-08-07 00:47:35,671 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:35,671 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-08-07 00:47:35,671 [ scc.git] DEBUG Calling 'git remote'
2025-08-07 00:47:35,673 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:35,673 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-08-07 00:47:35,673 [ scc.git] DEBUG Calling 'git remote'
2025-08-07 00:47:35,675 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:35,675 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-08-07 00:47:35,675 [ scc.git] DEBUG Calling 'git remote'
2025-08-07 00:47:35,678 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:35,678 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-08-07 00:47:35,678 [ scc.git] DEBUG Calling 'git remote'
2025-08-07 00:47:35,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:35,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-08-07 00:47:35,680 [ scc.git] DEBUG Calling 'git remote'
2025-08-07 00:47:35,682 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-07 00:47:35,682 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-08-07 00:47:35,682 [ scc.git] DEBUG Calling 'git remote'
2025-08-07 00:47:35,684 [ 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 9b62324] 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 eafe04b] 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-07 00:48:24,435 [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-07 00:48:34,210 [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-07 00:48:36,793 [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-07 00:48:41,677 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-08-07 00:49:22,184 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/9161e9ff/images/svgs/logo.svg){kind=logo}
