Skipping 216 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-06-21 00:28:36,983 [ scc.git] DEBUG HEAD is now at b4d33d2 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-06-21 00:28:37,171 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:37,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:28:37,344 [ scc.git] DEBUG Calling 'git merge-base bb94cf8da960e3283090038b04432f301560f5e4 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-06-21 00:28:37,347 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..bb94cf8da960e3283090038b04432f301560f5e4'
2025-06-21 00:28:37,350 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#456](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-06-21 00:28:37,352 [ scc.config] DEBUG Found github.token
2025-06-21 00:28:37,352 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-06-21 00:28:37,352 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-21 00:28:37,395 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:28:37,395 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:28:37,397 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-21 00:28:37,437 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-21 00:28:37,444 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3d0df1d8d0> has no local changes
2025-06-21 00:28:37,444 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Updating 7a798ce..bb94cf8
Previously merged:
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#456 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/)'
2025-06-21 00:28:37,451 [ scc.git] DEBUG [detached HEAD 282e98d] merge master -Dorg -Ssuccess-only
2025-06-21 00:28:37,451 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:28:37,451 [ scc.repo] DEBUG ## PRs found:
2025-06-21 00:28:37,595 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:37,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-06-21 00:28:38,152 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:38,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-06-21 00:28:38,637 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:38,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-06-21 00:28:39,137 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:39,350 [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-06-21 00:28:39,602 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:39,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-06-21 00:28:40,116 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:40,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-06-21 00:28:40,297 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-21 00:28:40,548 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:40,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-06-21 00:28:41,013 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:41,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-06-21 00:28:41,505 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:41,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-06-21 00:28:42,024 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:42,248 [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-06-21 00:28:42,499 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:42,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-06-21 00:28:42,955 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:43,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-06-21 00:28:43,144 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-06-21 00:28:43,144 [ scc.repo] DEBUG ## Branches found:
2025-06-21 00:28:43,144 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-06-21 00:28:43,144 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:28:43,145 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:28:43,147 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-21 00:28:43,149 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-21 00:28:43,149 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-21 00:28:43,152 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-21 00:28:43,156 [ scc.git] DEBUG Already up to date.
2025-06-21 00:28:43,156 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-06-21 00:28:43,475 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-06-21 00:28:43,475 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-06-21 00:28:43,479 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-06-21 00:28:43,767 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-06-21 00:28:43,767 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-06-21 00:28:43,772 [ scc.git] DEBUG ## Unique users: []
2025-06-21 00:28:43,772 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:28:43,772 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:28:43,774 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-06-21 00:28:43,778 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:28:43,780 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-06-21 00:28:43,790 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-21 00:28:43,793 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-06-21 00:28:43,793 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-06-21 00:28:43,793 [ scc.git] DEBUG requirements.txt | 2 +-
2025-06-21 00:28:43,793 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-06-21 00:28:43,793 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-06-21 00:28:43,793 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-06-21 00:28:43,795 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:43,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:28:43,947 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-06-21 00:28:43,951 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:28:43,953 [ 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-06-21 00:28:43,962 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-21 00:28:43,966 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-06-21 00:28:43,966 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-06-21 00:28:44,198 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:44,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:28:44,391 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-21 00:28:44,433 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:28:44,433 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:28:44,435 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-21 00:28:44,476 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-21 00:28:44,479 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3d0df1da50> has no local changes
2025-06-21 00:28:44,480 [ 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#456 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/)'
2025-06-21 00:28:44,486 [ scc.git] DEBUG [detached HEAD 8757dd9] merge master -Dorg -Ssuccess-only
2025-06-21 00:28:44,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:28:44,486 [ scc.repo] DEBUG ## PRs found:
2025-06-21 00:28:44,642 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:44,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-06-21 00:28:45,197 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:45,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-06-21 00:28:45,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:45,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-06-21 00:28:46,160 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:46,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-06-21 00:28:46,691 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:46,968 [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-06-21 00:28:47,219 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:47,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-06-21 00:28:47,687 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:47,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-06-21 00:28:47,871 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-06-21 00:28:48,121 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:48,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-06-21 00:28:48,600 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:48,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-06-21 00:28:49,044 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:49,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-06-21 00:28:49,586 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:49,797 [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-06-21 00:28:50,048 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:50,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-06-21 00:28:50,618 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:50,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-06-21 00:28:50,813 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-06-21 00:28:50,813 [ scc.repo] DEBUG ## Branches found:
2025-06-21 00:28:50,813 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-06-21 00:28:50,813 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:28:50,813 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:28:50,816 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-21 00:28:50,818 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-21 00:28:50,818 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-21 00:28:50,821 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-21 00:28:50,828 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-06-21 00:28:51,064 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:51,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-06-21 00:28:51,457 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-06-21 00:28:51,748 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-06-21 00:28:51,748 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-06-21 00:28:51,752 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-06-21 00:28:52,033 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-06-21 00:28:52,033 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-06-21 00:28:52,037 [ scc.git] DEBUG ## Unique users: []
2025-06-21 00:28:52,037 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:28:52,037 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:28:52,039 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-06-21 00:28:52,044 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:28:52,046 [ 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-06-21 00:28:52,059 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-06-21 00:28:52,059 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-06-21 00:28:52,059 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-06-21 00:28:52,059 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-06-21 00:28:52,059 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-06-21 00:28:52,060 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-06-21 00:28:52,062 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-06-21 00:28:52,067 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-06-21 00:28:52,069 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:52,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:28:52,230 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-06-21 00:28:52,235 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-06-21 00:28:52,238 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#456](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-06-21 00:28:52,240 [ scc.config] DEBUG Found github.token
2025-06-21 00:28:52,240 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-06-21 00:28:52,240 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-06-21 00:28:52,244 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:28:52,247 [ 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-06-21 00:28:52,262 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-06-21 00:28:52,262 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-06-21 00:28:52,262 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-06-21 00:28:52,262 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-06-21 00:28:52,263 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-06-21 00:28:52,266 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-06-21 00:28:52,271 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-06-21 00:28:52,481 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:52,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:28:52,653 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-06-21 00:28:52,657 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-06-21 00:28:52,660 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#456](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/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-06-21 00:28:52,662 [ scc.config] DEBUG Found github.token
2025-06-21 00:28:52,662 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-06-21 00:28:52,662 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-21 00:28:52,703 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:28:52,703 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:28:52,705 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-21 00:28:52,745 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-21 00:28:52,749 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3d0de2eed0> has no local changes
2025-06-21 00:28:52,749 [ 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#456 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/)'
2025-06-21 00:28:52,756 [ scc.git] DEBUG [detached HEAD 6a8d689] merge master -Dorg -Ssuccess-only
2025-06-21 00:28:52,757 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:28:52,757 [ scc.repo] DEBUG ## PRs found:
2025-06-21 00:28:52,904 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:53,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-06-21 00:28:53,520 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:53,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-06-21 00:28:54,010 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:54,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-06-21 00:28:54,518 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:54,766 [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-06-21 00:28:55,018 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:55,238 [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-06-21 00:28:55,489 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:55,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-06-21 00:28:55,990 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:56,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-06-21 00:28:56,176 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-21 00:28:56,427 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:56,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-06-21 00:28:56,664 [ scc.repo] DEBUG # ... Include label: dependencies
2025-06-21 00:28:56,915 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:57,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-06-21 00:28:57,456 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:57,722 [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-06-21 00:28:57,973 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:58,253 [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-06-21 00:28:58,505 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:58,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-06-21 00:28:58,972 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:59,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-06-21 00:28:59,142 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-06-21 00:28:59,393 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:28:59,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-06-21 00:28:59,611 [ scc.repo] DEBUG # ... Include label: dependencies
2025-06-21 00:28:59,862 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:00,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-06-21 00:29:00,410 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:00,631 [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-06-21 00:29:00,883 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:01,167 [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-06-21 00:29:01,418 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:01,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-06-21 00:29:01,962 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:02,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-06-21 00:29:02,136 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-06-21 00:29:02,387 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:02,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-06-21 00:29:02,845 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:03,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-06-21 00:29:03,326 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:03,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-06-21 00:29:03,795 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:04,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-06-21 00:29:04,262 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:04,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-06-21 00:29:04,741 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:04,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-06-21 00:29:05,241 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:05,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-06-21 00:29:05,465 [ scc.repo] DEBUG ## Branches found:
2025-06-21 00:29:05,465 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-06-21 00:29:05,465 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:05,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:05,468 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-21 00:29:05,470 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-21 00:29:05,470 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-21 00:29:05,473 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-21 00:29:05,476 [ scc.git] DEBUG Already up to date.
2025-06-21 00:29:05,476 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-06-21 00:29:05,776 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-06-21 00:29:05,776 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-06-21 00:29:05,780 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-06-21 00:29:06,064 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-06-21 00:29:06,064 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-06-21 00:29:06,068 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-06-21 00:29:06,358 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-06-21 00:29:06,358 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-06-21 00:29:06,363 [ scc.git] DEBUG ## Unique users: []
2025-06-21 00:29:06,363 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:06,363 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:06,365 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-06-21 00:29:06,368 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:06,370 [ 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-06-21 00:29:06,378 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-21 00:29:06,382 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-06-21 00:29:06,382 [ scc.git] DEBUG package.json | 2 +-
2025-06-21 00:29:06,382 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-06-21 00:29:06,383 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:06,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:06,559 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-06-21 00:29:06,562 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:06,564 [ 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-06-21 00:29:06,575 [ scc.git] DEBUG Auto-merging package-lock.json
2025-06-21 00:29:06,575 [ scc.git] DEBUG Auto-merging package.json
2025-06-21 00:29:06,576 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-21 00:29:06,579 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-06-21 00:29:06,580 [ scc.git] DEBUG package.json | 2 +-
2025-06-21 00:29:06,580 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-06-21 00:29:06,810 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:06,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:06,979 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-06-21 00:29:06,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:06,985 [ 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-06-21 00:29:06,994 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-21 00:29:06,998 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-06-21 00:29:06,998 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-06-21 00:29:07,230 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:07,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:07,397 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-21 00:29:07,440 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:07,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:07,442 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-21 00:29:07,482 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-21 00:29:07,486 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3d0df1db50> has no local changes
2025-06-21 00:29:07,486 [ 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#456 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/)'
2025-06-21 00:29:07,492 [ scc.git] DEBUG [detached HEAD 68a8dc9] merge master -Dorg -Ssuccess-only
2025-06-21 00:29:07,492 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:07,492 [ scc.repo] DEBUG ## PRs found:
2025-06-21 00:29:07,648 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:07,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-06-21 00:29:07,830 [ scc.repo] DEBUG ## Branches found:
2025-06-21 00:29:07,830 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-06-21 00:29:07,830 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:07,830 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:07,832 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-21 00:29:07,835 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-21 00:29:07,835 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-21 00:29:07,838 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-21 00:29:07,841 [ scc.git] DEBUG Already up to date.
2025-06-21 00:29:07,841 [ scc.git] DEBUG ## Unique users: []
2025-06-21 00:29:07,841 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:07,841 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:07,843 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-21 00:29:07,886 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:07,886 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:07,888 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-21 00:29:07,929 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-21 00:29:07,933 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3d0de467d0> has no local changes
2025-06-21 00:29:07,933 [ 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#456 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/)'
2025-06-21 00:29:07,939 [ scc.git] DEBUG [detached HEAD aacb72b] merge master -Dorg -Ssuccess-only
2025-06-21 00:29:07,939 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:07,939 [ scc.repo] DEBUG ## PRs found:
2025-06-21 00:29:08,081 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:08,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-06-21 00:29:08,624 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:08,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-06-21 00:29:09,124 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:09,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-06-21 00:29:09,611 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:09,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-06-21 00:29:09,830 [ scc.repo] DEBUG ## Branches found:
2025-06-21 00:29:09,830 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-06-21 00:29:09,830 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:09,830 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:09,833 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-21 00:29:09,835 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-21 00:29:09,835 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-21 00:29:09,838 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-21 00:29:09,841 [ scc.git] DEBUG Already up to date.
2025-06-21 00:29:09,841 [ scc.git] DEBUG ## Unique users: []
2025-06-21 00:29:09,841 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:09,841 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:09,843 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-21 00:29:09,885 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:09,885 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:09,887 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-21 00:29:09,926 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-21 00:29:09,930 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3d0c517850> has no local changes
2025-06-21 00:29:09,930 [ 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#456 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/)'
2025-06-21 00:29:09,936 [ scc.git] DEBUG [detached HEAD 4ddfd44] merge master -Dorg -Ssuccess-only
2025-06-21 00:29:09,936 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:09,936 [ scc.repo] DEBUG ## PRs found:
2025-06-21 00:29:10,081 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:10,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-06-21 00:29:10,597 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:10,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-06-21 00:29:11,090 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:11,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-06-21 00:29:11,577 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:11,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-06-21 00:29:12,130 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:12,341 [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-06-21 00:29:12,592 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:12,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-06-21 00:29:13,217 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:13,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-06-21 00:29:13,400 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-06-21 00:29:13,400 [ scc.repo] DEBUG ## Branches found:
2025-06-21 00:29:13,400 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-06-21 00:29:13,400 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:13,400 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:13,403 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-21 00:29:13,405 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-21 00:29:13,405 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-21 00:29:13,408 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-21 00:29:13,411 [ scc.git] DEBUG Already up to date.
2025-06-21 00:29:13,411 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-06-21 00:29:13,747 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-06-21 00:29:13,747 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-06-21 00:29:13,751 [ scc.git] DEBUG ## Unique users: []
2025-06-21 00:29:13,751 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:13,751 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:13,754 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-06-21 00:29:13,757 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:13,759 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-06-21 00:29:13,768 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-06-21 00:29:13,768 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-06-21 00:29:13,769 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-06-21 00:29:13,769 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-06-21 00:29:13,769 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-06-21 00:29:13,769 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-06-21 00:29:13,769 [ scc.git] DEBUG Auto-merging setup.py
2025-06-21 00:29:13,769 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-06-21 00:29:13,769 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-06-21 00:29:13,769 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-06-21 00:29:13,772 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-06-21 00:29:13,777 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-06-21 00:29:13,778 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:13,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:13,958 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-06-21 00:29:13,961 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-06-21 00:29:13,964 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#456](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- setup.py
- omero_signup/views.py
- omero_signup/urls.py
--conflicts
2025-06-21 00:29:13,966 [ scc.config] DEBUG Found github.token
2025-06-21 00:29:13,966 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-06-21 00:29:13,966 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-21 00:29:14,007 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:14,007 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:14,009 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-21 00:29:14,049 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-21 00:29:14,053 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3d0df46690> has no local changes
2025-06-21 00:29:14,053 [ 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#456 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/)'
2025-06-21 00:29:14,059 [ scc.git] DEBUG [detached HEAD 1816c68] merge master -Dorg -Ssuccess-only
2025-06-21 00:29:14,059 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:14,059 [ scc.repo] DEBUG ## PRs found:
2025-06-21 00:29:14,209 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:14,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-06-21 00:29:14,759 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:14,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-06-21 00:29:15,220 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:15,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-06-21 00:29:15,806 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:16,043 [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-06-21 00:29:16,294 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:16,507 [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-06-21 00:29:16,759 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:16,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-06-21 00:29:17,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:17,422 [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-06-21 00:29:17,422 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-06-21 00:29:17,673 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:17,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-06-21 00:29:18,182 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:18,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-06-21 00:29:18,652 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:18,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-06-21 00:29:19,192 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:19,447 [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-06-21 00:29:19,698 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:19,915 [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-06-21 00:29:20,166 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:20,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-06-21 00:29:20,656 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:20,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-06-21 00:29:21,130 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:21,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-06-21 00:29:21,674 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:21,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-06-21 00:29:22,126 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:22,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-06-21 00:29:22,632 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:22,867 [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-06-21 00:29:23,118 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:23,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-06-21 00:29:23,649 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:23,849 [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-06-21 00:29:23,850 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-06-21 00:29:23,850 [ scc.repo] DEBUG ## Branches found:
2025-06-21 00:29:23,850 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-06-21 00:29:23,850 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:23,850 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:23,853 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-21 00:29:23,856 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-21 00:29:23,856 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-21 00:29:23,859 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-21 00:29:23,862 [ scc.git] DEBUG Already up to date.
2025-06-21 00:29:23,862 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-06-21 00:29:24,141 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-06-21 00:29:24,141 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-06-21 00:29:24,145 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-06-21 00:29:24,501 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-06-21 00:29:24,501 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-06-21 00:29:24,506 [ scc.git] DEBUG ## Unique users: []
2025-06-21 00:29:24,506 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:24,506 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:24,508 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-06-21 00:29:24,512 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:24,515 [ 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-06-21 00:29:24,527 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-21 00:29:24,531 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-06-21 00:29:24,531 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-06-21 00:29:24,531 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-06-21 00:29:24,531 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-06-21 00:29:24,531 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-06-21 00:29:24,531 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-06-21 00:29:24,531 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-06-21 00:29:24,531 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-06-21 00:29:24,532 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:24,532 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-06-21 00:29:24,532 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-06-21 00:29:24,532 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-06-21 00:29:24,532 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-06-21 00:29:24,533 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-06-21 00:29:24,533 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-06-21 00:29:24,533 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-06-21 00:29:24,533 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-06-21 00:29:24,533 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-06-21 00:29:24,533 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-06-21 00:29:24,533 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-06-21 00:29:24,533 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-06-21 00:29:24,533 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-06-21 00:29:24,533 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-06-21 00:29:24,533 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-06-21 00:29:24,533 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-06-21 00:29:24,533 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-06-21 00:29:24,533 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-06-21 00:29:24,533 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-06-21 00:29:24,533 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-06-21 00:29:24,533 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-06-21 00:29:24,533 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-06-21 00:29:24,533 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-06-21 00:29:24,533 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-06-21 00:29:24,533 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-06-21 00:29:24,533 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-06-21 00:29:24,533 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-06-21 00:29:24,533 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-06-21 00:29:24,533 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-06-21 00:29:24,533 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-06-21 00:29:24,533 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-06-21 00:29:24,533 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-06-21 00:29:24,533 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-06-21 00:29:24,533 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-06-21 00:29:24,533 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-06-21 00:29:24,533 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-06-21 00:29:24,534 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-06-21 00:29:24,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:24,700 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-06-21 00:29:24,704 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:24,706 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-06-21 00:29:24,727 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-21 00:29:24,730 [ scc.git] DEBUG docker | 1 +
2025-06-21 00:29:24,730 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-06-21 00:29:24,951 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:25,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:25,108 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-21 00:29:25,149 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:25,149 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:25,151 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-21 00:29:25,190 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-21 00:29:25,194 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3d0c568ed0> has no local changes
2025-06-21 00:29:25,194 [ 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#456 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/)'
2025-06-21 00:29:25,201 [ scc.git] DEBUG [detached HEAD 402a6dd] merge master -Dorg -Ssuccess-only
2025-06-21 00:29:25,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:25,201 [ scc.repo] DEBUG ## PRs found:
2025-06-21 00:29:25,359 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:25,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-06-21 00:29:25,551 [ scc.repo] DEBUG ## Branches found:
2025-06-21 00:29:25,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-06-21 00:29:25,551 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:25,551 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:25,553 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-21 00:29:25,555 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-21 00:29:25,555 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-21 00:29:25,558 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-21 00:29:25,561 [ scc.git] DEBUG Already up to date.
2025-06-21 00:29:25,561 [ scc.git] DEBUG ## Unique users: []
2025-06-21 00:29:25,561 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:25,561 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:25,563 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-21 00:29:25,601 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:25,601 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:25,603 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-21 00:29:25,641 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-21 00:29:25,644 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3d0c57e250> has no local changes
2025-06-21 00:29:25,644 [ 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#456 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/)'
2025-06-21 00:29:25,650 [ scc.git] DEBUG [detached HEAD 2a6f1ab] merge master -Dorg -Ssuccess-only
2025-06-21 00:29:25,651 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:25,651 [ scc.repo] DEBUG ## PRs found:
2025-06-21 00:29:25,802 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:25,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2025-06-21 00:29:25,977 [ scc.repo] DEBUG ## Branches found:
2025-06-21 00:29:25,977 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-06-21 00:29:25,978 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:25,978 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:25,980 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-21 00:29:25,982 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-21 00:29:25,982 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-21 00:29:25,985 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-21 00:29:25,993 [ scc.git] DEBUG Updating deab817..160d894
2025-06-21 00:29:26,228 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:26,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls/20 HTTP/1.1" 200 None
2025-06-21 00:29:26,635 [ scc.git] DEBUG ## Unique users: []
2025-06-21 00:29:26,635 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:26,635 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:26,638 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-21 00:29:26,679 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:26,679 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:26,681 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-21 00:29:26,721 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-21 00:29:26,724 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3d0df30a50> has no local changes
2025-06-21 00:29:26,724 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-virtual-microscope
Updating deab817..160d894
Previously merged:
- PR 20 jburel 'Build'
Generated by OMERO-plugins-push#456 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/)'
2025-06-21 00:29:26,730 [ scc.git] DEBUG [detached HEAD f2a4641] merge master -Dorg -Ssuccess-only
2025-06-21 00:29:26,731 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:26,731 [ scc.git] INFO Overriding base-branch from master to main
2025-06-21 00:29:26,731 [ scc.repo] DEBUG ## PRs found:
2025-06-21 00:29:26,885 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:27,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-06-21 00:29:27,402 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:27,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-06-21 00:29:27,857 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:28,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-06-21 00:29:28,303 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:28,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-06-21 00:29:28,846 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:29,147 [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-06-21 00:29:29,399 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:29,611 [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-06-21 00:29:29,863 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:30,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-06-21 00:29:30,325 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:30,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-06-21 00:29:30,786 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:31,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-06-21 00:29:31,281 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:31,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-06-21 00:29:31,787 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:31,986 [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-06-21 00:29:32,237 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:32,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-06-21 00:29:32,796 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:32,993 [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-06-21 00:29:32,994 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-06-21 00:29:32,994 [ scc.repo] DEBUG ## Branches found:
2025-06-21 00:29:32,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-06-21 00:29:32,994 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:32,994 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:32,997 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-06-21 00:29:32,999 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-21 00:29:32,999 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-06-21 00:29:33,002 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-06-21 00:29:33,005 [ scc.git] DEBUG Already up to date.
2025-06-21 00:29:33,005 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-06-21 00:29:33,300 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-06-21 00:29:33,301 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-06-21 00:29:33,305 [ scc.git] DEBUG ## Unique users: []
2025-06-21 00:29:33,305 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:33,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:33,308 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-06-21 00:29:33,311 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:33,313 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-06-21 00:29:33,321 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-06-21 00:29:33,321 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-06-21 00:29:33,321 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-06-21 00:29:33,322 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-06-21 00:29:33,324 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-06-21 00:29:33,329 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-06-21 00:29:33,330 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:33,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:33,493 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-06-21 00:29:33,496 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-06-21 00:29:33,499 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#456](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-06-21 00:29:33,501 [ scc.config] DEBUG Found github.token
2025-06-21 00:29:33,501 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-06-21 00:29:33,501 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-21 00:29:33,540 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:33,540 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:33,542 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-21 00:29:33,580 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-21 00:29:33,583 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3d0c519510> has no local changes
2025-06-21 00:29:33,583 [ 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#456 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/)'
2025-06-21 00:29:33,589 [ scc.git] DEBUG [detached HEAD 2e09b5f] merge master -Dorg -Ssuccess-only
2025-06-21 00:29:33,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:33,590 [ scc.repo] DEBUG ## PRs found:
2025-06-21 00:29:33,744 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:33,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-06-21 00:29:33,926 [ scc.repo] DEBUG ## Branches found:
2025-06-21 00:29:33,927 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-06-21 00:29:33,927 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:33,927 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:33,929 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-21 00:29:33,931 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-21 00:29:33,931 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-21 00:29:33,934 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-21 00:29:33,937 [ scc.git] DEBUG Already up to date.
2025-06-21 00:29:33,937 [ scc.git] DEBUG ## Unique users: []
2025-06-21 00:29:33,937 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:33,937 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:33,939 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-21 00:29:33,978 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:33,978 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:33,981 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-21 00:29:34,020 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-21 00:29:34,024 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3d0c568550> has no local changes
2025-06-21 00:29:34,024 [ 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#456 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/)'
2025-06-21 00:29:34,030 [ scc.git] DEBUG [detached HEAD 45f743c] merge master -Dorg -Ssuccess-only
2025-06-21 00:29:34,030 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:34,030 [ scc.repo] DEBUG ## PRs found:
2025-06-21 00:29:34,178 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:34,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-06-21 00:29:34,366 [ scc.repo] DEBUG ## Branches found:
2025-06-21 00:29:34,366 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-06-21 00:29:34,366 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:34,366 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:34,368 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-21 00:29:34,370 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-21 00:29:34,370 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-21 00:29:34,373 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-21 00:29:34,376 [ scc.git] DEBUG Already up to date.
2025-06-21 00:29:34,377 [ scc.git] DEBUG ## Unique users: []
2025-06-21 00:29:34,377 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:34,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:34,379 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-21 00:29:34,417 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:34,417 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:34,419 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-21 00:29:34,457 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-21 00:29:34,461 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3d0dea7890> has no local changes
2025-06-21 00:29:34,461 [ 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#456 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/)'
2025-06-21 00:29:34,467 [ scc.git] DEBUG [detached HEAD d9e2431] merge master -Dorg -Ssuccess-only
2025-06-21 00:29:34,467 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:34,467 [ scc.repo] DEBUG ## PRs found:
2025-06-21 00:29:34,617 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:34,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-06-21 00:29:35,130 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:35,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-06-21 00:29:35,614 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:35,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-06-21 00:29:36,083 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:36,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-06-21 00:29:36,645 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:36,856 [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-06-21 00:29:37,107 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:37,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-06-21 00:29:37,635 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:37,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-06-21 00:29:37,806 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-06-21 00:29:37,806 [ scc.repo] DEBUG ## Branches found:
2025-06-21 00:29:37,806 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-06-21 00:29:37,806 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:37,806 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:37,809 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-21 00:29:37,811 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-21 00:29:37,811 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-21 00:29:37,814 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-21 00:29:37,817 [ scc.git] DEBUG Already up to date.
2025-06-21 00:29:37,817 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-06-21 00:29:38,121 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-06-21 00:29:38,121 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-06-21 00:29:38,125 [ scc.git] DEBUG ## Unique users: []
2025-06-21 00:29:38,125 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:38,125 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:38,128 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-06-21 00:29:38,131 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:38,133 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-06-21 00:29:38,143 [ scc.git] DEBUG Auto-merging Dockerfile
2025-06-21 00:29:38,143 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-06-21 00:29:38,143 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-06-21 00:29:38,143 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-06-21 00:29:38,146 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-06-21 00:29:38,151 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-06-21 00:29:38,153 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:38,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:38,320 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-06-21 00:29:38,323 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-06-21 00:29:38,326 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#456](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-06-21 00:29:38,328 [ scc.config] DEBUG Found github.token
2025-06-21 00:29:38,328 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-06-21 00:29:38,328 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-21 00:29:38,370 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:38,370 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:38,372 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-21 00:29:38,410 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-21 00:29:38,414 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3d0df45b10> has no local changes
2025-06-21 00:29:38,414 [ 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#456 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/)'
2025-06-21 00:29:38,420 [ scc.git] DEBUG [detached HEAD 81ff39a] merge master -Dorg -Ssuccess-only
2025-06-21 00:29:38,421 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:38,421 [ scc.git] INFO Overriding base-branch from master to develop
2025-06-21 00:29:38,421 [ scc.repo] DEBUG ## PRs found:
2025-06-21 00:29:38,571 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:38,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-06-21 00:29:39,177 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:39,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-06-21 00:29:39,642 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:39,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-06-21 00:29:40,142 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:40,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-06-21 00:29:40,660 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:40,889 [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-06-21 00:29:41,140 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:41,372 [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-06-21 00:29:41,623 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:41,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-06-21 00:29:42,137 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:42,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-06-21 00:29:42,322 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-06-21 00:29:42,573 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:42,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-06-21 00:29:43,063 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:43,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-06-21 00:29:43,530 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:43,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-06-21 00:29:43,976 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:44,162 [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-06-21 00:29:44,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:44,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-06-21 00:29:44,851 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:45,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-06-21 00:29:45,025 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-06-21 00:29:45,276 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:45,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-06-21 00:29:45,789 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:46,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-06-21 00:29:46,282 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:46,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-06-21 00:29:46,803 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:47,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-06-21 00:29:47,051 [ scc.repo] DEBUG ## Branches found:
2025-06-21 00:29:47,051 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-06-21 00:29:47,051 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:47,051 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:47,054 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-06-21 00:29:47,056 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-21 00:29:47,056 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-06-21 00:29:47,060 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-06-21 00:29:47,071 [ scc.git] DEBUG Updating 4b4c755..573db34
2025-06-21 00:29:47,301 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:47,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/227 HTTP/1.1" 200 None
2025-06-21 00:29:47,949 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:48,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-06-21 00:29:48,370 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-06-21 00:29:48,697 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-06-21 00:29:48,697 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-06-21 00:29:48,702 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-06-21 00:29:49,000 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-06-21 00:29:49,000 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-06-21 00:29:49,004 [ scc.git] DEBUG ## Unique users: []
2025-06-21 00:29:49,004 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:49,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:49,006 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-06-21 00:29:49,012 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:49,014 [ 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-06-21 00:29:49,025 [ 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-06-21 00:29:49,026 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-06-21 00:29:49,026 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-06-21 00:29:49,029 [ scc.git] DEBUG Calling 'git reset --hard 573db340d5d1429fa17c7e486206948412a7c150'
2025-06-21 00:29:49,033 [ scc.git] DEBUG HEAD is now at 573db34 Bump version: 5.9.1 → 5.9.2.dev0
2025-06-21 00:29:49,034 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:49,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:49,195 [ scc.git] DEBUG Calling 'git merge-base 573db340d5d1429fa17c7e486206948412a7c150 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-06-21 00:29:49,200 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..573db340d5d1429fa17c7e486206948412a7c150'
2025-06-21 00:29:49,204 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#456](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-06-21 00:29:49,207 [ scc.config] DEBUG Found github.token
2025-06-21 00:29:49,207 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-06-21 00:29:49,207 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-06-21 00:29:49,211 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:49,214 [ 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-06-21 00:29:49,224 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-21 00:29:49,228 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-06-21 00:29:49,228 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-06-21 00:29:49,446 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:49,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:49,604 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-21 00:29:49,645 [ scc.git] DEBUG Get sha1 of %s
2025-06-21 00:29:49,645 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-21 00:29:49,647 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-21 00:29:49,686 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-21 00:29:49,690 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3d0de9b690> has no local changes
2025-06-21 00:29:49,690 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..573db34
Previously merged:
- PR 227 jburel 'Replace tostring by tobytes'
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#456 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/)'
2025-06-21 00:29:49,696 [ scc.git] DEBUG [detached HEAD c8a0cb0] merge master -Dorg -Ssuccess-only
2025-06-21 00:29:49,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:49,697 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-21 00:29:49,774 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-06-21 00:29:49,855 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:50,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:50,021 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-06-21 00:29:50,023 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-06-21 00:29:50,267 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:50,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:50,430 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-06-21 00:29:50,432 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-06-21 00:29:50,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:50,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:50,836 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-06-21 00:29:50,838 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-06-21 00:29:51,083 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:51,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:51,261 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-06-21 00:29:51,506 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:51,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:51,671 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-06-21 00:29:51,673 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-06-21 00:29:51,917 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:52,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:52,081 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-06-21 00:29:52,083 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-06-21 00:29:52,327 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:52,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:52,503 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-06-21 00:29:52,505 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-06-21 00:29:52,749 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:52,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:52,914 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-06-21 00:29:52,916 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-06-21 00:29:53,160 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:53,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:53,336 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-06-21 00:29:53,338 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-06-21 00:29:53,583 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:53,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:53,765 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-06-21 00:29:53,767 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-06-21 00:29:54,011 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:54,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:54,180 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-06-21 00:29:54,182 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-06-21 00:29:54,426 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:54,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:54,593 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-06-21 00:29:54,595 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-06-21 00:29:54,839 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:55,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:55,010 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-06-21 00:29:55,255 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:55,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:55,418 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-06-21 00:29:55,663 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:55,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:55,824 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-06-21 00:29:55,826 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-06-21 00:29:56,071 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:56,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:56,233 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-06-21 00:29:56,478 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:56,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:56,638 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-06-21 00:29:56,882 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:57,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:57,044 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-06-21 00:29:57,046 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-06-21 00:29:57,290 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:57,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:57,460 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-06-21 00:29:57,462 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-06-21 00:29:57,706 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:57,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:57,870 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-06-21 00:29:57,872 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-06-21 00:29:58,117 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:58,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:58,280 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-06-21 00:29:58,282 [ scc.config] DEBUG Found submodule.scripts.url
2025-06-21 00:29:58,527 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-21 00:29:58,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-21 00:29:58,701 [ scc.config] DEBUG Found submodule.scripts.branch
2025-06-21 00:29:58,702 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-21 00:29:58,789 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3d0de7b390> has local changes
2025-06-21 00:29:58,789 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
- PR 71 dominikl 'Escape slash character in image names'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 174 will-moore 'Skip wells' (stage: draft)
- PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 167 dominikl 'Add extinfo command' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
Updating 11d3587..64321ac
Previously merged:
- PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
- PR 147 will-moore 'Name option'
- PR 173 will-moore 'Add test_export_plate_polygons()'
- PR 171 will-moore 'Initial addition of integration tests'
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 177 jburel 'Replace fromstring by frombuffer'
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)
Updating 7a798ce..bb94cf8
Previously merged:
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 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
Updating deab817..160d894
Previously merged:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..573db34
Previously merged:
- PR 227 jburel 'Replace tostring by tobytes'
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#456 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/456/)'
2025-06-21 00:29:58,802 [ scc.git] DEBUG [detached HEAD 86a7f21] merge master -Dorg -Ssuccess-only
2025-06-21 00:29:58,802 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-06-21 00:29:58,802 [ scc.merge] INFO Repository: ome/omero-plugins
2025-06-21 00:29:58,802 [ scc.merge] INFO Already up to date.
2025-06-21 00:29:58,802 [ scc.merge] INFO
2025-06-21 00:29:58,802 [ scc.merge] INFO Merged PRs:
2025-06-21 00:29:58,802 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-06-21 00:29:58,802 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-06-21 00:29:58,802 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-06-21 00:29:58,802 [ scc.merge] INFO
2025-06-21 00:29:58,802 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-06-21 00:29:58,802 [ scc.merge] INFO Already up to date.
2025-06-21 00:29:58,802 [ scc.merge] INFO
2025-06-21 00:29:58,802 [ scc.merge] INFO
2025-06-21 00:29:58,802 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-06-21 00:29:58,802 [ scc.merge] INFO Excluded PRs:
2025-06-21 00:29:58,802 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-06-21 00:29:58,802 [ scc.merge] INFO Already up to date.
2025-06-21 00:29:58,802 [ scc.merge] INFO
2025-06-21 00:29:58,802 [ scc.merge] INFO
2025-06-21 00:29:58,802 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-06-21 00:29:58,803 [ scc.merge] INFO Excluded PRs:
2025-06-21 00:29:58,803 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-06-21 00:29:58,803 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-06-21 00:29:58,803 [ scc.merge] INFO Already up to date.
2025-06-21 00:29:58,803 [ scc.merge] INFO
2025-06-21 00:29:58,803 [ scc.merge] INFO Merged PRs:
2025-06-21 00:29:58,803 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-06-21 00:29:58,803 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-06-21 00:29:58,803 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-06-21 00:29:58,803 [ scc.merge] INFO
2025-06-21 00:29:58,803 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-06-21 00:29:58,803 [ scc.merge] INFO Excluded PRs:
2025-06-21 00:29:58,803 [ scc.merge] INFO - PR 174 will-moore 'Skip wells' (stage: draft)
2025-06-21 00:29:58,803 [ scc.merge] INFO - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
2025-06-21 00:29:58,803 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-06-21 00:29:58,803 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-06-21 00:29:58,803 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-06-21 00:29:58,803 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-06-21 00:29:58,803 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-06-21 00:29:58,803 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-06-21 00:29:58,803 [ scc.merge] INFO Updating 11d3587..64321ac
2025-06-21 00:29:58,803 [ scc.merge] INFO Previously merged:
2025-06-21 00:29:58,803 [ scc.merge] INFO - PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
2025-06-21 00:29:58,803 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-06-21 00:29:58,803 [ scc.merge] INFO - PR 173 will-moore 'Add test_export_plate_polygons()'
2025-06-21 00:29:58,803 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-06-21 00:29:58,803 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-21 00:29:58,803 [ scc.merge] INFO
2025-06-21 00:29:58,803 [ scc.merge] INFO Merged PRs:
2025-06-21 00:29:58,803 [ scc.merge] INFO - PR 177 jburel 'Replace fromstring by frombuffer'
2025-06-21 00:29:58,803 [ scc.merge] INFO
2025-06-21 00:29:58,803 [ scc.merge] INFO Repository: ome/omero-figure
2025-06-21 00:29:58,803 [ scc.merge] INFO Excluded PRs:
2025-06-21 00:29:58,803 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-06-21 00:29:58,803 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-06-21 00:29:58,803 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-06-21 00:29:58,803 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-06-21 00:29:58,803 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-06-21 00:29:58,803 [ scc.merge] INFO Previously merged:
2025-06-21 00:29:58,803 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-06-21 00:29:58,804 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-06-21 00:29:58,804 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-06-21 00:29:58,804 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-21 00:29:58,804 [ scc.merge] INFO
2025-06-21 00:29:58,804 [ scc.merge] INFO Merged PRs:
2025-06-21 00:29:58,804 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-06-21 00:29:58,804 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-06-21 00:29:58,804 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-06-21 00:29:58,804 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-06-21 00:29:58,804 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-06-21 00:29:58,804 [ scc.merge] INFO
2025-06-21 00:29:58,804 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-21 00:29:58,804 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-06-21 00:29:58,804 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-06-21 00:29:58,804 [ scc.merge] INFO
2025-06-21 00:29:58,804 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-06-21 00:29:58,804 [ scc.merge] INFO Already up to date.
2025-06-21 00:29:58,804 [ scc.merge] INFO
2025-06-21 00:29:58,804 [ scc.merge] INFO Merged PRs:
2025-06-21 00:29:58,804 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-06-21 00:29:58,804 [ scc.merge] INFO
2025-06-21 00:29:58,804 [ scc.merge] INFO Repository: ome/omero-gallery
2025-06-21 00:29:58,804 [ scc.merge] INFO Already up to date.
2025-06-21 00:29:58,804 [ scc.merge] INFO
2025-06-21 00:29:58,804 [ scc.merge] INFO Merged PRs:
2025-06-21 00:29:58,804 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-06-21 00:29:58,804 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-06-21 00:29:58,804 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-06-21 00:29:58,804 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-06-21 00:29:58,804 [ scc.merge] INFO
2025-06-21 00:29:58,804 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-21 00:29:58,804 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-06-21 00:29:58,804 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-06-21 00:29:58,804 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-06-21 00:29:58,804 [ scc.merge] INFO
2025-06-21 00:29:58,804 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-06-21 00:29:58,804 [ scc.merge] INFO Excluded PRs:
2025-06-21 00:29:58,804 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-06-21 00:29:58,804 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-06-21 00:29:58,804 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-06-21 00:29:58,804 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-06-21 00:29:58,805 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-06-21 00:29:58,805 [ scc.merge] INFO Updating 7a798ce..bb94cf8
2025-06-21 00:29:58,805 [ scc.merge] INFO Previously merged:
2025-06-21 00:29:58,805 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-21 00:29:58,805 [ scc.merge] INFO
2025-06-21 00:29:58,805 [ scc.merge] INFO Merged PRs:
2025-06-21 00:29:58,805 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-06-21 00:29:58,805 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-06-21 00:29:58,805 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-06-21 00:29:58,805 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-06-21 00:29:58,805 [ scc.merge] INFO
2025-06-21 00:29:58,805 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-21 00:29:58,805 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-06-21 00:29:58,805 [ scc.merge] INFO
2025-06-21 00:29:58,805 [ scc.merge] INFO Repository: ome/omero-mapr
2025-06-21 00:29:58,805 [ scc.merge] INFO Excluded PRs:
2025-06-21 00:29:58,805 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-06-21 00:29:58,805 [ scc.merge] INFO Already up to date.
2025-06-21 00:29:58,805 [ scc.merge] INFO
2025-06-21 00:29:58,805 [ scc.merge] INFO Merged PRs:
2025-06-21 00:29:58,805 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-06-21 00:29:58,805 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-21 00:29:58,805 [ scc.merge] INFO
2025-06-21 00:29:58,805 [ scc.merge] INFO Repository: ome/omero-metadata
2025-06-21 00:29:58,805 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-06-21 00:29:58,805 [ scc.merge] INFO Previously merged:
2025-06-21 00:29:58,805 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-21 00:29:58,805 [ scc.merge] INFO
2025-06-21 00:29:58,805 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-21 00:29:58,805 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-06-21 00:29:58,805 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-06-21 00:29:58,805 [ scc.merge] INFO
2025-06-21 00:29:58,805 [ scc.merge] INFO Repository: ome/omero-parade
2025-06-21 00:29:58,805 [ scc.merge] INFO Excluded PRs:
2025-06-21 00:29:58,805 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-06-21 00:29:58,805 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-06-21 00:29:58,805 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-06-21 00:29:58,805 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-06-21 00:29:58,805 [ scc.merge] INFO Already up to date.
2025-06-21 00:29:58,805 [ scc.merge] INFO
2025-06-21 00:29:58,805 [ scc.merge] INFO Merged PRs:
2025-06-21 00:29:58,806 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-06-21 00:29:58,806 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-06-21 00:29:58,806 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-21 00:29:58,806 [ scc.merge] INFO
2025-06-21 00:29:58,806 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-06-21 00:29:58,806 [ scc.merge] INFO Already up to date.
2025-06-21 00:29:58,806 [ scc.merge] INFO
2025-06-21 00:29:58,806 [ scc.merge] INFO
2025-06-21 00:29:58,806 [ scc.merge] INFO Repository: ome/omero-rois
2025-06-21 00:29:58,806 [ scc.merge] INFO Excluded PRs:
2025-06-21 00:29:58,806 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-06-21 00:29:58,806 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-06-21 00:29:58,806 [ scc.merge] INFO Already up to date.
2025-06-21 00:29:58,806 [ scc.merge] INFO
2025-06-21 00:29:58,806 [ scc.merge] INFO
2025-06-21 00:29:58,806 [ scc.merge] INFO Repository: ome/omero-signup
2025-06-21 00:29:58,806 [ scc.merge] INFO Already up to date.
2025-06-21 00:29:58,806 [ scc.merge] INFO
2025-06-21 00:29:58,806 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-21 00:29:58,806 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-06-21 00:29:58,806 [ scc.merge] INFO
2025-06-21 00:29:58,806 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-06-21 00:29:58,806 [ scc.merge] INFO Excluded PRs:
2025-06-21 00:29:58,806 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-06-21 00:29:58,806 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-06-21 00:29:58,806 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-06-21 00:29:58,806 [ scc.merge] INFO Already up to date.
2025-06-21 00:29:58,806 [ scc.merge] INFO
2025-06-21 00:29:58,806 [ scc.merge] INFO Merged PRs:
2025-06-21 00:29:58,806 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-06-21 00:29:58,806 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-06-21 00:29:58,806 [ scc.merge] INFO
2025-06-21 00:29:58,806 [ scc.merge] INFO Repository: ome/omero-upload
2025-06-21 00:29:58,806 [ scc.merge] INFO Already up to date.
2025-06-21 00:29:58,806 [ scc.merge] INFO
2025-06-21 00:29:58,806 [ scc.merge] INFO
2025-06-21 00:29:58,806 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-06-21 00:29:58,806 [ scc.merge] INFO Updating deab817..160d894
2025-06-21 00:29:58,806 [ scc.merge] INFO Previously merged:
2025-06-21 00:29:58,806 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-06-21 00:29:58,806 [ scc.merge] INFO
2025-06-21 00:29:58,807 [ scc.merge] INFO
2025-06-21 00:29:58,807 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-06-21 00:29:58,807 [ scc.merge] INFO Excluded PRs:
2025-06-21 00:29:58,807 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-06-21 00:29:58,807 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-06-21 00:29:58,807 [ scc.merge] INFO Already up to date.
2025-06-21 00:29:58,807 [ scc.merge] INFO
2025-06-21 00:29:58,807 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-21 00:29:58,807 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-06-21 00:29:58,807 [ scc.merge] INFO
2025-06-21 00:29:58,807 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-06-21 00:29:58,807 [ scc.merge] INFO Already up to date.
2025-06-21 00:29:58,807 [ scc.merge] INFO
2025-06-21 00:29:58,807 [ scc.merge] INFO
2025-06-21 00:29:58,807 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-06-21 00:29:58,807 [ scc.merge] INFO Already up to date.
2025-06-21 00:29:58,807 [ scc.merge] INFO
2025-06-21 00:29:58,807 [ scc.merge] INFO
2025-06-21 00:29:58,807 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-06-21 00:29:58,807 [ scc.merge] INFO Already up to date.
2025-06-21 00:29:58,807 [ scc.merge] INFO
2025-06-21 00:29:58,807 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-21 00:29:58,807 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-06-21 00:29:58,807 [ scc.merge] INFO
2025-06-21 00:29:58,807 [ scc.merge] INFO Repository: ome/scripts
2025-06-21 00:29:58,807 [ scc.merge] INFO Excluded PRs:
2025-06-21 00:29:58,807 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-06-21 00:29:58,807 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-06-21 00:29:58,807 [ scc.merge] INFO Updating 4b4c755..573db34
2025-06-21 00:29:58,807 [ scc.merge] INFO Previously merged:
2025-06-21 00:29:58,807 [ scc.merge] INFO - PR 227 jburel 'Replace tostring by tobytes'
2025-06-21 00:29:58,807 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-06-21 00:29:58,807 [ scc.merge] INFO
2025-06-21 00:29:58,807 [ scc.merge] INFO Merged PRs:
2025-06-21 00:29:58,807 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-06-21 00:29:58,807 [ scc.merge] INFO
2025-06-21 00:29:58,807 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-21 00:29:58,807 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-06-21 00:29:58,807 [ scc.merge] INFO
2025-06-21 00:29:58,807 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-06-21 00:29:58,808 [ scc.git] DEBUG Calling 'git remote'
2025-06-21 00:29:58,810 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-06-21 00:29:58,810 [ scc.git] DEBUG Calling 'git remote'
2025-06-21 00:29:58,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:58,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-06-21 00:29:58,812 [ scc.git] DEBUG Calling 'git remote'
2025-06-21 00:29:58,814 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:58,814 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-06-21 00:29:58,814 [ scc.git] DEBUG Calling 'git remote'
2025-06-21 00:29:58,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:58,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-06-21 00:29:58,816 [ scc.git] DEBUG Calling 'git remote'
2025-06-21 00:29:58,818 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:58,818 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-06-21 00:29:58,818 [ scc.git] DEBUG Calling 'git remote'
2025-06-21 00:29:58,821 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:58,821 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-06-21 00:29:58,821 [ scc.git] DEBUG Calling 'git remote'
2025-06-21 00:29:58,823 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:58,823 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-06-21 00:29:58,823 [ scc.git] DEBUG Calling 'git remote'
2025-06-21 00:29:58,825 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:58,825 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-06-21 00:29:58,825 [ scc.git] DEBUG Calling 'git remote'
2025-06-21 00:29:58,827 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:58,827 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-06-21 00:29:58,827 [ scc.git] DEBUG Calling 'git remote'
2025-06-21 00:29:58,829 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:58,829 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-06-21 00:29:58,829 [ scc.git] DEBUG Calling 'git remote'
2025-06-21 00:29:58,832 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:58,832 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-06-21 00:29:58,832 [ scc.git] DEBUG Calling 'git remote'
2025-06-21 00:29:58,834 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:58,834 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-06-21 00:29:58,834 [ scc.git] DEBUG Calling 'git remote'
2025-06-21 00:29:58,836 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:58,836 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-06-21 00:29:58,836 [ scc.git] DEBUG Calling 'git remote'
2025-06-21 00:29:58,838 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:58,838 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-06-21 00:29:58,839 [ scc.git] DEBUG Calling 'git remote'
2025-06-21 00:29:58,841 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:58,841 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-06-21 00:29:58,841 [ scc.git] DEBUG Calling 'git remote'
2025-06-21 00:29:58,843 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:58,843 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-06-21 00:29:58,843 [ scc.git] DEBUG Calling 'git remote'
2025-06-21 00:29:58,845 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:58,845 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-06-21 00:29:58,845 [ scc.git] DEBUG Calling 'git remote'
2025-06-21 00:29:58,848 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:58,848 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-06-21 00:29:58,848 [ scc.git] DEBUG Calling 'git remote'
2025-06-21 00:29:58,850 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:58,850 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-06-21 00:29:58,850 [ scc.git] DEBUG Calling 'git remote'
2025-06-21 00:29:58,852 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:58,852 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-06-21 00:29:58,852 [ scc.git] DEBUG Calling 'git remote'
2025-06-21 00:29:58,854 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:58,854 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-06-21 00:29:58,854 [ scc.git] DEBUG Calling 'git remote'
2025-06-21 00:29:58,856 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-21 00:29:58,856 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-06-21 00:29:58,856 [ scc.git] DEBUG Calling 'git remote'
2025-06-21 00:29:58,859 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.10.0 to 5.10.4-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD 5548fc3] 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 416c81f] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-06-21 00:30:46,201 [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-06-21 00:30:55,604 [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-06-21 00:30:58,127 [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-06-21 00:31:03,166 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-06-21 00:31:44,278 [ 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/eb00aee0/images/svgs/logo.svg){kind=logo}
