Skipping 224 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-04-26 01:08:06,759 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-26 01:08:06,763 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f857f0a88d0> has no local changes
2025-04-26 01:08:06,763 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
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'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#400 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/)'
2025-04-26 01:08:06,771 [ scc.git] DEBUG [detached HEAD fff3447] merge master -Dorg -Ssuccess-only
2025-04-26 01:08:06,771 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:08:06,771 [ scc.repo] DEBUG ## PRs found:
2025-04-26 01:08:06,931 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:07,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-04-26 01:08:07,438 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:07,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-04-26 01:08:07,932 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:08,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-26 01:08:08,457 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:08,658 [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-04-26 01:08:08,909 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:09,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-26 01:08:09,456 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:09,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-04-26 01:08:09,627 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-26 01:08:09,878 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:10,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-04-26 01:08:10,361 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:10,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-04-26 01:08:10,902 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:11,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-26 01:08:11,400 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:11,646 [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-04-26 01:08:11,898 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:12,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-26 01:08:12,362 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:12,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-04-26 01:08:12,580 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-04-26 01:08:12,580 [ scc.repo] DEBUG ## Branches found:
2025-04-26 01:08:12,580 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-26 01:08:12,580 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:12,580 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:12,583 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-26 01:08:12,585 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-26 01:08:12,585 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-26 01:08:12,588 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-26 01:08:12,591 [ scc.git] DEBUG Already up to date.
2025-04-26 01:08:12,591 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-04-26 01:08:12,884 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-26 01:08:12,884 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-04-26 01:08:12,888 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-04-26 01:08:13,187 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-26 01:08:13,187 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-04-26 01:08:13,191 [ scc.git] DEBUG ## Unique users: []
2025-04-26 01:08:13,191 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:13,191 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:13,194 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-26 01:08:13,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:13,200 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-26 01:08:13,209 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-26 01:08:13,213 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-04-26 01:08:13,213 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-04-26 01:08:13,213 [ scc.git] DEBUG requirements.txt | 2 +-
2025-04-26 01:08:13,213 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-04-26 01:08:13,213 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-04-26 01:08:13,213 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-04-26 01:08:13,214 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:13,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:08:13,366 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-26 01:08:13,370 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:13,373 [ 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-04-26 01:08:13,382 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-26 01:08:13,385 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-26 01:08:13,385 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-26 01:08:13,617 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:13,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:08:13,781 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-26 01:08:13,820 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:13,820 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:13,822 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-26 01:08:13,859 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-26 01:08:13,863 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f857f041390> has no local changes
2025-04-26 01:08:13,863 [ 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#400 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/)'
2025-04-26 01:08:13,870 [ scc.git] DEBUG [detached HEAD ad56fe3] merge master -Dorg -Ssuccess-only
2025-04-26 01:08:13,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:08:13,871 [ scc.repo] DEBUG ## PRs found:
2025-04-26 01:08:14,032 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:14,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-04-26 01:08:14,598 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:14,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-04-26 01:08:15,091 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:15,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-04-26 01:08:15,594 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:15,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-26 01:08:16,185 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:16,403 [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-04-26 01:08:16,655 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:16,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-26 01:08:17,170 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:17,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-04-26 01:08:17,343 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-26 01:08:17,594 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:17,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-04-26 01:08:18,076 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:18,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-04-26 01:08:18,552 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:18,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-26 01:08:19,163 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:19,364 [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-04-26 01:08:19,616 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:19,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-26 01:08:20,085 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:20,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-04-26 01:08:20,278 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-26 01:08:20,278 [ scc.repo] DEBUG ## Branches found:
2025-04-26 01:08:20,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-26 01:08:20,278 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:20,279 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:20,281 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-26 01:08:20,284 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-26 01:08:20,284 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-26 01:08:20,287 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-26 01:08:20,294 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-04-26 01:08:20,529 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:20,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-04-26 01:08:20,961 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-04-26 01:08:21,236 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-26 01:08:21,236 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-04-26 01:08:21,240 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-04-26 01:08:21,553 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-26 01:08:21,553 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-04-26 01:08:21,557 [ scc.git] DEBUG ## Unique users: []
2025-04-26 01:08:21,557 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:21,557 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:21,560 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-26 01:08:21,564 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:21,566 [ 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-04-26 01:08:21,580 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-04-26 01:08:21,580 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-04-26 01:08:21,580 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-26 01:08:21,580 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-26 01:08:21,580 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-26 01:08:21,581 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-26 01:08:21,583 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-26 01:08:21,588 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-26 01:08:21,589 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:21,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:08:21,746 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-26 01:08:21,751 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-26 01:08:21,754 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#400](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-04-26 01:08:21,756 [ scc.config] DEBUG Found github.token
2025-04-26 01:08:21,756 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-04-26 01:08:21,756 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-26 01:08:21,760 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:21,763 [ 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-04-26 01:08:21,777 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-26 01:08:21,778 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-26 01:08:21,778 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-04-26 01:08:21,778 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-26 01:08:21,778 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-26 01:08:21,781 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-26 01:08:21,787 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-26 01:08:21,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:22,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:08:22,167 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-26 01:08:22,172 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-26 01:08:22,175 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#400](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/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-04-26 01:08:22,177 [ scc.config] DEBUG Found github.token
2025-04-26 01:08:22,177 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-04-26 01:08:22,177 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-26 01:08:22,215 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:22,215 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:22,217 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-26 01:08:22,253 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-26 01:08:22,257 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f857f0d5050> has no local changes
2025-04-26 01:08:22,257 [ 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#400 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/)'
2025-04-26 01:08:22,263 [ scc.git] DEBUG [detached HEAD 8e6399b] merge master -Dorg -Ssuccess-only
2025-04-26 01:08:22,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:08:22,264 [ scc.repo] DEBUG ## PRs found:
2025-04-26 01:08:22,419 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:22,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-04-26 01:08:22,999 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:23,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-04-26 01:08:23,462 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:23,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-26 01:08:24,021 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:24,277 [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-04-26 01:08:24,529 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:24,798 [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-04-26 01:08:25,049 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:25,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-26 01:08:25,587 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:25,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-04-26 01:08:25,779 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-26 01:08:26,031 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:26,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-04-26 01:08:26,273 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-26 01:08:26,524 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:26,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-26 01:08:27,090 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:27,323 [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-04-26 01:08:27,575 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:27,823 [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-04-26 01:08:28,075 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:28,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-26 01:08:28,635 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:28,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-04-26 01:08:28,809 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-26 01:08:29,060 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:29,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-04-26 01:08:29,291 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-26 01:08:29,542 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:29,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-26 01:08:30,112 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:30,374 [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-04-26 01:08:30,626 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:30,895 [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-04-26 01:08:31,146 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:31,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-26 01:08:31,636 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:31,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-04-26 01:08:31,820 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-26 01:08:32,071 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:32,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-04-26 01:08:32,573 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:32,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-04-26 01:08:33,097 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:33,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-04-26 01:08:33,555 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:33,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-04-26 01:08:34,041 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:34,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-04-26 01:08:34,584 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:34,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-04-26 01:08:35,064 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:35,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-04-26 01:08:35,426 [ scc.repo] DEBUG ## Branches found:
2025-04-26 01:08:35,426 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-26 01:08:35,426 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:35,427 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:35,429 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-26 01:08:35,432 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-26 01:08:35,432 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-26 01:08:35,435 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-26 01:08:35,438 [ scc.git] DEBUG Already up to date.
2025-04-26 01:08:35,438 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-04-26 01:08:35,713 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-26 01:08:35,713 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-04-26 01:08:35,717 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-04-26 01:08:36,012 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-26 01:08:36,012 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-04-26 01:08:36,016 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-04-26 01:08:36,272 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-26 01:08:36,272 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-04-26 01:08:36,277 [ scc.git] DEBUG ## Unique users: []
2025-04-26 01:08:36,277 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:36,277 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:36,279 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-26 01:08:36,282 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:36,284 [ 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-04-26 01:08:36,292 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-26 01:08:36,296 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-04-26 01:08:36,296 [ scc.git] DEBUG package.json | 2 +-
2025-04-26 01:08:36,296 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-04-26 01:08:36,297 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:36,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:08:36,455 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-04-26 01:08:36,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:36,460 [ 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-04-26 01:08:36,470 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-26 01:08:36,470 [ scc.git] DEBUG Auto-merging package.json
2025-04-26 01:08:36,471 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-26 01:08:36,475 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-04-26 01:08:36,475 [ scc.git] DEBUG package.json | 2 +-
2025-04-26 01:08:36,475 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-04-26 01:08:36,706 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:36,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:08:36,879 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-26 01:08:36,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:36,884 [ 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-04-26 01:08:36,893 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-26 01:08:36,896 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-26 01:08:36,896 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-26 01:08:37,130 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:37,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:08:37,289 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-26 01:08:37,327 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:37,328 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:37,330 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-26 01:08:37,366 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-26 01:08:37,370 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f857f11db90> has no local changes
2025-04-26 01:08:37,370 [ 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#400 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/)'
2025-04-26 01:08:37,376 [ scc.git] DEBUG [detached HEAD 967d6d0] merge master -Dorg -Ssuccess-only
2025-04-26 01:08:37,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:08:37,377 [ scc.repo] DEBUG ## PRs found:
2025-04-26 01:08:37,540 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:37,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-04-26 01:08:37,722 [ scc.repo] DEBUG ## Branches found:
2025-04-26 01:08:37,722 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-26 01:08:37,722 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:37,722 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:37,724 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-26 01:08:37,726 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-26 01:08:37,727 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-26 01:08:37,730 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-26 01:08:37,732 [ scc.git] DEBUG Already up to date.
2025-04-26 01:08:37,732 [ scc.git] DEBUG ## Unique users: []
2025-04-26 01:08:37,732 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:37,733 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:37,735 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-26 01:08:37,772 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:37,772 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:37,774 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-26 01:08:37,810 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-26 01:08:37,813 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f857f308750> has no local changes
2025-04-26 01:08:37,813 [ 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#400 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/)'
2025-04-26 01:08:37,880 [ scc.git] DEBUG [detached HEAD b5b3d46] merge master -Dorg -Ssuccess-only
2025-04-26 01:08:37,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:08:37,880 [ scc.repo] DEBUG ## PRs found:
2025-04-26 01:08:37,973 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:38,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-04-26 01:08:38,524 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:38,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-04-26 01:08:39,007 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:39,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-04-26 01:08:39,494 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:39,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-04-26 01:08:39,704 [ scc.repo] DEBUG ## Branches found:
2025-04-26 01:08:39,704 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-26 01:08:39,704 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:39,704 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:39,707 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-26 01:08:39,709 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-26 01:08:39,709 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-26 01:08:39,712 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-26 01:08:39,715 [ scc.git] DEBUG Already up to date.
2025-04-26 01:08:39,715 [ scc.git] DEBUG ## Unique users: []
2025-04-26 01:08:39,716 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:39,716 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:39,718 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-26 01:08:39,756 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:39,756 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:39,758 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-26 01:08:39,794 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-26 01:08:39,798 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8580d4f6d0> has no local changes
2025-04-26 01:08:39,798 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Generated by OMERO-plugins-push#400 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/)'
2025-04-26 01:08:39,804 [ scc.git] DEBUG [detached HEAD b76e3fe] merge master -Dorg -Ssuccess-only
2025-04-26 01:08:39,804 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:08:39,804 [ scc.repo] DEBUG ## PRs found:
2025-04-26 01:08:39,955 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:40,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-04-26 01:08:40,474 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:40,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-04-26 01:08:40,948 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:41,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-04-26 01:08:41,434 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:41,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-26 01:08:42,004 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:42,246 [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-04-26 01:08:42,497 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:42,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-26 01:08:43,033 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:43,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-04-26 01:08:43,218 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-26 01:08:43,218 [ scc.repo] DEBUG ## Branches found:
2025-04-26 01:08:43,219 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-26 01:08:43,219 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:43,219 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:43,221 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-26 01:08:43,224 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-26 01:08:43,224 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-26 01:08:43,227 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-26 01:08:43,230 [ scc.git] DEBUG Already up to date.
2025-04-26 01:08:43,230 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-04-26 01:08:43,523 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-04-26 01:08:43,523 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-04-26 01:08:43,527 [ scc.git] DEBUG ## Unique users: []
2025-04-26 01:08:43,528 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:43,528 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:43,530 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-26 01:08:43,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:43,535 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-26 01:08:43,544 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-04-26 01:08:43,544 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-04-26 01:08:43,544 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-04-26 01:08:43,544 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-04-26 01:08:43,544 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-04-26 01:08:43,544 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-04-26 01:08:43,544 [ scc.git] DEBUG Auto-merging setup.py
2025-04-26 01:08:43,544 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-04-26 01:08:43,545 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-26 01:08:43,545 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-26 01:08:43,547 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-26 01:08:43,552 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-04-26 01:08:43,553 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:43,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:08:43,719 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-26 01:08:43,722 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-26 01:08:43,725 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#400](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
- omero_signup/urls.py
--conflicts
2025-04-26 01:08:43,727 [ scc.config] DEBUG Found github.token
2025-04-26 01:08:43,727 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-04-26 01:08:43,727 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-26 01:08:43,765 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:43,766 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:43,768 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-26 01:08:43,805 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-26 01:08:43,808 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f857f07eed0> has no local changes
2025-04-26 01:08:43,809 [ 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#400 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/)'
2025-04-26 01:08:43,815 [ scc.git] DEBUG [detached HEAD b46018d] merge master -Dorg -Ssuccess-only
2025-04-26 01:08:43,815 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:08:43,815 [ scc.repo] DEBUG ## PRs found:
2025-04-26 01:08:43,970 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:44,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-04-26 01:08:44,577 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:44,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-04-26 01:08:45,063 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:45,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-04-26 01:08:45,661 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:45,977 [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-04-26 01:08:46,229 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:46,471 [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-04-26 01:08:46,722 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:47,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-04-26 01:08:47,311 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:47,488 [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-04-26 01:08:47,488 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-04-26 01:08:47,739 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:47,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-04-26 01:08:48,247 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:48,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-04-26 01:08:48,734 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:48,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-04-26 01:08:49,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:49,496 [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-04-26 01:08:49,748 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:50,017 [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-04-26 01:08:50,269 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:50,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-04-26 01:08:50,787 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:50,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-04-26 01:08:51,250 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:51,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-04-26 01:08:51,758 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:51,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-04-26 01:08:52,214 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:52,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-26 01:08:52,880 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:53,078 [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-04-26 01:08:53,329 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:53,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-26 01:08:53,872 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:54,061 [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-04-26 01:08:54,061 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-26 01:08:54,062 [ scc.repo] DEBUG ## Branches found:
2025-04-26 01:08:54,062 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-26 01:08:54,062 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:54,062 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:54,065 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-26 01:08:54,067 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-26 01:08:54,067 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-26 01:08:54,070 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-26 01:08:54,073 [ scc.git] DEBUG Already up to date.
2025-04-26 01:08:54,074 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-04-26 01:08:54,371 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-26 01:08:54,371 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-04-26 01:08:54,376 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-04-26 01:08:54,671 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-26 01:08:54,671 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-04-26 01:08:54,675 [ scc.git] DEBUG ## Unique users: []
2025-04-26 01:08:54,675 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:54,675 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:54,678 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-04-26 01:08:54,682 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:54,684 [ 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-04-26 01:08:54,697 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-26 01:08:54,700 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-04-26 01:08:54,701 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-04-26 01:08:54,701 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-04-26 01:08:54,701 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-04-26 01:08:54,701 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-04-26 01:08:54,701 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-04-26 01:08:54,701 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-04-26 01:08:54,701 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-04-26 01:08:54,702 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:54,702 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-04-26 01:08:54,702 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-04-26 01:08:54,702 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-04-26 01:08:54,702 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-04-26 01:08:54,702 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-04-26 01:08:54,702 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-04-26 01:08:54,702 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-04-26 01:08:54,702 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-04-26 01:08:54,702 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-04-26 01:08:54,702 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-04-26 01:08:54,702 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-04-26 01:08:54,702 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-04-26 01:08:54,702 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-04-26 01:08:54,702 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-04-26 01:08:54,702 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-04-26 01:08:54,702 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-04-26 01:08:54,702 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-04-26 01:08:54,702 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-04-26 01:08:54,702 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-04-26 01:08:54,702 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-04-26 01:08:54,702 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-04-26 01:08:54,703 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-04-26 01:08:54,703 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-04-26 01:08:54,703 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-04-26 01:08:54,703 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-04-26 01:08:54,703 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-04-26 01:08:54,703 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-04-26 01:08:54,703 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-04-26 01:08:54,703 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-04-26 01:08:54,703 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-04-26 01:08:54,703 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-04-26 01:08:54,703 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-04-26 01:08:54,703 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-04-26 01:08:54,703 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-04-26 01:08:54,703 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-04-26 01:08:54,703 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-04-26 01:08:54,703 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-04-26 01:08:54,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:08:54,863 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-04-26 01:08:54,867 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:54,869 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-04-26 01:08:54,879 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-26 01:08:54,882 [ scc.git] DEBUG docker | 1 +
2025-04-26 01:08:54,882 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-04-26 01:08:55,114 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:55,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:08:55,271 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-26 01:08:55,309 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:55,309 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:55,312 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-26 01:08:55,348 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-26 01:08:55,352 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f857f140750> has no local changes
2025-04-26 01:08:55,352 [ 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#400 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/)'
2025-04-26 01:08:55,358 [ scc.git] DEBUG [detached HEAD f8fc7cc] merge master -Dorg -Ssuccess-only
2025-04-26 01:08:55,359 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:08:55,359 [ scc.repo] DEBUG ## PRs found:
2025-04-26 01:08:55,522 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:55,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-04-26 01:08:55,709 [ scc.repo] DEBUG ## Branches found:
2025-04-26 01:08:55,709 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-26 01:08:55,709 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:55,709 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:55,711 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-26 01:08:55,713 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-26 01:08:55,713 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-26 01:08:55,716 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-26 01:08:55,719 [ scc.git] DEBUG Already up to date.
2025-04-26 01:08:55,719 [ scc.git] DEBUG ## Unique users: []
2025-04-26 01:08:55,719 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:55,719 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:55,721 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-26 01:08:55,761 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:55,761 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:55,763 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-26 01:08:55,799 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-26 01:08:55,802 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8567f6b250> has no local changes
2025-04-26 01:08:55,803 [ 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#400 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/)'
2025-04-26 01:08:55,809 [ scc.git] DEBUG [detached HEAD a7fae1b] merge master -Dorg -Ssuccess-only
2025-04-26 01:08:55,809 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:08:55,809 [ scc.repo] DEBUG ## PRs found:
2025-04-26 01:08:55,960 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:56,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-04-26 01:08:56,472 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:56,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-04-26 01:08:56,956 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:57,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-04-26 01:08:57,444 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:57,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-26 01:08:57,982 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:58,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-26 01:08:58,468 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:58,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-26 01:08:58,960 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:59,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-26 01:08:59,505 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:08:59,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-04-26 01:08:59,714 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-04-26 01:08:59,714 [ scc.repo] DEBUG ## Branches found:
2025-04-26 01:08:59,714 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-26 01:08:59,714 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:59,714 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:59,716 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-26 01:08:59,719 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-26 01:08:59,719 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-26 01:08:59,722 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-26 01:08:59,725 [ scc.git] DEBUG Already up to date.
2025-04-26 01:08:59,725 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-04-26 01:08:59,988 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-04-26 01:08:59,988 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-04-26 01:08:59,992 [ scc.git] DEBUG ## Unique users: []
2025-04-26 01:08:59,992 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:08:59,992 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:59,994 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-04-26 01:08:59,997 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:08:59,999 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-04-26 01:09:00,008 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-26 01:09:00,010 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-04-26 01:09:00,011 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-04-26 01:09:00,011 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-04-26 01:09:00,011 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-04-26 01:09:00,011 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-04-26 01:09:00,012 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:00,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:00,170 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-26 01:09:00,208 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:09:00,208 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:09:00,210 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-26 01:09:00,247 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-26 01:09:00,250 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f857f142810> has no local changes
2025-04-26 01:09:00,250 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Generated by OMERO-plugins-push#400 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/)'
2025-04-26 01:09:00,257 [ scc.git] DEBUG [detached HEAD 26ab2ad] merge master -Dorg -Ssuccess-only
2025-04-26 01:09:00,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:00,257 [ scc.git] INFO Overriding base-branch from master to main
2025-04-26 01:09:00,257 [ scc.repo] DEBUG ## PRs found:
2025-04-26 01:09:00,421 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:00,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-04-26 01:09:00,965 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:01,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-04-26 01:09:01,465 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:01,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-04-26 01:09:01,970 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:02,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-04-26 01:09:02,535 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:02,758 [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-04-26 01:09:03,010 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:03,225 [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-04-26 01:09:03,476 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:03,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-04-26 01:09:03,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:04,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-04-26 01:09:04,428 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:04,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-04-26 01:09:04,914 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:05,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-26 01:09:05,450 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:05,670 [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-04-26 01:09:05,922 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:06,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-26 01:09:06,376 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:06,559 [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-04-26 01:09:06,560 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-26 01:09:06,560 [ scc.repo] DEBUG ## Branches found:
2025-04-26 01:09:06,560 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-26 01:09:06,560 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:09:06,560 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:09:06,563 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-04-26 01:09:06,565 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-26 01:09:06,565 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-04-26 01:09:06,568 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-04-26 01:09:06,571 [ scc.git] DEBUG Already up to date.
2025-04-26 01:09:06,572 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-04-26 01:09:06,865 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-04-26 01:09:06,865 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-04-26 01:09:06,869 [ scc.git] DEBUG ## Unique users: []
2025-04-26 01:09:06,869 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:09:06,869 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:09:06,871 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-26 01:09:06,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:09:06,877 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-26 01:09:06,884 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-04-26 01:09:06,884 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-04-26 01:09:06,885 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-26 01:09:06,885 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-26 01:09:06,888 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-26 01:09:06,892 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-04-26 01:09:06,893 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:07,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:07,054 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-26 01:09:07,057 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-26 01:09:07,060 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#400](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-04-26 01:09:07,062 [ scc.config] DEBUG Found github.token
2025-04-26 01:09:07,062 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-04-26 01:09:07,063 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-26 01:09:07,101 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:09:07,101 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:09:07,103 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-26 01:09:07,140 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-26 01:09:07,143 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8567f3e110> has no local changes
2025-04-26 01:09:07,143 [ 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#400 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/)'
2025-04-26 01:09:07,149 [ scc.git] DEBUG [detached HEAD 6ecbbb8] merge master -Dorg -Ssuccess-only
2025-04-26 01:09:07,150 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:07,150 [ scc.repo] DEBUG ## PRs found:
2025-04-26 01:09:07,305 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:07,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-04-26 01:09:07,499 [ scc.repo] DEBUG ## Branches found:
2025-04-26 01:09:07,499 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-26 01:09:07,499 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:09:07,499 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:09:07,501 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-26 01:09:07,503 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-26 01:09:07,503 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-26 01:09:07,506 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-26 01:09:07,509 [ scc.git] DEBUG Already up to date.
2025-04-26 01:09:07,509 [ scc.git] DEBUG ## Unique users: []
2025-04-26 01:09:07,509 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:09:07,509 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:09:07,512 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-26 01:09:07,549 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:09:07,549 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:09:07,551 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-26 01:09:07,589 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-26 01:09:07,592 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8567f7f090> has no local changes
2025-04-26 01:09:07,592 [ 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#400 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/)'
2025-04-26 01:09:07,599 [ scc.git] DEBUG [detached HEAD 20702bc] merge master -Dorg -Ssuccess-only
2025-04-26 01:09:07,599 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:07,599 [ scc.repo] DEBUG ## PRs found:
2025-04-26 01:09:07,750 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:07,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-04-26 01:09:07,972 [ scc.repo] DEBUG ## Branches found:
2025-04-26 01:09:07,972 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-26 01:09:07,972 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:09:07,973 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:09:07,975 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-26 01:09:07,977 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-26 01:09:07,977 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-26 01:09:07,980 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-26 01:09:07,983 [ scc.git] DEBUG Already up to date.
2025-04-26 01:09:07,983 [ scc.git] DEBUG ## Unique users: []
2025-04-26 01:09:07,983 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:09:07,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:09:07,985 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-26 01:09:08,024 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:09:08,024 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:09:08,026 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-26 01:09:08,062 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-26 01:09:08,065 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8567fc6910> has no local changes
2025-04-26 01:09:08,066 [ 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#400 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/)'
2025-04-26 01:09:08,072 [ scc.git] DEBUG [detached HEAD 5ab4671] merge master -Dorg -Ssuccess-only
2025-04-26 01:09:08,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:08,072 [ scc.repo] DEBUG ## PRs found:
2025-04-26 01:09:08,223 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:08,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-04-26 01:09:08,750 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:08,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-04-26 01:09:09,237 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:09,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-04-26 01:09:09,721 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:10,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-26 01:09:10,261 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:10,495 [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-04-26 01:09:10,746 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:10,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-26 01:09:11,218 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:11,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-04-26 01:09:11,397 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-04-26 01:09:11,397 [ scc.repo] DEBUG ## Branches found:
2025-04-26 01:09:11,397 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-26 01:09:11,398 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:09:11,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:09:11,400 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-26 01:09:11,403 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-26 01:09:11,403 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-26 01:09:11,405 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-26 01:09:11,408 [ scc.git] DEBUG Already up to date.
2025-04-26 01:09:11,409 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-04-26 01:09:11,697 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-04-26 01:09:11,697 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-04-26 01:09:11,701 [ scc.git] DEBUG ## Unique users: []
2025-04-26 01:09:11,701 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:09:11,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:09:11,703 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-26 01:09:11,706 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:09:11,709 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-26 01:09:11,718 [ scc.git] DEBUG Auto-merging Dockerfile
2025-04-26 01:09:11,718 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-04-26 01:09:11,718 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-26 01:09:11,718 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-26 01:09:11,721 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-26 01:09:11,726 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-04-26 01:09:11,727 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:11,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:11,900 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-26 01:09:11,903 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-26 01:09:11,905 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#400](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-04-26 01:09:11,907 [ scc.config] DEBUG Found github.token
2025-04-26 01:09:11,907 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-04-26 01:09:11,908 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-26 01:09:11,945 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:09:11,945 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:09:11,947 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-26 01:09:11,983 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-26 01:09:11,987 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f857f1fc590> has no local changes
2025-04-26 01:09:11,987 [ 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#400 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/)'
2025-04-26 01:09:11,994 [ scc.git] DEBUG [detached HEAD c230ccf] merge master -Dorg -Ssuccess-only
2025-04-26 01:09:11,995 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:11,995 [ scc.git] INFO Overriding base-branch from master to develop
2025-04-26 01:09:11,995 [ scc.repo] DEBUG ## PRs found:
2025-04-26 01:09:12,151 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:12,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-04-26 01:09:12,725 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:12,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-04-26 01:09:13,244 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:13,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-04-26 01:09:13,699 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:13,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-26 01:09:14,153 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:14,407 [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-04-26 01:09:14,659 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:14,915 [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-04-26 01:09:15,166 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:15,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-26 01:09:15,643 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:15,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-04-26 01:09:15,827 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-26 01:09:16,078 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:16,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-04-26 01:09:16,548 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:16,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-04-26 01:09:17,010 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:17,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-26 01:09:17,476 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:17,680 [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-04-26 01:09:17,931 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:18,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-26 01:09:18,415 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:18,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-04-26 01:09:18,590 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-26 01:09:18,841 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:19,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-04-26 01:09:19,355 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:19,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-04-26 01:09:19,904 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:20,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-04-26 01:09:20,386 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:20,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-04-26 01:09:20,678 [ scc.repo] DEBUG ## Branches found:
2025-04-26 01:09:20,678 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-26 01:09:20,679 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:09:20,679 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:09:20,681 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-04-26 01:09:20,684 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-26 01:09:20,684 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-04-26 01:09:20,687 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-04-26 01:09:20,695 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-04-26 01:09:20,928 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:21,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-04-26 01:09:21,380 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-04-26 01:09:21,691 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-26 01:09:21,691 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-04-26 01:09:21,695 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-04-26 01:09:21,989 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-26 01:09:21,989 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-04-26 01:09:21,994 [ scc.git] DEBUG ## Unique users: []
2025-04-26 01:09:21,994 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:09:21,994 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:09:21,996 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-26 01:09:22,002 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:09:22,004 [ 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-04-26 01:09:22,015 [ 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-04-26 01:09:22,015 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-26 01:09:22,015 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-26 01:09:22,018 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-26 01:09:22,022 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-04-26 01:09:22,023 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:22,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:22,179 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-26 01:09:22,185 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-26 01:09:22,188 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#400](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-04-26 01:09:22,191 [ scc.config] DEBUG Found github.token
2025-04-26 01:09:22,191 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-04-26 01:09:22,191 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-26 01:09:22,195 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:09:22,198 [ 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-04-26 01:09:22,207 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-26 01:09:22,210 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-04-26 01:09:22,210 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-04-26 01:09:22,430 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:22,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:22,605 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-26 01:09:22,643 [ scc.git] DEBUG Get sha1 of %s
2025-04-26 01:09:22,643 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-26 01:09:22,645 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-26 01:09:22,683 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-26 01:09:22,687 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f857f0c5950> has no local changes
2025-04-26 01:09:22,687 [ 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..950b28b
Previously merged:
- 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#400 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/)'
2025-04-26 01:09:22,693 [ scc.git] DEBUG [detached HEAD 2990fe0] merge master -Dorg -Ssuccess-only
2025-04-26 01:09:22,694 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:22,694 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-26 01:09:22,770 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-04-26 01:09:22,855 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:23,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:23,048 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-04-26 01:09:23,050 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-04-26 01:09:23,294 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:23,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:23,456 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-04-26 01:09:23,458 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-04-26 01:09:23,702 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:23,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:23,887 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-04-26 01:09:23,889 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-04-26 01:09:24,133 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:24,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:24,297 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-04-26 01:09:24,541 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:24,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:24,722 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-04-26 01:09:24,724 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-04-26 01:09:24,968 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:25,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:25,162 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-04-26 01:09:25,164 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-04-26 01:09:25,409 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:25,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:25,574 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-04-26 01:09:25,576 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-04-26 01:09:25,821 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:25,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:25,981 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-04-26 01:09:25,983 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-04-26 01:09:26,227 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:26,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:26,413 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-04-26 01:09:26,415 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-04-26 01:09:26,659 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:26,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:26,819 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-04-26 01:09:26,821 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-04-26 01:09:27,065 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:27,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:27,235 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-04-26 01:09:27,237 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-04-26 01:09:27,481 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:27,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:27,677 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-04-26 01:09:27,679 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-04-26 01:09:27,924 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:28,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:28,099 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-04-26 01:09:28,344 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:28,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:28,516 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-04-26 01:09:28,761 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:28,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:28,929 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-04-26 01:09:28,931 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-04-26 01:09:29,175 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:29,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:29,346 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-04-26 01:09:29,591 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:29,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:29,752 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-04-26 01:09:29,996 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:30,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:30,163 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-04-26 01:09:30,165 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-04-26 01:09:30,410 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:30,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:30,583 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-04-26 01:09:30,585 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-04-26 01:09:30,829 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:30,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:30,989 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-04-26 01:09:30,991 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-04-26 01:09:31,236 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:31,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:31,404 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-04-26 01:09:31,406 [ scc.config] DEBUG Found submodule.scripts.url
2025-04-26 01:09:31,651 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-26 01:09:31,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-26 01:09:31,813 [ scc.config] DEBUG Found submodule.scripts.branch
2025-04-26 01:09:31,813 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-26 01:09:31,900 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f857f11f090> has local changes
2025-04-26 01:09:31,901 [ 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'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 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..5b2ca82
Previously merged:
- 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 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 167 dominikl 'Add extinfo command'
Repository: ome/omero-figure
Excluded PRs:
- PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
- PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..4f0362e2
Previously merged:
- 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 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
- PR 635 dependabot[bot] 'Bump esbuild and vite'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
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'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
- PR 76 will-moore 'Run cli deps'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- 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..950b28b
Previously merged:
- 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#400 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/400/)'
2025-04-26 01:09:31,914 [ scc.git] DEBUG [detached HEAD e81bb19] merge master -Dorg -Ssuccess-only
2025-04-26 01:09:31,914 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-04-26 01:09:31,914 [ scc.merge] INFO Repository: ome/omero-plugins
2025-04-26 01:09:31,914 [ scc.merge] INFO Already up to date.
2025-04-26 01:09:31,914 [ scc.merge] INFO
2025-04-26 01:09:31,914 [ scc.merge] INFO Merged PRs:
2025-04-26 01:09:31,914 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-04-26 01:09:31,914 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-04-26 01:09:31,914 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-04-26 01:09:31,915 [ scc.merge] INFO
2025-04-26 01:09:31,915 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-04-26 01:09:31,915 [ scc.merge] INFO Already up to date.
2025-04-26 01:09:31,915 [ scc.merge] INFO
2025-04-26 01:09:31,915 [ scc.merge] INFO
2025-04-26 01:09:31,915 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-04-26 01:09:31,915 [ scc.merge] INFO Excluded PRs:
2025-04-26 01:09:31,915 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-04-26 01:09:31,915 [ scc.merge] INFO Already up to date.
2025-04-26 01:09:31,915 [ scc.merge] INFO
2025-04-26 01:09:31,915 [ scc.merge] INFO
2025-04-26 01:09:31,915 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-04-26 01:09:31,915 [ scc.merge] INFO Excluded PRs:
2025-04-26 01:09:31,915 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-04-26 01:09:31,915 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-04-26 01:09:31,915 [ scc.merge] INFO Already up to date.
2025-04-26 01:09:31,915 [ scc.merge] INFO
2025-04-26 01:09:31,915 [ scc.merge] INFO Merged PRs:
2025-04-26 01:09:31,915 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-04-26 01:09:31,915 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-04-26 01:09:31,915 [ scc.merge] INFO
2025-04-26 01:09:31,915 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-04-26 01:09:31,915 [ scc.merge] INFO Excluded PRs:
2025-04-26 01:09:31,915 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-04-26 01:09:31,915 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-04-26 01:09:31,915 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-04-26 01:09:31,915 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-26 01:09:31,915 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-04-26 01:09:31,915 [ scc.merge] INFO Updating 11d3587..5b2ca82
2025-04-26 01:09:31,915 [ scc.merge] INFO Previously merged:
2025-04-26 01:09:31,915 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-04-26 01:09:31,915 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-26 01:09:31,915 [ scc.merge] INFO
2025-04-26 01:09:31,915 [ scc.merge] INFO Merged PRs:
2025-04-26 01:09:31,915 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-04-26 01:09:31,916 [ scc.merge] INFO
2025-04-26 01:09:31,916 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-26 01:09:31,916 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-04-26 01:09:31,916 [ scc.merge] INFO
2025-04-26 01:09:31,916 [ scc.merge] INFO Repository: ome/omero-figure
2025-04-26 01:09:31,916 [ scc.merge] INFO Excluded PRs:
2025-04-26 01:09:31,916 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-04-26 01:09:31,916 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-04-26 01:09:31,916 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-04-26 01:09:31,916 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-04-26 01:09:31,916 [ scc.merge] INFO Updating 9cc36cde..4f0362e2
2025-04-26 01:09:31,916 [ scc.merge] INFO Previously merged:
2025-04-26 01:09:31,916 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-26 01:09:31,916 [ scc.merge] INFO
2025-04-26 01:09:31,916 [ scc.merge] INFO Merged PRs:
2025-04-26 01:09:31,916 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-04-26 01:09:31,916 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-04-26 01:09:31,916 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-04-26 01:09:31,916 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-04-26 01:09:31,916 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-04-26 01:09:31,916 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-04-26 01:09:31,916 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-04-26 01:09:31,916 [ scc.merge] INFO
2025-04-26 01:09:31,916 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-26 01:09:31,916 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-04-26 01:09:31,916 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-04-26 01:09:31,916 [ scc.merge] INFO
2025-04-26 01:09:31,916 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-04-26 01:09:31,916 [ scc.merge] INFO Already up to date.
2025-04-26 01:09:31,916 [ scc.merge] INFO
2025-04-26 01:09:31,916 [ scc.merge] INFO Merged PRs:
2025-04-26 01:09:31,916 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-04-26 01:09:31,916 [ scc.merge] INFO
2025-04-26 01:09:31,916 [ scc.merge] INFO Repository: ome/omero-gallery
2025-04-26 01:09:31,916 [ scc.merge] INFO Already up to date.
2025-04-26 01:09:31,916 [ scc.merge] INFO
2025-04-26 01:09:31,916 [ scc.merge] INFO Merged PRs:
2025-04-26 01:09:31,917 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-04-26 01:09:31,917 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-04-26 01:09:31,917 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-04-26 01:09:31,917 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-04-26 01:09:31,917 [ scc.merge] INFO
2025-04-26 01:09:31,917 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-26 01:09:31,917 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-04-26 01:09:31,917 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-04-26 01:09:31,917 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-04-26 01:09:31,917 [ scc.merge] INFO
2025-04-26 01:09:31,917 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-04-26 01:09:31,917 [ scc.merge] INFO Excluded PRs:
2025-04-26 01:09:31,917 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-04-26 01:09:31,917 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-04-26 01:09:31,917 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-04-26 01:09:31,917 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-04-26 01:09:31,917 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-04-26 01:09:31,917 [ scc.merge] INFO Already up to date.
2025-04-26 01:09:31,917 [ scc.merge] INFO
2025-04-26 01:09:31,917 [ scc.merge] INFO Merged PRs:
2025-04-26 01:09:31,917 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-04-26 01:09:31,917 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-04-26 01:09:31,917 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-04-26 01:09:31,917 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-04-26 01:09:31,917 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-26 01:09:31,917 [ scc.merge] INFO
2025-04-26 01:09:31,917 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-26 01:09:31,917 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-04-26 01:09:31,917 [ scc.merge] INFO
2025-04-26 01:09:31,917 [ scc.merge] INFO Repository: ome/omero-mapr
2025-04-26 01:09:31,917 [ scc.merge] INFO Excluded PRs:
2025-04-26 01:09:31,917 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-04-26 01:09:31,917 [ scc.merge] INFO Already up to date.
2025-04-26 01:09:31,917 [ scc.merge] INFO
2025-04-26 01:09:31,917 [ scc.merge] INFO Merged PRs:
2025-04-26 01:09:31,917 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-04-26 01:09:31,918 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-26 01:09:31,918 [ scc.merge] INFO
2025-04-26 01:09:31,918 [ scc.merge] INFO Repository: ome/omero-metadata
2025-04-26 01:09:31,918 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-04-26 01:09:31,918 [ scc.merge] INFO Previously merged:
2025-04-26 01:09:31,918 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-26 01:09:31,918 [ scc.merge] INFO
2025-04-26 01:09:31,918 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-26 01:09:31,918 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-26 01:09:31,918 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-26 01:09:31,918 [ scc.merge] INFO
2025-04-26 01:09:31,918 [ scc.merge] INFO Repository: ome/omero-parade
2025-04-26 01:09:31,918 [ scc.merge] INFO Excluded PRs:
2025-04-26 01:09:31,918 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-04-26 01:09:31,918 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-04-26 01:09:31,918 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-04-26 01:09:31,918 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-04-26 01:09:31,918 [ scc.merge] INFO Already up to date.
2025-04-26 01:09:31,918 [ scc.merge] INFO
2025-04-26 01:09:31,918 [ scc.merge] INFO Merged PRs:
2025-04-26 01:09:31,918 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-26 01:09:31,918 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-26 01:09:31,918 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-26 01:09:31,918 [ scc.merge] INFO
2025-04-26 01:09:31,918 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-04-26 01:09:31,918 [ scc.merge] INFO Already up to date.
2025-04-26 01:09:31,918 [ scc.merge] INFO
2025-04-26 01:09:31,918 [ scc.merge] INFO
2025-04-26 01:09:31,918 [ scc.merge] INFO Repository: ome/omero-rois
2025-04-26 01:09:31,918 [ scc.merge] INFO Excluded PRs:
2025-04-26 01:09:31,918 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-04-26 01:09:31,918 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-26 01:09:31,918 [ scc.merge] INFO Already up to date.
2025-04-26 01:09:31,918 [ scc.merge] INFO
2025-04-26 01:09:31,918 [ scc.merge] INFO
2025-04-26 01:09:31,918 [ scc.merge] INFO Repository: ome/omero-signup
2025-04-26 01:09:31,918 [ scc.merge] INFO Already up to date.
2025-04-26 01:09:31,919 [ scc.merge] INFO
2025-04-26 01:09:31,919 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-26 01:09:31,919 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-26 01:09:31,919 [ scc.merge] INFO
2025-04-26 01:09:31,919 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-04-26 01:09:31,919 [ scc.merge] INFO Excluded PRs:
2025-04-26 01:09:31,919 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-04-26 01:09:31,919 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-04-26 01:09:31,919 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-04-26 01:09:31,919 [ scc.merge] INFO Already up to date.
2025-04-26 01:09:31,919 [ scc.merge] INFO
2025-04-26 01:09:31,919 [ scc.merge] INFO Merged PRs:
2025-04-26 01:09:31,919 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-26 01:09:31,919 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-04-26 01:09:31,919 [ scc.merge] INFO
2025-04-26 01:09:31,919 [ scc.merge] INFO Repository: ome/omero-upload
2025-04-26 01:09:31,919 [ scc.merge] INFO Already up to date.
2025-04-26 01:09:31,919 [ scc.merge] INFO
2025-04-26 01:09:31,919 [ scc.merge] INFO
2025-04-26 01:09:31,919 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-04-26 01:09:31,919 [ scc.merge] INFO Already up to date.
2025-04-26 01:09:31,919 [ scc.merge] INFO
2025-04-26 01:09:31,919 [ scc.merge] INFO Merged PRs:
2025-04-26 01:09:31,919 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-04-26 01:09:31,919 [ scc.merge] INFO
2025-04-26 01:09:31,919 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-04-26 01:09:31,919 [ scc.merge] INFO Excluded PRs:
2025-04-26 01:09:31,919 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-04-26 01:09:31,919 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-04-26 01:09:31,919 [ scc.merge] INFO Already up to date.
2025-04-26 01:09:31,919 [ scc.merge] INFO
2025-04-26 01:09:31,919 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-26 01:09:31,919 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-26 01:09:31,919 [ scc.merge] INFO
2025-04-26 01:09:31,919 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-04-26 01:09:31,919 [ scc.merge] INFO Already up to date.
2025-04-26 01:09:31,919 [ scc.merge] INFO
2025-04-26 01:09:31,920 [ scc.merge] INFO
2025-04-26 01:09:31,920 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-04-26 01:09:31,920 [ scc.merge] INFO Already up to date.
2025-04-26 01:09:31,920 [ scc.merge] INFO
2025-04-26 01:09:31,920 [ scc.merge] INFO
2025-04-26 01:09:31,920 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-04-26 01:09:31,920 [ scc.merge] INFO Already up to date.
2025-04-26 01:09:31,920 [ scc.merge] INFO
2025-04-26 01:09:31,920 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-26 01:09:31,920 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-04-26 01:09:31,920 [ scc.merge] INFO
2025-04-26 01:09:31,920 [ scc.merge] INFO Repository: ome/scripts
2025-04-26 01:09:31,920 [ scc.merge] INFO Excluded PRs:
2025-04-26 01:09:31,920 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-04-26 01:09:31,920 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-04-26 01:09:31,920 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-04-26 01:09:31,920 [ scc.merge] INFO Previously merged:
2025-04-26 01:09:31,920 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-04-26 01:09:31,920 [ scc.merge] INFO
2025-04-26 01:09:31,920 [ scc.merge] INFO Merged PRs:
2025-04-26 01:09:31,920 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-26 01:09:31,920 [ scc.merge] INFO
2025-04-26 01:09:31,920 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-26 01:09:31,920 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-26 01:09:31,920 [ scc.merge] INFO
2025-04-26 01:09:31,920 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-04-26 01:09:31,920 [ scc.git] DEBUG Calling 'git remote'
2025-04-26 01:09:31,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-04-26 01:09:31,923 [ scc.git] DEBUG Calling 'git remote'
2025-04-26 01:09:31,925 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:31,925 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-04-26 01:09:31,925 [ scc.git] DEBUG Calling 'git remote'
2025-04-26 01:09:31,927 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:31,927 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-04-26 01:09:31,927 [ scc.git] DEBUG Calling 'git remote'
2025-04-26 01:09:31,929 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:31,929 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-04-26 01:09:31,929 [ scc.git] DEBUG Calling 'git remote'
2025-04-26 01:09:31,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:31,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-04-26 01:09:31,931 [ scc.git] DEBUG Calling 'git remote'
2025-04-26 01:09:31,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:31,934 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-04-26 01:09:31,934 [ scc.git] DEBUG Calling 'git remote'
2025-04-26 01:09:31,936 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:31,936 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-04-26 01:09:31,936 [ scc.git] DEBUG Calling 'git remote'
2025-04-26 01:09:31,938 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:31,938 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-04-26 01:09:31,938 [ scc.git] DEBUG Calling 'git remote'
2025-04-26 01:09:31,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:31,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-26 01:09:31,940 [ scc.git] DEBUG Calling 'git remote'
2025-04-26 01:09:31,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:31,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-26 01:09:31,942 [ scc.git] DEBUG Calling 'git remote'
2025-04-26 01:09:31,944 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:31,945 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-26 01:09:31,945 [ scc.git] DEBUG Calling 'git remote'
2025-04-26 01:09:31,947 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:31,947 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-26 01:09:31,947 [ scc.git] DEBUG Calling 'git remote'
2025-04-26 01:09:31,949 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:31,949 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-26 01:09:31,949 [ scc.git] DEBUG Calling 'git remote'
2025-04-26 01:09:31,951 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:31,951 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-26 01:09:31,951 [ scc.git] DEBUG Calling 'git remote'
2025-04-26 01:09:31,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:31,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-26 01:09:31,953 [ scc.git] DEBUG Calling 'git remote'
2025-04-26 01:09:31,956 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:31,956 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-26 01:09:31,956 [ scc.git] DEBUG Calling 'git remote'
2025-04-26 01:09:31,958 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:31,958 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-26 01:09:31,958 [ scc.git] DEBUG Calling 'git remote'
2025-04-26 01:09:31,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:31,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-26 01:09:31,960 [ scc.git] DEBUG Calling 'git remote'
2025-04-26 01:09:31,962 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:31,962 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-26 01:09:31,962 [ scc.git] DEBUG Calling 'git remote'
2025-04-26 01:09:31,964 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:31,964 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-26 01:09:31,964 [ scc.git] DEBUG Calling 'git remote'
2025-04-26 01:09:31,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:31,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-26 01:09:31,966 [ scc.git] DEBUG Calling 'git remote'
2025-04-26 01:09:31,968 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-26 01:09:31,969 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-26 01:09:31,969 [ scc.git] DEBUG Calling 'git remote'
2025-04-26 01:09:31,971 [ 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.3-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 a11c4a3] 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 da0090f] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-04-26 01:10:19,976 [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-04-26 01:10:29,323 [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-04-26 01:10:32,219 [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-04-26 01:10:37,106 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-26 01:11:17,349 [ 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/9bac06d9/images/svgs/logo.svg){kind=logo}
