Skipping 219 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
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#427 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/)'
2025-05-18 00:57:58,683 [ scc.git] DEBUG [detached HEAD ce30bfb] merge master -Dorg -Ssuccess-only
2025-05-18 00:57:58,683 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:57:58,683 [ scc.repo] DEBUG ## PRs found:
2025-05-18 00:57:58,826 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:57:59,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-05-18 00:57:59,364 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:57:59,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-05-18 00:57:59,850 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:00,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-18 00:58:00,378 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:00,585 [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-05-18 00:58:00,837 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:01,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-18 00:58:01,361 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:01,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-05-18 00:58:01,532 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-18 00:58:01,783 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:02,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-05-18 00:58:02,276 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:02,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-05-18 00:58:02,856 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:03,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-18 00:58:03,374 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:03,603 [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-05-18 00:58:03,855 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:04,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-18 00:58:04,376 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:04,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-05-18 00:58:04,582 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-05-18 00:58:04,583 [ scc.repo] DEBUG ## Branches found:
2025-05-18 00:58:04,583 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-18 00:58:04,583 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:04,583 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:04,586 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-18 00:58:04,588 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-18 00:58:04,588 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-18 00:58:04,591 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-18 00:58:04,594 [ scc.git] DEBUG Already up to date.
2025-05-18 00:58:04,594 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-05-18 00:58:05,386 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-18 00:58:05,386 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-05-18 00:58:05,391 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-05-18 00:58:05,728 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-18 00:58:05,728 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-05-18 00:58:05,733 [ scc.git] DEBUG ## Unique users: []
2025-05-18 00:58:05,733 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:05,733 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:05,736 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-18 00:58:05,740 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:05,743 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-18 00:58:05,794 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-18 00:58:05,798 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-05-18 00:58:05,798 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-05-18 00:58:05,798 [ scc.git] DEBUG requirements.txt | 2 +-
2025-05-18 00:58:05,799 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-05-18 00:58:05,799 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-05-18 00:58:05,799 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-05-18 00:58:05,800 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:05,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:58:05,995 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-05-18 00:58:06,000 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:06,003 [ 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-05-18 00:58:06,044 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-18 00:58:06,046 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-18 00:58:06,046 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-18 00:58:06,246 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:06,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:58:06,412 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-18 00:58:06,454 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:06,455 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:06,457 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-18 00:58:06,498 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-18 00:58:06,502 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f420cebde10> has no local changes
2025-05-18 00:58:06,502 [ 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#427 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/)'
2025-05-18 00:58:06,509 [ scc.git] DEBUG [detached HEAD 31c0934] merge master -Dorg -Ssuccess-only
2025-05-18 00:58:06,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:58:06,510 [ scc.repo] DEBUG ## PRs found:
2025-05-18 00:58:06,662 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:06,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-05-18 00:58:07,199 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:07,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-05-18 00:58:07,673 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:07,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-05-18 00:58:08,202 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:08,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-18 00:58:08,750 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:08,978 [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-05-18 00:58:09,229 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:09,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-18 00:58:09,744 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:09,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-05-18 00:58:09,938 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-18 00:58:10,189 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:10,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-05-18 00:58:10,675 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:10,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-05-18 00:58:11,154 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:11,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-18 00:58:11,687 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:11,911 [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-05-18 00:58:12,163 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:12,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-18 00:58:12,615 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:12,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-05-18 00:58:12,805 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-18 00:58:12,805 [ scc.repo] DEBUG ## Branches found:
2025-05-18 00:58:12,805 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-18 00:58:12,805 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:12,805 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:12,808 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-18 00:58:12,811 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-18 00:58:12,811 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-18 00:58:12,814 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-18 00:58:12,822 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-05-18 00:58:13,056 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:13,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-05-18 00:58:13,459 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-05-18 00:58:14,368 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-18 00:58:14,368 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-05-18 00:58:14,374 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-05-18 00:58:14,923 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-18 00:58:14,923 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-05-18 00:58:14,929 [ scc.git] DEBUG ## Unique users: []
2025-05-18 00:58:14,929 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:14,929 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:14,932 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-18 00:58:14,936 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:14,939 [ 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-05-18 00:58:14,963 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-05-18 00:58:14,963 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-05-18 00:58:14,963 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-18 00:58:14,964 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-18 00:58:14,964 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-18 00:58:14,964 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-18 00:58:14,967 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-18 00:58:14,971 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-18 00:58:14,973 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:15,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:58:15,134 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-18 00:58:15,139 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-18 00:58:15,142 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#427](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-05-18 00:58:15,145 [ scc.config] DEBUG Found github.token
2025-05-18 00:58:15,145 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-05-18 00:58:15,145 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-18 00:58:15,150 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:15,152 [ 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-05-18 00:58:15,241 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-18 00:58:15,241 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-18 00:58:15,241 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-05-18 00:58:15,242 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-18 00:58:15,242 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-18 00:58:15,246 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-18 00:58:15,251 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-18 00:58:15,385 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:15,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:58:15,542 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-18 00:58:15,546 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-18 00:58:15,550 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#427](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/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-05-18 00:58:15,552 [ scc.config] DEBUG Found github.token
2025-05-18 00:58:15,552 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-05-18 00:58:15,552 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-18 00:58:15,594 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:15,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:15,597 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-18 00:58:15,638 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-18 00:58:15,643 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f420ce4e090> has no local changes
2025-05-18 00:58:15,643 [ 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#427 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/)'
2025-05-18 00:58:15,651 [ scc.git] DEBUG [detached HEAD 2aa13ad] merge master -Dorg -Ssuccess-only
2025-05-18 00:58:15,651 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:58:15,651 [ scc.repo] DEBUG ## PRs found:
2025-05-18 00:58:15,793 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:16,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-05-18 00:58:16,370 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:16,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-05-18 00:58:16,839 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:17,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-18 00:58:17,357 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:17,615 [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-05-18 00:58:17,867 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:18,125 [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-05-18 00:58:18,377 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:18,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-18 00:58:18,896 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:19,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-05-18 00:58:19,098 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-18 00:58:19,349 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:19,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-05-18 00:58:19,574 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-18 00:58:19,825 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:20,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-18 00:58:20,418 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:20,685 [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-05-18 00:58:20,937 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:21,229 [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-05-18 00:58:21,481 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:21,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-18 00:58:21,939 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:22,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-05-18 00:58:22,120 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-18 00:58:22,371 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:22,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-05-18 00:58:22,623 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-18 00:58:22,874 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:23,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-18 00:58:23,478 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:23,725 [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-05-18 00:58:23,977 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:24,243 [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-05-18 00:58:24,495 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:24,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-18 00:58:25,046 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:25,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-05-18 00:58:25,254 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-18 00:58:25,505 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:25,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-05-18 00:58:26,000 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:26,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-05-18 00:58:26,486 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:26,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-05-18 00:58:27,066 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:27,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-05-18 00:58:27,532 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:27,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-05-18 00:58:28,025 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:28,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-05-18 00:58:28,505 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:28,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-05-18 00:58:28,848 [ scc.repo] DEBUG ## Branches found:
2025-05-18 00:58:28,848 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-18 00:58:28,849 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:28,849 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:28,851 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-18 00:58:28,854 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-18 00:58:28,854 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-18 00:58:28,857 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-18 00:58:28,860 [ scc.git] DEBUG Already up to date.
2025-05-18 00:58:28,861 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-05-18 00:58:29,142 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-18 00:58:29,142 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-05-18 00:58:29,147 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-05-18 00:58:29,449 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-18 00:58:29,449 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-05-18 00:58:29,454 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-05-18 00:58:29,764 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-18 00:58:29,764 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-05-18 00:58:29,770 [ scc.git] DEBUG ## Unique users: []
2025-05-18 00:58:29,770 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:29,770 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:29,772 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-05-18 00:58:29,833 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:29,836 [ 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-05-18 00:58:29,913 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-18 00:58:29,917 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-05-18 00:58:29,917 [ scc.git] DEBUG package.json | 2 +-
2025-05-18 00:58:29,917 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-05-18 00:58:29,918 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:30,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:58:30,076 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-05-18 00:58:30,079 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:30,082 [ 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-05-18 00:58:30,386 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-18 00:58:30,386 [ scc.git] DEBUG Auto-merging package.json
2025-05-18 00:58:30,387 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-18 00:58:30,391 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-05-18 00:58:30,391 [ scc.git] DEBUG package.json | 2 +-
2025-05-18 00:58:30,391 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-05-18 00:58:30,392 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:30,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:58:30,560 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-05-18 00:58:30,564 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:30,566 [ 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-05-18 00:58:30,576 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-18 00:58:30,579 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-18 00:58:30,579 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-18 00:58:30,811 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:30,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:58:30,984 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-18 00:58:31,026 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:31,026 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:31,028 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-18 00:58:31,069 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-18 00:58:31,074 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f420cf3ca50> has no local changes
2025-05-18 00:58:31,074 [ 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#427 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/)'
2025-05-18 00:58:31,081 [ scc.git] DEBUG [detached HEAD 8bdf431] merge master -Dorg -Ssuccess-only
2025-05-18 00:58:31,081 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:58:31,081 [ scc.repo] DEBUG ## PRs found:
2025-05-18 00:58:31,235 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:31,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-05-18 00:58:31,457 [ scc.repo] DEBUG ## Branches found:
2025-05-18 00:58:31,457 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-18 00:58:31,458 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:31,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:31,460 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-18 00:58:31,463 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-18 00:58:31,463 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-18 00:58:31,466 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-18 00:58:31,469 [ scc.git] DEBUG Already up to date.
2025-05-18 00:58:31,469 [ scc.git] DEBUG ## Unique users: []
2025-05-18 00:58:31,469 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:31,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:31,471 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-18 00:58:31,511 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:31,511 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:31,515 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-18 00:58:31,556 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-18 00:58:31,559 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f420cf3f750> has no local changes
2025-05-18 00:58:31,559 [ 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#427 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/)'
2025-05-18 00:58:31,566 [ scc.git] DEBUG [detached HEAD 5f6cb28] merge master -Dorg -Ssuccess-only
2025-05-18 00:58:31,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:58:31,566 [ scc.repo] DEBUG ## PRs found:
2025-05-18 00:58:31,710 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:31,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-05-18 00:58:32,250 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:32,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-05-18 00:58:32,735 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:32,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-05-18 00:58:33,210 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:33,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-05-18 00:58:33,459 [ scc.repo] DEBUG ## Branches found:
2025-05-18 00:58:33,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-18 00:58:33,460 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:33,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:33,462 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-18 00:58:33,465 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-18 00:58:33,465 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-18 00:58:33,468 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-18 00:58:33,471 [ scc.git] DEBUG Already up to date.
2025-05-18 00:58:33,471 [ scc.git] DEBUG ## Unique users: []
2025-05-18 00:58:33,471 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:33,471 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:33,473 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-18 00:58:33,515 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:33,515 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:33,517 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-18 00:58:33,558 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-18 00:58:33,561 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f420c52ef50> has no local changes
2025-05-18 00:58:33,561 [ 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#427 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/)'
2025-05-18 00:58:33,567 [ scc.git] DEBUG [detached HEAD fbb926d] merge master -Dorg -Ssuccess-only
2025-05-18 00:58:33,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:58:33,568 [ scc.repo] DEBUG ## PRs found:
2025-05-18 00:58:33,710 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:33,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-05-18 00:58:34,235 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:34,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-05-18 00:58:34,734 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:34,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-05-18 00:58:35,187 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:35,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-18 00:58:35,746 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:35,971 [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-05-18 00:58:36,223 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:36,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-18 00:58:36,801 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:36,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-05-18 00:58:36,984 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-18 00:58:36,984 [ scc.repo] DEBUG ## Branches found:
2025-05-18 00:58:36,984 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-18 00:58:36,984 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:36,984 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:36,987 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-18 00:58:36,989 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-18 00:58:36,989 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-18 00:58:36,992 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-18 00:58:36,998 [ scc.git] DEBUG Already up to date.
2025-05-18 00:58:36,998 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-05-18 00:58:37,396 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-05-18 00:58:37,396 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-05-18 00:58:37,401 [ scc.git] DEBUG ## Unique users: []
2025-05-18 00:58:37,401 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:37,401 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:37,403 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-18 00:58:37,407 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:37,409 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-18 00:58:37,418 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-05-18 00:58:37,418 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-05-18 00:58:37,418 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-05-18 00:58:37,418 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-05-18 00:58:37,418 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-05-18 00:58:37,418 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-05-18 00:58:37,418 [ scc.git] DEBUG Auto-merging setup.py
2025-05-18 00:58:37,418 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-05-18 00:58:37,418 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-18 00:58:37,419 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-18 00:58:37,422 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-18 00:58:37,426 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-05-18 00:58:37,427 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:37,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:58:37,580 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-18 00:58:37,583 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-18 00:58:37,586 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#427](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
- setup.py
--conflicts
2025-05-18 00:58:37,589 [ scc.config] DEBUG Found github.token
2025-05-18 00:58:37,589 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-05-18 00:58:37,589 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-18 00:58:37,630 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:37,631 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:37,633 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-18 00:58:37,678 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-18 00:58:37,682 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f420cf3de10> has no local changes
2025-05-18 00:58:37,682 [ 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#427 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/)'
2025-05-18 00:58:37,688 [ scc.git] DEBUG [detached HEAD 05a7292] merge master -Dorg -Ssuccess-only
2025-05-18 00:58:37,689 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:58:37,689 [ scc.repo] DEBUG ## PRs found:
2025-05-18 00:58:37,831 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:38,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-05-18 00:58:38,407 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:38,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-05-18 00:58:38,884 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:39,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-18 00:58:39,401 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:39,623 [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-05-18 00:58:39,876 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:40,164 [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-05-18 00:58:40,416 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:40,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-18 00:58:40,994 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:41,163 [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-05-18 00:58:41,164 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-05-18 00:58:41,415 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:41,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-05-18 00:58:41,924 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:42,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-05-18 00:58:42,441 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:42,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-05-18 00:58:42,986 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:43,201 [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-05-18 00:58:43,453 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:43,672 [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-05-18 00:58:43,924 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:44,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-05-18 00:58:44,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:44,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-05-18 00:58:44,873 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:45,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-05-18 00:58:45,345 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:45,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-05-18 00:58:45,816 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:46,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-18 00:58:46,349 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:46,563 [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-05-18 00:58:46,815 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:47,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-18 00:58:47,353 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:47,580 [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-05-18 00:58:47,580 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-18 00:58:47,581 [ scc.repo] DEBUG ## Branches found:
2025-05-18 00:58:47,581 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-18 00:58:47,581 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:47,581 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:47,584 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-18 00:58:47,587 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-18 00:58:47,587 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-18 00:58:47,590 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-18 00:58:47,593 [ scc.git] DEBUG Already up to date.
2025-05-18 00:58:47,593 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-05-18 00:58:47,972 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-18 00:58:47,973 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-05-18 00:58:47,978 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-05-18 00:58:48,307 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-18 00:58:48,308 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-05-18 00:58:48,313 [ scc.git] DEBUG ## Unique users: []
2025-05-18 00:58:48,313 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:48,313 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:48,316 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-05-18 00:58:48,320 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:48,323 [ 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-05-18 00:58:48,353 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-18 00:58:48,357 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-05-18 00:58:48,357 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-05-18 00:58:48,357 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-05-18 00:58:48,357 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-05-18 00:58:48,357 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-05-18 00:58:48,357 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-05-18 00:58:48,357 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-05-18 00:58:48,357 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-05-18 00:58:48,357 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-05-18 00:58:48,358 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-05-18 00:58:48,358 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:48,358 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-05-18 00:58:48,359 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-05-18 00:58:48,359 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-05-18 00:58:48,359 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-05-18 00:58:48,359 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-05-18 00:58:48,359 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-05-18 00:58:48,359 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-05-18 00:58:48,359 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-05-18 00:58:48,359 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-05-18 00:58:48,359 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-05-18 00:58:48,359 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-05-18 00:58:48,359 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-05-18 00:58:48,359 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-05-18 00:58:48,359 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-05-18 00:58:48,359 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-05-18 00:58:48,359 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-05-18 00:58:48,359 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-05-18 00:58:48,359 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-05-18 00:58:48,359 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-05-18 00:58:48,359 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-05-18 00:58:48,359 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-05-18 00:58:48,359 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-05-18 00:58:48,359 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-05-18 00:58:48,359 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-05-18 00:58:48,359 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-05-18 00:58:48,359 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-05-18 00:58:48,359 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-05-18 00:58:48,359 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-05-18 00:58:48,359 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-05-18 00:58:48,359 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-05-18 00:58:48,359 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-05-18 00:58:48,359 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-05-18 00:58:48,359 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-05-18 00:58:48,359 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-05-18 00:58:48,359 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-05-18 00:58:48,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:58:48,518 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-18 00:58:48,523 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:48,525 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-18 00:58:48,536 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-18 00:58:48,539 [ scc.git] DEBUG docker | 1 +
2025-05-18 00:58:48,539 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-05-18 00:58:48,769 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:48,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:58:48,943 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-18 00:58:48,985 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:48,985 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:48,988 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-18 00:58:49,031 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-18 00:58:49,036 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f420cf50a10> has no local changes
2025-05-18 00:58:49,036 [ 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#427 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/)'
2025-05-18 00:58:49,043 [ scc.git] DEBUG [detached HEAD 9aaff0f] merge master -Dorg -Ssuccess-only
2025-05-18 00:58:49,043 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:58:49,043 [ scc.repo] DEBUG ## PRs found:
2025-05-18 00:58:49,194 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:49,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-05-18 00:58:49,383 [ scc.repo] DEBUG ## Branches found:
2025-05-18 00:58:49,383 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-18 00:58:49,383 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:49,383 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:49,386 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-18 00:58:49,388 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-18 00:58:49,388 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-18 00:58:49,391 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-18 00:58:49,394 [ scc.git] DEBUG Already up to date.
2025-05-18 00:58:49,395 [ scc.git] DEBUG ## Unique users: []
2025-05-18 00:58:49,395 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:49,395 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:49,397 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-18 00:58:49,438 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:49,438 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:49,441 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-18 00:58:49,482 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-18 00:58:49,486 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f420c59ed90> has no local changes
2025-05-18 00:58:49,486 [ 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#427 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/)'
2025-05-18 00:58:49,492 [ scc.git] DEBUG [detached HEAD 7eb621e] merge master -Dorg -Ssuccess-only
2025-05-18 00:58:49,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:58:49,493 [ scc.repo] DEBUG ## PRs found:
2025-05-18 00:58:49,634 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:49,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-05-18 00:58:50,172 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:50,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-05-18 00:58:50,635 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:50,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-05-18 00:58:51,105 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:51,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-18 00:58:51,634 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:51,891 [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-05-18 00:58:52,143 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:52,375 [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-05-18 00:58:52,627 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:52,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-18 00:58:53,169 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:53,369 [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-05-18 00:58:53,370 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-05-18 00:58:53,370 [ scc.repo] DEBUG ## Branches found:
2025-05-18 00:58:53,370 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-18 00:58:53,370 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:53,370 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:53,373 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-18 00:58:53,376 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-18 00:58:53,376 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-18 00:58:53,378 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-18 00:58:53,382 [ scc.git] DEBUG Already up to date.
2025-05-18 00:58:53,382 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-05-18 00:58:53,723 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-05-18 00:58:53,723 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-05-18 00:58:53,729 [ scc.git] DEBUG ## Unique users: []
2025-05-18 00:58:53,729 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:53,729 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:53,732 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-05-18 00:58:53,735 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:53,738 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-05-18 00:58:53,746 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-18 00:58:53,749 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-05-18 00:58:53,749 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-05-18 00:58:53,749 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-05-18 00:58:53,749 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-05-18 00:58:53,749 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-05-18 00:58:53,751 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:53,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:58:53,926 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-18 00:58:53,970 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:58:53,970 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:58:53,973 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-18 00:58:54,014 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-18 00:58:54,017 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f420cf51550> has no local changes
2025-05-18 00:58:54,018 [ 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#427 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/)'
2025-05-18 00:58:54,024 [ scc.git] DEBUG [detached HEAD 86e97dd] merge master -Dorg -Ssuccess-only
2025-05-18 00:58:54,024 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:58:54,024 [ scc.git] INFO Overriding base-branch from master to main
2025-05-18 00:58:54,024 [ scc.repo] DEBUG ## PRs found:
2025-05-18 00:58:54,177 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:54,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-05-18 00:58:54,686 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:54,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-05-18 00:58:55,151 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:55,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-05-18 00:58:55,614 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:55,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-05-18 00:58:56,159 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:56,392 [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-05-18 00:58:56,644 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:56,883 [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-05-18 00:58:57,135 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:57,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-05-18 00:58:57,601 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:57,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-05-18 00:58:58,084 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:58,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-05-18 00:58:58,544 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:58,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-18 00:58:59,089 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:59,292 [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-05-18 00:58:59,544 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:58:59,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-18 00:59:00,099 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:00,285 [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-05-18 00:59:00,285 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-18 00:59:00,286 [ scc.repo] DEBUG ## Branches found:
2025-05-18 00:59:00,286 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-18 00:59:00,286 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:59:00,286 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:59:00,289 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-05-18 00:59:00,291 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-18 00:59:00,291 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-05-18 00:59:00,294 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-05-18 00:59:00,297 [ scc.git] DEBUG Already up to date.
2025-05-18 00:59:00,297 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-05-18 00:59:00,642 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-05-18 00:59:00,642 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-05-18 00:59:00,647 [ scc.git] DEBUG ## Unique users: []
2025-05-18 00:59:00,647 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:59:00,647 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:59:00,649 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-18 00:59:00,653 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:59:00,655 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-18 00:59:00,663 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-05-18 00:59:00,663 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-05-18 00:59:00,663 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-18 00:59:00,663 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-18 00:59:00,666 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-18 00:59:00,671 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-05-18 00:59:00,672 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:00,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:00,840 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-18 00:59:00,844 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-18 00:59:00,847 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#427](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-05-18 00:59:00,849 [ scc.config] DEBUG Found github.token
2025-05-18 00:59:00,849 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-05-18 00:59:00,849 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-18 00:59:00,889 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:59:00,889 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:59:00,891 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-18 00:59:00,929 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-18 00:59:00,933 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f420d102110> has no local changes
2025-05-18 00:59:00,933 [ 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#427 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/)'
2025-05-18 00:59:00,940 [ scc.git] DEBUG [detached HEAD dae221b] merge master -Dorg -Ssuccess-only
2025-05-18 00:59:00,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:00,941 [ scc.repo] DEBUG ## PRs found:
2025-05-18 00:59:01,091 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:01,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-05-18 00:59:01,295 [ scc.repo] DEBUG ## Branches found:
2025-05-18 00:59:01,295 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-18 00:59:01,295 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:59:01,295 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:59:01,298 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-18 00:59:01,300 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-18 00:59:01,301 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-18 00:59:01,304 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-18 00:59:01,307 [ scc.git] DEBUG Already up to date.
2025-05-18 00:59:01,307 [ scc.git] DEBUG ## Unique users: []
2025-05-18 00:59:01,307 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:59:01,307 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:59:01,309 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-18 00:59:01,353 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:59:01,353 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:59:01,355 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-18 00:59:01,394 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-18 00:59:01,397 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f420cf52850> has no local changes
2025-05-18 00:59:01,397 [ 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#427 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/)'
2025-05-18 00:59:01,403 [ scc.git] DEBUG [detached HEAD 75fbe59] merge master -Dorg -Ssuccess-only
2025-05-18 00:59:01,404 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:01,404 [ scc.repo] DEBUG ## PRs found:
2025-05-18 00:59:01,546 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:01,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-05-18 00:59:01,763 [ scc.repo] DEBUG ## Branches found:
2025-05-18 00:59:01,763 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-18 00:59:01,763 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:59:01,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:59:01,766 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-18 00:59:01,769 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-18 00:59:01,769 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-18 00:59:01,772 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-18 00:59:01,775 [ scc.git] DEBUG Already up to date.
2025-05-18 00:59:01,775 [ scc.git] DEBUG ## Unique users: []
2025-05-18 00:59:01,775 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:59:01,775 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:59:01,778 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-18 00:59:01,819 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:59:01,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:59:01,821 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-18 00:59:01,863 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-18 00:59:01,867 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f420c5bead0> has no local changes
2025-05-18 00:59:01,867 [ 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#427 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/)'
2025-05-18 00:59:01,873 [ scc.git] DEBUG [detached HEAD fc61b99] merge master -Dorg -Ssuccess-only
2025-05-18 00:59:01,873 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:01,874 [ scc.repo] DEBUG ## PRs found:
2025-05-18 00:59:02,014 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:02,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-05-18 00:59:02,555 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:02,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-05-18 00:59:03,054 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:03,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-05-18 00:59:03,539 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:03,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-18 00:59:04,054 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:04,275 [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-05-18 00:59:04,527 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:04,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-18 00:59:04,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:05,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-05-18 00:59:05,150 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-05-18 00:59:05,150 [ scc.repo] DEBUG ## Branches found:
2025-05-18 00:59:05,150 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-18 00:59:05,150 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:59:05,150 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:59:05,153 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-18 00:59:05,156 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-18 00:59:05,156 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-18 00:59:05,159 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-18 00:59:05,162 [ scc.git] DEBUG Already up to date.
2025-05-18 00:59:05,162 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-05-18 00:59:05,691 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-05-18 00:59:05,692 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-05-18 00:59:05,697 [ scc.git] DEBUG ## Unique users: []
2025-05-18 00:59:05,697 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:59:05,697 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:59:05,700 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-18 00:59:05,703 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:59:05,705 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-18 00:59:05,714 [ scc.git] DEBUG Auto-merging Dockerfile
2025-05-18 00:59:05,714 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-05-18 00:59:05,715 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-18 00:59:05,715 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-18 00:59:05,718 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-18 00:59:05,723 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-05-18 00:59:05,724 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:05,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:05,885 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-18 00:59:05,889 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-18 00:59:05,892 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#427](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-05-18 00:59:05,894 [ scc.config] DEBUG Found github.token
2025-05-18 00:59:05,894 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-05-18 00:59:05,894 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-18 00:59:05,937 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:59:05,938 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:59:05,940 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-18 00:59:05,984 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-18 00:59:05,988 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f420cfa44d0> has no local changes
2025-05-18 00:59:05,988 [ 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#427 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/)'
2025-05-18 00:59:05,996 [ scc.git] DEBUG [detached HEAD 8c5d79f] merge master -Dorg -Ssuccess-only
2025-05-18 00:59:05,996 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:05,996 [ scc.git] INFO Overriding base-branch from master to develop
2025-05-18 00:59:05,996 [ scc.repo] DEBUG ## PRs found:
2025-05-18 00:59:06,136 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:06,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-05-18 00:59:06,680 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:06,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-05-18 00:59:07,148 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:07,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-05-18 00:59:07,672 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:07,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-18 00:59:08,119 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:08,386 [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-05-18 00:59:08,638 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:08,868 [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-05-18 00:59:09,121 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:09,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-18 00:59:09,568 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:09,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-05-18 00:59:09,766 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-18 00:59:10,018 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:10,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-05-18 00:59:10,482 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:10,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-05-18 00:59:10,951 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:11,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-18 00:59:11,408 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:11,633 [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-05-18 00:59:11,885 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:12,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-18 00:59:12,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:12,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-05-18 00:59:12,587 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-18 00:59:12,839 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:13,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-05-18 00:59:13,326 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:13,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-05-18 00:59:13,846 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:14,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-05-18 00:59:14,362 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:14,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-05-18 00:59:14,649 [ scc.repo] DEBUG ## Branches found:
2025-05-18 00:59:14,649 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-18 00:59:14,649 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:59:14,649 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:59:14,652 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-05-18 00:59:14,655 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-18 00:59:14,655 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-05-18 00:59:14,658 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-05-18 00:59:14,667 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-05-18 00:59:14,899 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:15,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-05-18 00:59:15,325 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-05-18 00:59:16,165 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-18 00:59:16,165 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-05-18 00:59:16,171 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-05-18 00:59:16,671 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-18 00:59:16,671 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-05-18 00:59:16,677 [ scc.git] DEBUG ## Unique users: []
2025-05-18 00:59:16,677 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:59:16,677 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:59:16,680 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-18 00:59:16,686 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:59:16,688 [ 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-05-18 00:59:16,699 [ 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-05-18 00:59:16,699 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-18 00:59:16,700 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-18 00:59:16,702 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-18 00:59:16,706 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-05-18 00:59:16,707 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:16,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:16,863 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-18 00:59:16,869 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-18 00:59:16,873 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#427](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-05-18 00:59:16,875 [ scc.config] DEBUG Found github.token
2025-05-18 00:59:16,875 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-05-18 00:59:16,875 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-05-18 00:59:16,879 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:59:16,882 [ 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-05-18 00:59:16,894 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-18 00:59:16,898 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-05-18 00:59:16,898 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-05-18 00:59:17,114 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:17,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:17,281 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-18 00:59:17,322 [ scc.git] DEBUG Get sha1 of %s
2025-05-18 00:59:17,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-18 00:59:17,324 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-18 00:59:17,362 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-18 00:59:17,366 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f420c52ed50> has no local changes
2025-05-18 00:59:17,366 [ 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#427 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/)'
2025-05-18 00:59:17,372 [ scc.git] DEBUG [detached HEAD 36824e8] merge master -Dorg -Ssuccess-only
2025-05-18 00:59:17,373 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:17,373 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-18 00:59:17,451 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-05-18 00:59:17,532 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:17,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:17,696 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-05-18 00:59:17,698 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-05-18 00:59:17,941 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:18,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:18,108 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-05-18 00:59:18,110 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-05-18 00:59:18,354 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:18,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:18,522 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-05-18 00:59:18,524 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-05-18 00:59:18,768 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:18,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:18,944 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-05-18 00:59:19,188 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:19,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:19,348 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-05-18 00:59:19,351 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-05-18 00:59:19,595 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:19,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:19,765 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-05-18 00:59:19,767 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-05-18 00:59:20,011 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:20,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:20,196 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-05-18 00:59:20,198 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-05-18 00:59:20,442 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:20,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:20,607 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-05-18 00:59:20,609 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-05-18 00:59:20,853 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:21,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:21,025 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-05-18 00:59:21,027 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-05-18 00:59:21,271 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:21,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:21,434 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-05-18 00:59:21,436 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-05-18 00:59:21,679 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:21,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:21,840 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-05-18 00:59:21,842 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-05-18 00:59:22,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:22,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:22,260 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-05-18 00:59:22,262 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-05-18 00:59:22,505 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:22,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:22,664 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-05-18 00:59:22,909 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:23,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:23,076 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-05-18 00:59:23,320 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:23,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:23,500 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-05-18 00:59:23,502 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-05-18 00:59:23,747 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:23,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:23,920 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-05-18 00:59:24,164 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:24,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:24,342 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-05-18 00:59:24,586 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:24,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:24,755 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-05-18 00:59:24,757 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-05-18 00:59:25,001 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:25,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:25,164 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-05-18 00:59:25,166 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-05-18 00:59:25,409 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:25,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:25,578 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-05-18 00:59:25,581 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-05-18 00:59:25,825 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:25,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:25,990 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-05-18 00:59:25,992 [ scc.config] DEBUG Found submodule.scripts.url
2025-05-18 00:59:26,236 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-18 00:59:26,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-18 00:59:26,410 [ scc.config] DEBUG Found submodule.scripts.branch
2025-05-18 00:59:26,410 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-18 00:59:26,504 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f420d065c50> has local changes
2025-05-18 00:59:26,504 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
- PR 71 dominikl 'Escape slash character in image names'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 167 dominikl 'Add extinfo command' (status: failure)
- 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'
Repository: ome/omero-figure
Excluded PRs:
- PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
- PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..3e8fa730
Previously merged:
- PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
- PR 635 dependabot[bot] 'Bump esbuild and vite'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
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#427 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/427/)'
2025-05-18 00:59:26,518 [ scc.git] DEBUG [detached HEAD 316de96] merge master -Dorg -Ssuccess-only
2025-05-18 00:59:26,518 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-05-18 00:59:26,518 [ scc.merge] INFO Repository: ome/omero-plugins
2025-05-18 00:59:26,519 [ scc.merge] INFO Already up to date.
2025-05-18 00:59:26,519 [ scc.merge] INFO
2025-05-18 00:59:26,519 [ scc.merge] INFO Merged PRs:
2025-05-18 00:59:26,519 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-05-18 00:59:26,519 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-05-18 00:59:26,519 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-05-18 00:59:26,519 [ scc.merge] INFO
2025-05-18 00:59:26,519 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-05-18 00:59:26,519 [ scc.merge] INFO Already up to date.
2025-05-18 00:59:26,519 [ scc.merge] INFO
2025-05-18 00:59:26,519 [ scc.merge] INFO
2025-05-18 00:59:26,519 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-05-18 00:59:26,519 [ scc.merge] INFO Excluded PRs:
2025-05-18 00:59:26,519 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-05-18 00:59:26,519 [ scc.merge] INFO Already up to date.
2025-05-18 00:59:26,519 [ scc.merge] INFO
2025-05-18 00:59:26,519 [ scc.merge] INFO
2025-05-18 00:59:26,519 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-05-18 00:59:26,519 [ scc.merge] INFO Excluded PRs:
2025-05-18 00:59:26,519 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-05-18 00:59:26,519 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-05-18 00:59:26,519 [ scc.merge] INFO Already up to date.
2025-05-18 00:59:26,519 [ scc.merge] INFO
2025-05-18 00:59:26,519 [ scc.merge] INFO Merged PRs:
2025-05-18 00:59:26,519 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-05-18 00:59:26,519 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-05-18 00:59:26,519 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-05-18 00:59:26,519 [ scc.merge] INFO
2025-05-18 00:59:26,519 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-05-18 00:59:26,519 [ scc.merge] INFO Excluded PRs:
2025-05-18 00:59:26,519 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-05-18 00:59:26,519 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-05-18 00:59:26,520 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (status: failure)
2025-05-18 00:59:26,520 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-05-18 00:59:26,520 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-18 00:59:26,520 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-05-18 00:59:26,520 [ scc.merge] INFO Updating 11d3587..5b2ca82
2025-05-18 00:59:26,520 [ scc.merge] INFO Previously merged:
2025-05-18 00:59:26,520 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-05-18 00:59:26,520 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-18 00:59:26,520 [ scc.merge] INFO
2025-05-18 00:59:26,520 [ scc.merge] INFO Merged PRs:
2025-05-18 00:59:26,520 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-05-18 00:59:26,520 [ scc.merge] INFO
2025-05-18 00:59:26,520 [ scc.merge] INFO Repository: ome/omero-figure
2025-05-18 00:59:26,520 [ scc.merge] INFO Excluded PRs:
2025-05-18 00:59:26,520 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-05-18 00:59:26,520 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-05-18 00:59:26,520 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-05-18 00:59:26,520 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-05-18 00:59:26,520 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-05-18 00:59:26,520 [ scc.merge] INFO Previously merged:
2025-05-18 00:59:26,520 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-05-18 00:59:26,520 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-05-18 00:59:26,520 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-05-18 00:59:26,520 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-18 00:59:26,520 [ scc.merge] INFO
2025-05-18 00:59:26,520 [ scc.merge] INFO Merged PRs:
2025-05-18 00:59:26,520 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-05-18 00:59:26,520 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-05-18 00:59:26,520 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-05-18 00:59:26,520 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-05-18 00:59:26,520 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-05-18 00:59:26,520 [ scc.merge] INFO
2025-05-18 00:59:26,520 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-18 00:59:26,520 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-05-18 00:59:26,521 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-05-18 00:59:26,521 [ scc.merge] INFO
2025-05-18 00:59:26,521 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-05-18 00:59:26,521 [ scc.merge] INFO Already up to date.
2025-05-18 00:59:26,521 [ scc.merge] INFO
2025-05-18 00:59:26,521 [ scc.merge] INFO Merged PRs:
2025-05-18 00:59:26,521 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-05-18 00:59:26,521 [ scc.merge] INFO
2025-05-18 00:59:26,521 [ scc.merge] INFO Repository: ome/omero-gallery
2025-05-18 00:59:26,521 [ scc.merge] INFO Already up to date.
2025-05-18 00:59:26,521 [ scc.merge] INFO
2025-05-18 00:59:26,521 [ scc.merge] INFO Merged PRs:
2025-05-18 00:59:26,521 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-05-18 00:59:26,521 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-05-18 00:59:26,521 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-05-18 00:59:26,521 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-05-18 00:59:26,521 [ scc.merge] INFO
2025-05-18 00:59:26,521 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-18 00:59:26,521 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-05-18 00:59:26,521 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-05-18 00:59:26,521 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-05-18 00:59:26,521 [ scc.merge] INFO
2025-05-18 00:59:26,521 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-05-18 00:59:26,521 [ scc.merge] INFO Excluded PRs:
2025-05-18 00:59:26,521 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-05-18 00:59:26,521 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-05-18 00:59:26,521 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-05-18 00:59:26,521 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-05-18 00:59:26,521 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-05-18 00:59:26,521 [ scc.merge] INFO Already up to date.
2025-05-18 00:59:26,521 [ scc.merge] INFO
2025-05-18 00:59:26,521 [ scc.merge] INFO Merged PRs:
2025-05-18 00:59:26,521 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-05-18 00:59:26,521 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-05-18 00:59:26,521 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-05-18 00:59:26,522 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-05-18 00:59:26,522 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-18 00:59:26,522 [ scc.merge] INFO
2025-05-18 00:59:26,522 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-18 00:59:26,522 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-05-18 00:59:26,522 [ scc.merge] INFO
2025-05-18 00:59:26,522 [ scc.merge] INFO Repository: ome/omero-mapr
2025-05-18 00:59:26,522 [ scc.merge] INFO Excluded PRs:
2025-05-18 00:59:26,522 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-05-18 00:59:26,522 [ scc.merge] INFO Already up to date.
2025-05-18 00:59:26,522 [ scc.merge] INFO
2025-05-18 00:59:26,522 [ scc.merge] INFO Merged PRs:
2025-05-18 00:59:26,522 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-05-18 00:59:26,522 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-18 00:59:26,522 [ scc.merge] INFO
2025-05-18 00:59:26,522 [ scc.merge] INFO Repository: ome/omero-metadata
2025-05-18 00:59:26,522 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-05-18 00:59:26,522 [ scc.merge] INFO Previously merged:
2025-05-18 00:59:26,522 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-18 00:59:26,522 [ scc.merge] INFO
2025-05-18 00:59:26,522 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-18 00:59:26,522 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-18 00:59:26,522 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-18 00:59:26,522 [ scc.merge] INFO
2025-05-18 00:59:26,522 [ scc.merge] INFO Repository: ome/omero-parade
2025-05-18 00:59:26,522 [ scc.merge] INFO Excluded PRs:
2025-05-18 00:59:26,522 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-05-18 00:59:26,522 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-05-18 00:59:26,522 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-05-18 00:59:26,522 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-05-18 00:59:26,522 [ scc.merge] INFO Already up to date.
2025-05-18 00:59:26,522 [ scc.merge] INFO
2025-05-18 00:59:26,522 [ scc.merge] INFO Merged PRs:
2025-05-18 00:59:26,522 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-18 00:59:26,522 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-18 00:59:26,523 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-18 00:59:26,523 [ scc.merge] INFO
2025-05-18 00:59:26,523 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-05-18 00:59:26,523 [ scc.merge] INFO Already up to date.
2025-05-18 00:59:26,523 [ scc.merge] INFO
2025-05-18 00:59:26,523 [ scc.merge] INFO
2025-05-18 00:59:26,523 [ scc.merge] INFO Repository: ome/omero-rois
2025-05-18 00:59:26,523 [ scc.merge] INFO Excluded PRs:
2025-05-18 00:59:26,523 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-05-18 00:59:26,523 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-18 00:59:26,523 [ scc.merge] INFO Already up to date.
2025-05-18 00:59:26,523 [ scc.merge] INFO
2025-05-18 00:59:26,523 [ scc.merge] INFO
2025-05-18 00:59:26,523 [ scc.merge] INFO Repository: ome/omero-signup
2025-05-18 00:59:26,523 [ scc.merge] INFO Already up to date.
2025-05-18 00:59:26,523 [ scc.merge] INFO
2025-05-18 00:59:26,523 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-18 00:59:26,523 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-18 00:59:26,523 [ scc.merge] INFO
2025-05-18 00:59:26,523 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-05-18 00:59:26,523 [ scc.merge] INFO Excluded PRs:
2025-05-18 00:59:26,523 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-05-18 00:59:26,523 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-05-18 00:59:26,523 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-05-18 00:59:26,523 [ scc.merge] INFO Already up to date.
2025-05-18 00:59:26,523 [ scc.merge] INFO
2025-05-18 00:59:26,523 [ scc.merge] INFO Merged PRs:
2025-05-18 00:59:26,523 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-18 00:59:26,523 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-05-18 00:59:26,523 [ scc.merge] INFO
2025-05-18 00:59:26,523 [ scc.merge] INFO Repository: ome/omero-upload
2025-05-18 00:59:26,523 [ scc.merge] INFO Already up to date.
2025-05-18 00:59:26,523 [ scc.merge] INFO
2025-05-18 00:59:26,523 [ scc.merge] INFO
2025-05-18 00:59:26,523 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-05-18 00:59:26,524 [ scc.merge] INFO Already up to date.
2025-05-18 00:59:26,524 [ scc.merge] INFO
2025-05-18 00:59:26,524 [ scc.merge] INFO Merged PRs:
2025-05-18 00:59:26,524 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-05-18 00:59:26,524 [ scc.merge] INFO
2025-05-18 00:59:26,524 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-05-18 00:59:26,524 [ scc.merge] INFO Excluded PRs:
2025-05-18 00:59:26,524 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-05-18 00:59:26,524 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-05-18 00:59:26,524 [ scc.merge] INFO Already up to date.
2025-05-18 00:59:26,524 [ scc.merge] INFO
2025-05-18 00:59:26,524 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-18 00:59:26,524 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-18 00:59:26,524 [ scc.merge] INFO
2025-05-18 00:59:26,524 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-05-18 00:59:26,524 [ scc.merge] INFO Already up to date.
2025-05-18 00:59:26,524 [ scc.merge] INFO
2025-05-18 00:59:26,524 [ scc.merge] INFO
2025-05-18 00:59:26,524 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-05-18 00:59:26,524 [ scc.merge] INFO Already up to date.
2025-05-18 00:59:26,524 [ scc.merge] INFO
2025-05-18 00:59:26,524 [ scc.merge] INFO
2025-05-18 00:59:26,524 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-05-18 00:59:26,524 [ scc.merge] INFO Already up to date.
2025-05-18 00:59:26,524 [ scc.merge] INFO
2025-05-18 00:59:26,524 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-18 00:59:26,524 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-05-18 00:59:26,524 [ scc.merge] INFO
2025-05-18 00:59:26,524 [ scc.merge] INFO Repository: ome/scripts
2025-05-18 00:59:26,524 [ scc.merge] INFO Excluded PRs:
2025-05-18 00:59:26,524 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-05-18 00:59:26,524 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-05-18 00:59:26,524 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-05-18 00:59:26,524 [ scc.merge] INFO Previously merged:
2025-05-18 00:59:26,524 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-05-18 00:59:26,524 [ scc.merge] INFO
2025-05-18 00:59:26,525 [ scc.merge] INFO Merged PRs:
2025-05-18 00:59:26,525 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-18 00:59:26,525 [ scc.merge] INFO
2025-05-18 00:59:26,525 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-18 00:59:26,525 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-18 00:59:26,525 [ scc.merge] INFO
2025-05-18 00:59:26,525 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-05-18 00:59:26,525 [ scc.git] DEBUG Calling 'git remote'
2025-05-18 00:59:26,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-05-18 00:59:26,527 [ scc.git] DEBUG Calling 'git remote'
2025-05-18 00:59:26,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:26,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-05-18 00:59:26,529 [ scc.git] DEBUG Calling 'git remote'
2025-05-18 00:59:26,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:26,532 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-05-18 00:59:26,532 [ scc.git] DEBUG Calling 'git remote'
2025-05-18 00:59:26,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:26,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-05-18 00:59:26,534 [ scc.git] DEBUG Calling 'git remote'
2025-05-18 00:59:26,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:26,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-05-18 00:59:26,536 [ scc.git] DEBUG Calling 'git remote'
2025-05-18 00:59:26,538 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:26,538 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-05-18 00:59:26,539 [ scc.git] DEBUG Calling 'git remote'
2025-05-18 00:59:26,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:26,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-05-18 00:59:26,541 [ scc.git] DEBUG Calling 'git remote'
2025-05-18 00:59:26,543 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:26,543 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-05-18 00:59:26,543 [ scc.git] DEBUG Calling 'git remote'
2025-05-18 00:59:26,545 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:26,545 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-18 00:59:26,545 [ scc.git] DEBUG Calling 'git remote'
2025-05-18 00:59:26,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:26,548 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-18 00:59:26,548 [ scc.git] DEBUG Calling 'git remote'
2025-05-18 00:59:26,550 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:26,550 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-18 00:59:26,550 [ scc.git] DEBUG Calling 'git remote'
2025-05-18 00:59:26,552 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:26,552 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-18 00:59:26,552 [ scc.git] DEBUG Calling 'git remote'
2025-05-18 00:59:26,554 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:26,554 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-18 00:59:26,554 [ scc.git] DEBUG Calling 'git remote'
2025-05-18 00:59:26,557 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:26,557 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-18 00:59:26,557 [ scc.git] DEBUG Calling 'git remote'
2025-05-18 00:59:26,559 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:26,559 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-18 00:59:26,559 [ scc.git] DEBUG Calling 'git remote'
2025-05-18 00:59:26,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:26,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-18 00:59:26,561 [ scc.git] DEBUG Calling 'git remote'
2025-05-18 00:59:26,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:26,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-18 00:59:26,563 [ scc.git] DEBUG Calling 'git remote'
2025-05-18 00:59:26,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:26,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-18 00:59:26,566 [ scc.git] DEBUG Calling 'git remote'
2025-05-18 00:59:26,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:26,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-18 00:59:26,568 [ scc.git] DEBUG Calling 'git remote'
2025-05-18 00:59:26,570 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:26,570 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-18 00:59:26,570 [ scc.git] DEBUG Calling 'git remote'
2025-05-18 00:59:26,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:26,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-18 00:59:26,572 [ scc.git] DEBUG Calling 'git remote'
2025-05-18 00:59:26,575 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-18 00:59:26,575 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-18 00:59:26,575 [ scc.git] DEBUG Calling 'git remote'
2025-05-18 00:59:26,577 [ 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 c679bcf] 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 6e22546] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-05-18 01:00:16,459 [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-05-18 01:00:25,954 [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-05-18 01:00:28,503 [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-05-18 01:00:33,302 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-05-18 01:01:13,408 [ 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/daea91b1/images/svgs/logo.svg){kind=logo}
