Skipping 217 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-07-22 00:30:13,769 [ scc.git] DEBUG Calling 'git merge-base bb94cf8da960e3283090038b04432f301560f5e4 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-07-22 00:30:13,772 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..bb94cf8da960e3283090038b04432f301560f5e4'
2025-07-22 00:30:13,776 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#484](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-07-22 00:30:13,778 [ scc.config] DEBUG Found github.token
2025-07-22 00:30:13,778 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-07-22 00:30:13,778 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-22 00:30:13,819 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:30:13,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:13,822 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-22 00:30:13,862 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-22 00:30:13,869 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3285a2e190> has no local changes
2025-07-22 00:30:13,869 [ 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#484 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/)'
2025-07-22 00:30:13,879 [ scc.git] DEBUG [detached HEAD 81296bf] merge master -Dorg -Ssuccess-only
2025-07-22 00:30:13,879 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:30:13,879 [ scc.repo] DEBUG ## PRs found:
2025-07-22 00:30:14,020 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:14,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-07-22 00:30:14,571 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:14,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-07-22 00:30:15,056 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:15,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-07-22 00:30:15,570 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:15,793 [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-07-22 00:30:16,044 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:16,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-07-22 00:30:16,568 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:16,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-07-22 00:30:16,774 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-22 00:30:17,025 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:17,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-07-22 00:30:17,515 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:17,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-07-22 00:30:18,002 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:18,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-07-22 00:30:18,523 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:18,766 [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-07-22 00:30:19,018 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:19,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-07-22 00:30:19,470 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:19,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-07-22 00:30:19,641 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-07-22 00:30:19,641 [ scc.repo] DEBUG ## Branches found:
2025-07-22 00:30:19,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-07-22 00:30:19,641 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:30:19,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:19,644 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-22 00:30:19,646 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-22 00:30:19,646 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-22 00:30:19,649 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-22 00:30:19,652 [ scc.git] DEBUG Already up to date.
2025-07-22 00:30:19,652 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-07-22 00:30:19,938 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-07-22 00:30:19,938 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-07-22 00:30:19,942 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-07-22 00:30:20,222 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-07-22 00:30:20,222 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-07-22 00:30:20,226 [ scc.git] DEBUG ## Unique users: []
2025-07-22 00:30:20,226 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:30:20,226 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:20,229 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-07-22 00:30:20,233 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:20,235 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-07-22 00:30:20,245 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-22 00:30:20,248 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-07-22 00:30:20,248 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-07-22 00:30:20,248 [ scc.git] DEBUG requirements.txt | 2 +-
2025-07-22 00:30:20,248 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-07-22 00:30:20,248 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-07-22 00:30:20,248 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-07-22 00:30:20,250 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:20,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:30:20,426 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-07-22 00:30:20,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:20,432 [ 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-07-22 00:30:20,442 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-22 00:30:20,445 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-07-22 00:30:20,445 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-07-22 00:30:20,676 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:20,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:30:20,861 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-22 00:30:20,902 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:30:20,902 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:20,904 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-22 00:30:20,945 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-22 00:30:20,949 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3285a2ca10> has no local changes
2025-07-22 00:30:20,949 [ 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#484 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/)'
2025-07-22 00:30:20,956 [ scc.git] DEBUG [detached HEAD fd6c33f] merge master -Dorg -Ssuccess-only
2025-07-22 00:30:20,956 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:30:20,956 [ scc.repo] DEBUG ## PRs found:
2025-07-22 00:30:21,112 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:21,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-07-22 00:30:21,676 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:21,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-07-22 00:30:22,164 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:22,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-07-22 00:30:22,649 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:22,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-07-22 00:30:23,183 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:23,457 [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-07-22 00:30:23,709 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:23,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-07-22 00:30:24,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:24,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-07-22 00:30:24,454 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-07-22 00:30:24,705 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:24,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-07-22 00:30:25,203 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:25,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-07-22 00:30:25,706 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:25,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-07-22 00:30:26,238 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:26,470 [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-07-22 00:30:26,722 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:26,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-07-22 00:30:27,236 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:27,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-07-22 00:30:27,442 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-07-22 00:30:27,442 [ scc.repo] DEBUG ## Branches found:
2025-07-22 00:30:27,442 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-07-22 00:30:27,442 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:30:27,442 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:27,445 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-22 00:30:27,447 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-22 00:30:27,447 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-22 00:30:27,450 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-22 00:30:27,458 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-07-22 00:30:27,693 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:28,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-07-22 00:30:28,152 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-07-22 00:30:28,441 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-07-22 00:30:28,441 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-07-22 00:30:28,445 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-07-22 00:30:28,733 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-07-22 00:30:28,733 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-07-22 00:30:28,737 [ scc.git] DEBUG ## Unique users: []
2025-07-22 00:30:28,737 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:30:28,737 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:28,740 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-07-22 00:30:28,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:28,747 [ 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-07-22 00:30:28,761 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-07-22 00:30:28,761 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-07-22 00:30:28,761 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-07-22 00:30:28,761 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-07-22 00:30:28,761 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-22 00:30:28,761 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-22 00:30:28,764 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-22 00:30:28,769 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-07-22 00:30:28,770 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:28,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:30:28,937 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-07-22 00:30:28,942 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-22 00:30:28,945 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#484](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-07-22 00:30:28,947 [ scc.config] DEBUG Found github.token
2025-07-22 00:30:28,947 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-07-22 00:30:28,947 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-07-22 00:30:28,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:28,954 [ 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-07-22 00:30:28,969 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-07-22 00:30:28,969 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-07-22 00:30:28,969 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-07-22 00:30:28,969 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-22 00:30:28,970 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-22 00:30:28,973 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-22 00:30:28,978 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-07-22 00:30:29,188 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:29,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:30:29,368 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-07-22 00:30:29,372 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-22 00:30:29,375 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#484](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/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-07-22 00:30:29,377 [ scc.config] DEBUG Found github.token
2025-07-22 00:30:29,377 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-07-22 00:30:29,378 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-22 00:30:29,418 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:30:29,418 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:29,420 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-22 00:30:29,458 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-22 00:30:29,463 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3286be8190> has no local changes
2025-07-22 00:30:29,463 [ 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#484 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/)'
2025-07-22 00:30:29,469 [ scc.git] DEBUG [detached HEAD 82f51bd] merge master -Dorg -Ssuccess-only
2025-07-22 00:30:29,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:30:29,469 [ scc.repo] DEBUG ## PRs found:
2025-07-22 00:30:29,619 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:29,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-07-22 00:30:30,195 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:30,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-07-22 00:30:30,692 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:30,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-07-22 00:30:31,220 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:31,495 [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-07-22 00:30:31,746 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:31,984 [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-07-22 00:30:32,235 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:32,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-07-22 00:30:32,700 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:32,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-07-22 00:30:32,886 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-22 00:30:33,137 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:33,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-07-22 00:30:33,366 [ scc.repo] DEBUG # ... Include label: dependencies
2025-07-22 00:30:33,617 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:33,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-07-22 00:30:34,171 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:34,443 [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-07-22 00:30:34,694 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:34,979 [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-07-22 00:30:35,231 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:35,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-07-22 00:30:35,729 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:35,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-07-22 00:30:35,910 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-07-22 00:30:36,161 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:36,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-07-22 00:30:36,409 [ scc.repo] DEBUG # ... Include label: dependencies
2025-07-22 00:30:36,660 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:36,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-07-22 00:30:37,198 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:37,478 [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-07-22 00:30:37,729 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:38,014 [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-07-22 00:30:38,265 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:38,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-07-22 00:30:38,848 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:39,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-07-22 00:30:39,027 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-07-22 00:30:39,278 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:39,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-07-22 00:30:39,761 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:40,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-07-22 00:30:40,262 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:40,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-07-22 00:30:40,728 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:40,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-07-22 00:30:41,201 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:41,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-07-22 00:30:41,669 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:41,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-07-22 00:30:42,214 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:42,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-07-22 00:30:42,468 [ scc.repo] DEBUG ## Branches found:
2025-07-22 00:30:42,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-07-22 00:30:42,469 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:30:42,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:42,471 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-22 00:30:42,474 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-22 00:30:42,474 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-22 00:30:42,477 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-22 00:30:42,480 [ scc.git] DEBUG Already up to date.
2025-07-22 00:30:42,480 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-07-22 00:30:42,763 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-07-22 00:30:42,763 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-07-22 00:30:42,768 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-07-22 00:30:43,041 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-07-22 00:30:43,041 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-07-22 00:30:43,045 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-07-22 00:30:43,330 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-07-22 00:30:43,330 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-07-22 00:30:43,334 [ scc.git] DEBUG ## Unique users: []
2025-07-22 00:30:43,334 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:30:43,334 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:43,336 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-07-22 00:30:43,339 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:43,342 [ 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-07-22 00:30:43,350 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-22 00:30:43,354 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-07-22 00:30:43,354 [ scc.git] DEBUG package.json | 2 +-
2025-07-22 00:30:43,354 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-07-22 00:30:43,355 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:43,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:30:43,536 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-07-22 00:30:43,539 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:43,542 [ 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-07-22 00:30:43,552 [ scc.git] DEBUG Auto-merging package-lock.json
2025-07-22 00:30:43,553 [ scc.git] DEBUG Auto-merging package.json
2025-07-22 00:30:43,554 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-22 00:30:43,557 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-07-22 00:30:43,558 [ scc.git] DEBUG package.json | 2 +-
2025-07-22 00:30:43,558 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-07-22 00:30:43,787 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:43,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:30:43,980 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-07-22 00:30:43,984 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:43,986 [ 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-07-22 00:30:43,996 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-22 00:30:43,998 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-07-22 00:30:43,998 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-07-22 00:30:44,231 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:44,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:30:44,412 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-22 00:30:44,453 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:30:44,453 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:44,455 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-22 00:30:44,495 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-22 00:30:44,499 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3286c2b450> has no local changes
2025-07-22 00:30:44,499 [ 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#484 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/)'
2025-07-22 00:30:44,506 [ scc.git] DEBUG [detached HEAD 9a6dbde] merge master -Dorg -Ssuccess-only
2025-07-22 00:30:44,506 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:30:44,506 [ scc.repo] DEBUG ## PRs found:
2025-07-22 00:30:44,663 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:44,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-07-22 00:30:44,853 [ scc.repo] DEBUG ## Branches found:
2025-07-22 00:30:44,853 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-07-22 00:30:44,853 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:30:44,853 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:44,855 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-22 00:30:44,858 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-22 00:30:44,858 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-22 00:30:44,861 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-22 00:30:44,864 [ scc.git] DEBUG Already up to date.
2025-07-22 00:30:44,864 [ scc.git] DEBUG ## Unique users: []
2025-07-22 00:30:44,864 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:30:44,864 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:44,866 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-22 00:30:44,907 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:30:44,907 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:44,909 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-22 00:30:44,949 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-22 00:30:44,953 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f32896e9c50> has no local changes
2025-07-22 00:30:44,953 [ 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#484 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/)'
2025-07-22 00:30:44,959 [ scc.git] DEBUG [detached HEAD 0a5c460] merge master -Dorg -Ssuccess-only
2025-07-22 00:30:44,959 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:30:44,959 [ scc.repo] DEBUG ## PRs found:
2025-07-22 00:30:45,104 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:45,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-07-22 00:30:45,652 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:45,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-07-22 00:30:46,163 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:46,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-07-22 00:30:46,665 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:46,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-07-22 00:30:46,910 [ scc.repo] DEBUG ## Branches found:
2025-07-22 00:30:46,910 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-07-22 00:30:46,910 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:30:46,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:46,913 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-22 00:30:46,915 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-22 00:30:46,916 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-22 00:30:46,919 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-22 00:30:46,922 [ scc.git] DEBUG Already up to date.
2025-07-22 00:30:46,922 [ scc.git] DEBUG ## Unique users: []
2025-07-22 00:30:46,922 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:30:46,922 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:46,924 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-22 00:30:46,965 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:30:46,965 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:46,967 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-22 00:30:47,008 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-22 00:30:47,011 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3286c58710> has no local changes
2025-07-22 00:30:47,011 [ 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#484 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/)'
2025-07-22 00:30:47,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:30:47,018 [ scc.git] DEBUG [detached HEAD 10a2b4a] merge master -Dorg -Ssuccess-only
2025-07-22 00:30:47,018 [ scc.repo] DEBUG ## PRs found:
2025-07-22 00:30:47,161 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:47,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-07-22 00:30:47,712 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:47,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-07-22 00:30:48,186 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:48,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-07-22 00:30:48,643 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:48,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-07-22 00:30:49,209 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:49,428 [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-07-22 00:30:49,680 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:49,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-07-22 00:30:50,217 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:50,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-07-22 00:30:50,433 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-07-22 00:30:50,433 [ scc.repo] DEBUG ## Branches found:
2025-07-22 00:30:50,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-07-22 00:30:50,433 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:30:50,433 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:50,436 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-22 00:30:50,438 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-22 00:30:50,438 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-22 00:30:50,441 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-22 00:30:50,444 [ scc.git] DEBUG Already up to date.
2025-07-22 00:30:50,445 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-07-22 00:30:50,740 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-07-22 00:30:50,740 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-07-22 00:30:50,745 [ scc.git] DEBUG ## Unique users: []
2025-07-22 00:30:50,745 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:30:50,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:50,747 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-07-22 00:30:50,751 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:50,753 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-07-22 00:30:50,763 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-07-22 00:30:50,763 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-07-22 00:30:50,763 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-07-22 00:30:50,763 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-07-22 00:30:50,763 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-07-22 00:30:50,763 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-07-22 00:30:50,763 [ scc.git] DEBUG Auto-merging setup.py
2025-07-22 00:30:50,763 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-07-22 00:30:50,763 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-22 00:30:50,763 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-22 00:30:50,766 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-07-22 00:30:50,771 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-07-22 00:30:50,772 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:50,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:30:50,960 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-07-22 00:30:50,963 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-07-22 00:30:50,966 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#484](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
- setup.py
--conflicts
2025-07-22 00:30:50,968 [ scc.config] DEBUG Found github.token
2025-07-22 00:30:50,969 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-07-22 00:30:50,969 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-22 00:30:51,009 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:30:51,010 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:30:51,012 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-22 00:30:51,053 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-22 00:30:51,057 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3286c48a90> has no local changes
2025-07-22 00:30:51,057 [ 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#484 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/)'
2025-07-22 00:30:51,063 [ scc.git] DEBUG [detached HEAD f381b57] merge master -Dorg -Ssuccess-only
2025-07-22 00:30:51,063 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:30:51,064 [ scc.repo] DEBUG ## PRs found:
2025-07-22 00:30:51,211 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:51,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-07-22 00:30:51,838 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:52,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-07-22 00:30:52,308 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:52,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-07-22 00:30:52,930 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:53,222 [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-07-22 00:30:53,473 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:53,705 [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-07-22 00:30:53,956 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:54,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-07-22 00:30:54,536 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:54,728 [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-07-22 00:30:54,729 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-07-22 00:30:54,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:55,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-07-22 00:30:55,497 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:55,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-07-22 00:30:56,016 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:56,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-07-22 00:30:56,559 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:56,811 [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-07-22 00:30:57,062 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:57,306 [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-07-22 00:30:57,558 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:57,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-07-22 00:30:58,110 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:58,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-07-22 00:30:58,600 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:58,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-07-22 00:30:59,066 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:59,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-07-22 00:30:59,519 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:30:59,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-07-22 00:31:00,030 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:00,276 [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-07-22 00:31:00,527 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:00,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-07-22 00:31:01,072 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:01,301 [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-07-22 00:31:01,301 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-07-22 00:31:01,301 [ scc.repo] DEBUG ## Branches found:
2025-07-22 00:31:01,301 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-07-22 00:31:01,302 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:31:01,302 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:01,304 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-22 00:31:01,307 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-22 00:31:01,307 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-22 00:31:01,310 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-22 00:31:01,313 [ scc.git] DEBUG Already up to date.
2025-07-22 00:31:01,313 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-07-22 00:31:01,616 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-07-22 00:31:01,616 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-07-22 00:31:01,621 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-07-22 00:31:01,909 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-07-22 00:31:01,909 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-07-22 00:31:01,913 [ scc.git] DEBUG ## Unique users: []
2025-07-22 00:31:01,913 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:31:01,913 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:01,916 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-07-22 00:31:01,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:01,922 [ 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-07-22 00:31:01,935 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-22 00:31:01,938 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-07-22 00:31:01,939 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-07-22 00:31:01,939 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-07-22 00:31:01,939 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-07-22 00:31:01,939 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-07-22 00:31:01,939 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-07-22 00:31:01,939 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-07-22 00:31:01,939 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-07-22 00:31:01,940 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:01,940 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-07-22 00:31:01,940 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-07-22 00:31:01,940 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-07-22 00:31:01,940 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-07-22 00:31:01,940 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-07-22 00:31:01,940 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-07-22 00:31:01,940 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-07-22 00:31:01,940 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-07-22 00:31:01,940 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-07-22 00:31:01,940 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-07-22 00:31:01,940 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-07-22 00:31:01,940 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-07-22 00:31:01,940 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-07-22 00:31:01,940 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-07-22 00:31:01,940 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-07-22 00:31:01,940 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-07-22 00:31:01,940 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-07-22 00:31:01,940 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-07-22 00:31:01,940 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-07-22 00:31:01,940 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-07-22 00:31:01,941 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-07-22 00:31:01,941 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-07-22 00:31:01,941 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-07-22 00:31:01,941 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-07-22 00:31:01,941 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-07-22 00:31:01,941 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-07-22 00:31:01,941 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-07-22 00:31:01,941 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-07-22 00:31:01,941 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-07-22 00:31:01,941 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-07-22 00:31:01,941 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-07-22 00:31:01,941 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-07-22 00:31:01,941 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-07-22 00:31:01,941 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-07-22 00:31:01,941 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-07-22 00:31:01,941 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-07-22 00:31:01,941 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-07-22 00:31:02,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:02,107 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-07-22 00:31:02,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:02,113 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-07-22 00:31:02,123 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-22 00:31:02,127 [ scc.git] DEBUG docker | 1 +
2025-07-22 00:31:02,127 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-07-22 00:31:02,358 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:02,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:02,541 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-22 00:31:02,584 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:31:02,584 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:02,586 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-22 00:31:02,624 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-22 00:31:02,628 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3286c48990> has no local changes
2025-07-22 00:31:02,628 [ 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#484 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/)'
2025-07-22 00:31:02,635 [ scc.git] DEBUG [detached HEAD 9547d97] merge master -Dorg -Ssuccess-only
2025-07-22 00:31:02,635 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:02,635 [ scc.repo] DEBUG ## PRs found:
2025-07-22 00:31:02,792 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:02,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-07-22 00:31:02,986 [ scc.repo] DEBUG ## Branches found:
2025-07-22 00:31:02,986 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-07-22 00:31:02,986 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:31:02,986 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:02,988 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-22 00:31:02,991 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-22 00:31:02,991 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-22 00:31:02,994 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-22 00:31:02,997 [ scc.git] DEBUG Already up to date.
2025-07-22 00:31:02,997 [ scc.git] DEBUG ## Unique users: []
2025-07-22 00:31:02,997 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:31:02,997 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:02,999 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-22 00:31:03,041 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:31:03,041 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:03,043 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-22 00:31:03,083 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-22 00:31:03,086 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3285a81910> has no local changes
2025-07-22 00:31:03,086 [ 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#484 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/)'
2025-07-22 00:31:03,093 [ scc.git] DEBUG [detached HEAD bdec615] merge master -Dorg -Ssuccess-only
2025-07-22 00:31:03,093 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:03,093 [ scc.repo] DEBUG ## PRs found:
2025-07-22 00:31:03,237 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:03,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2025-07-22 00:31:03,420 [ scc.repo] DEBUG ## Branches found:
2025-07-22 00:31:03,420 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-07-22 00:31:03,420 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:31:03,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:03,423 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-22 00:31:03,425 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-22 00:31:03,425 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-22 00:31:03,428 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-22 00:31:03,436 [ scc.git] DEBUG Updating deab817..160d894
2025-07-22 00:31:03,671 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:04,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls/20 HTTP/1.1" 200 None
2025-07-22 00:31:04,104 [ scc.git] DEBUG ## Unique users: []
2025-07-22 00:31:04,104 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:31:04,104 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:04,107 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-22 00:31:04,149 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:31:04,149 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:04,152 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-22 00:31:04,193 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-22 00:31:04,196 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3286cf2690> has no local changes
2025-07-22 00:31:04,197 [ 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#484 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/)'
2025-07-22 00:31:04,203 [ scc.git] DEBUG [detached HEAD ac584a8] merge master -Dorg -Ssuccess-only
2025-07-22 00:31:04,203 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:04,203 [ scc.git] INFO Overriding base-branch from master to main
2025-07-22 00:31:04,203 [ scc.repo] DEBUG ## PRs found:
2025-07-22 00:31:04,354 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:04,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-07-22 00:31:04,896 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:05,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-07-22 00:31:05,381 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:05,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-07-22 00:31:05,875 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:06,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-07-22 00:31:06,426 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:06,744 [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-07-22 00:31:06,995 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:07,228 [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-07-22 00:31:07,479 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:07,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-07-22 00:31:07,972 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:08,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-07-22 00:31:08,450 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:08,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-07-22 00:31:09,220 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:09,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-07-22 00:31:09,764 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:09,984 [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-07-22 00:31:10,235 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:10,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-07-22 00:31:10,714 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:10,905 [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-07-22 00:31:10,906 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-07-22 00:31:10,906 [ scc.repo] DEBUG ## Branches found:
2025-07-22 00:31:10,906 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-07-22 00:31:10,906 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:31:10,906 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:10,909 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-07-22 00:31:10,911 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-22 00:31:10,911 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-07-22 00:31:10,914 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-07-22 00:31:10,917 [ scc.git] DEBUG Already up to date.
2025-07-22 00:31:10,918 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-07-22 00:31:11,227 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-07-22 00:31:11,227 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-07-22 00:31:11,231 [ scc.git] DEBUG ## Unique users: []
2025-07-22 00:31:11,231 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:31:11,231 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:11,233 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-07-22 00:31:11,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:11,239 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-07-22 00:31:11,247 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-07-22 00:31:11,247 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-07-22 00:31:11,247 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-22 00:31:11,247 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-22 00:31:11,250 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-07-22 00:31:11,254 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-07-22 00:31:11,256 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:11,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:11,424 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-07-22 00:31:11,427 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-07-22 00:31:11,430 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#484](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-07-22 00:31:11,432 [ scc.config] DEBUG Found github.token
2025-07-22 00:31:11,433 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-07-22 00:31:11,433 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-22 00:31:11,473 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:31:11,474 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:11,476 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-22 00:31:11,514 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-22 00:31:11,518 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3286c49510> has no local changes
2025-07-22 00:31:11,518 [ 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#484 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/)'
2025-07-22 00:31:11,524 [ scc.git] DEBUG [detached HEAD 0a479da] merge master -Dorg -Ssuccess-only
2025-07-22 00:31:11,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:11,525 [ scc.repo] DEBUG ## PRs found:
2025-07-22 00:31:11,676 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:11,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-07-22 00:31:11,872 [ scc.repo] DEBUG ## Branches found:
2025-07-22 00:31:11,873 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-07-22 00:31:11,873 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:31:11,873 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:11,875 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-22 00:31:11,878 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-22 00:31:11,878 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-22 00:31:11,881 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-22 00:31:11,883 [ scc.git] DEBUG Already up to date.
2025-07-22 00:31:11,884 [ scc.git] DEBUG ## Unique users: []
2025-07-22 00:31:11,884 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:31:11,884 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:11,886 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-22 00:31:11,925 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:31:11,926 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:11,928 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-22 00:31:11,968 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-22 00:31:11,971 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3285aec910> has no local changes
2025-07-22 00:31:11,972 [ 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#484 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/)'
2025-07-22 00:31:11,978 [ scc.git] DEBUG [detached HEAD 19841bb] merge master -Dorg -Ssuccess-only
2025-07-22 00:31:11,978 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:11,978 [ scc.repo] DEBUG ## PRs found:
2025-07-22 00:31:12,124 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:12,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-07-22 00:31:12,315 [ scc.repo] DEBUG ## Branches found:
2025-07-22 00:31:12,315 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-07-22 00:31:12,315 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:31:12,315 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:12,317 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-22 00:31:12,319 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-22 00:31:12,319 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-22 00:31:12,322 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-22 00:31:12,325 [ scc.git] DEBUG Already up to date.
2025-07-22 00:31:12,325 [ scc.git] DEBUG ## Unique users: []
2025-07-22 00:31:12,325 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:31:12,325 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:12,328 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-22 00:31:12,365 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:31:12,365 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:12,367 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-22 00:31:12,406 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-22 00:31:12,409 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3286c5b950> has no local changes
2025-07-22 00:31:12,409 [ 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#484 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/)'
2025-07-22 00:31:12,416 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:12,416 [ scc.repo] DEBUG ## PRs found:
2025-07-22 00:31:12,416 [ scc.git] DEBUG [detached HEAD 0c7ab8f] merge master -Dorg -Ssuccess-only
2025-07-22 00:31:12,566 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:12,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-07-22 00:31:13,137 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:13,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-07-22 00:31:13,612 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:13,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-07-22 00:31:14,128 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:14,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-07-22 00:31:14,680 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:14,888 [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-07-22 00:31:15,141 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:15,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-07-22 00:31:15,611 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:15,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-07-22 00:31:15,800 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-07-22 00:31:15,800 [ scc.repo] DEBUG ## Branches found:
2025-07-22 00:31:15,800 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-07-22 00:31:15,800 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:31:15,800 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:15,803 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-22 00:31:15,805 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-22 00:31:15,806 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-22 00:31:15,808 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-22 00:31:15,811 [ scc.git] DEBUG Already up to date.
2025-07-22 00:31:15,811 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-07-22 00:31:16,100 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-07-22 00:31:16,100 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-07-22 00:31:16,104 [ scc.git] DEBUG ## Unique users: []
2025-07-22 00:31:16,105 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:31:16,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:16,107 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-07-22 00:31:16,110 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:16,112 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-07-22 00:31:16,121 [ scc.git] DEBUG Auto-merging Dockerfile
2025-07-22 00:31:16,121 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-07-22 00:31:16,122 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-22 00:31:16,122 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-22 00:31:16,125 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-07-22 00:31:16,130 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-07-22 00:31:16,132 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:16,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:16,299 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-07-22 00:31:16,302 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-07-22 00:31:16,305 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#484](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-07-22 00:31:16,307 [ scc.config] DEBUG Found github.token
2025-07-22 00:31:16,307 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-07-22 00:31:16,307 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-22 00:31:16,349 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:31:16,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:16,351 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-22 00:31:16,389 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-22 00:31:16,393 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3285afa710> has no local changes
2025-07-22 00:31:16,393 [ 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#484 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/)'
2025-07-22 00:31:16,399 [ scc.git] DEBUG [detached HEAD ef82a51] merge master -Dorg -Ssuccess-only
2025-07-22 00:31:16,400 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:16,400 [ scc.git] INFO Overriding base-branch from master to develop
2025-07-22 00:31:16,400 [ scc.repo] DEBUG ## PRs found:
2025-07-22 00:31:16,550 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:16,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-07-22 00:31:17,093 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:17,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-07-22 00:31:17,602 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:17,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-07-22 00:31:18,050 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:18,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-07-22 00:31:18,505 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:18,758 [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-07-22 00:31:19,009 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:19,255 [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-07-22 00:31:19,507 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:19,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-07-22 00:31:20,007 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:20,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-07-22 00:31:20,209 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-07-22 00:31:20,459 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:20,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-07-22 00:31:20,953 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:21,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-07-22 00:31:21,440 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:21,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-07-22 00:31:21,892 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:22,099 [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-07-22 00:31:22,350 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:22,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-07-22 00:31:22,833 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:23,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-07-22 00:31:23,018 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-07-22 00:31:23,269 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:23,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-07-22 00:31:23,781 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:24,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-07-22 00:31:24,320 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:24,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-07-22 00:31:24,803 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:25,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-07-22 00:31:25,012 [ scc.repo] DEBUG ## Branches found:
2025-07-22 00:31:25,012 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-07-22 00:31:25,013 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:31:25,013 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:25,015 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-07-22 00:31:25,018 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-22 00:31:25,018 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-07-22 00:31:25,021 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-07-22 00:31:25,032 [ scc.git] DEBUG Updating 4b4c755..573db34
2025-07-22 00:31:25,262 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:25,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/227 HTTP/1.1" 200 None
2025-07-22 00:31:25,907 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:26,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-07-22 00:31:26,311 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-07-22 00:31:26,600 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-07-22 00:31:26,600 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-07-22 00:31:26,604 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-07-22 00:31:26,899 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-07-22 00:31:26,899 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-07-22 00:31:26,903 [ scc.git] DEBUG ## Unique users: []
2025-07-22 00:31:26,903 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:31:26,903 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:26,906 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-07-22 00:31:26,912 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:26,914 [ 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-07-22 00:31:26,925 [ 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-07-22 00:31:26,926 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-22 00:31:26,926 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-22 00:31:26,929 [ scc.git] DEBUG Calling 'git reset --hard 573db340d5d1429fa17c7e486206948412a7c150'
2025-07-22 00:31:26,932 [ scc.git] DEBUG HEAD is now at 573db34 Bump version: 5.9.1 → 5.9.2.dev0
2025-07-22 00:31:26,934 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:27,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:27,107 [ scc.git] DEBUG Calling 'git merge-base 573db340d5d1429fa17c7e486206948412a7c150 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-07-22 00:31:27,112 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..573db340d5d1429fa17c7e486206948412a7c150'
2025-07-22 00:31:27,116 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#484](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-07-22 00:31:27,118 [ scc.config] DEBUG Found github.token
2025-07-22 00:31:27,118 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-07-22 00:31:27,118 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-07-22 00:31:27,123 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:27,125 [ 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-07-22 00:31:27,135 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-22 00:31:27,139 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-07-22 00:31:27,139 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-07-22 00:31:27,357 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:27,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:27,534 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-22 00:31:27,575 [ scc.git] DEBUG Get sha1 of %s
2025-07-22 00:31:27,575 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-22 00:31:27,578 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-22 00:31:27,616 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-22 00:31:27,620 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3286d7a690> has no local changes
2025-07-22 00:31:27,620 [ 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#484 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/)'
2025-07-22 00:31:27,627 [ scc.git] DEBUG [detached HEAD b621109] merge master -Dorg -Ssuccess-only
2025-07-22 00:31:27,627 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:27,627 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-22 00:31:27,704 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-07-22 00:31:27,786 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:27,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:27,956 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-07-22 00:31:27,958 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-07-22 00:31:28,202 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:28,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:28,375 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-07-22 00:31:28,377 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-07-22 00:31:28,621 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:28,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:28,818 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-07-22 00:31:28,820 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-07-22 00:31:29,064 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:29,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:29,241 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-07-22 00:31:29,486 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:29,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:29,691 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-07-22 00:31:29,693 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-07-22 00:31:29,937 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:30,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:30,100 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-07-22 00:31:30,102 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-07-22 00:31:30,347 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:30,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:30,546 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-07-22 00:31:30,548 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-07-22 00:31:30,792 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:30,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:30,982 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-07-22 00:31:30,984 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-07-22 00:31:31,229 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:31,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:31,408 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-07-22 00:31:31,410 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-07-22 00:31:31,655 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:31,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:31,842 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-07-22 00:31:31,844 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-07-22 00:31:32,088 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:32,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:32,284 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-07-22 00:31:32,286 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-07-22 00:31:32,531 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:32,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:32,714 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-07-22 00:31:32,716 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-07-22 00:31:32,960 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:33,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:33,135 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-07-22 00:31:33,379 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:33,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:33,564 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-07-22 00:31:33,808 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:33,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:33,985 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-07-22 00:31:33,987 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-07-22 00:31:34,231 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:34,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:34,433 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-07-22 00:31:34,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:34,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:34,862 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-07-22 00:31:35,105 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:35,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:35,272 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-07-22 00:31:35,275 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-07-22 00:31:35,518 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:35,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:35,756 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-07-22 00:31:35,758 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-07-22 00:31:36,003 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:36,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:36,179 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-07-22 00:31:36,181 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-07-22 00:31:36,425 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:36,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:36,604 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-07-22 00:31:36,606 [ scc.config] DEBUG Found submodule.scripts.url
2025-07-22 00:31:36,850 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-22 00:31:37,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-22 00:31:37,049 [ scc.config] DEBUG Found submodule.scripts.branch
2025-07-22 00:31:37,049 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-22 00:31:37,141 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3286b2b090> has local changes
2025-07-22 00:31:37,141 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
- PR 71 dominikl 'Escape slash character in image names'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 174 will-moore 'Skip wells' (stage: draft)
- PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 167 dominikl 'Add extinfo command' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
Updating 11d3587..f7eea7c
Previously merged:
- PR 179 will-moore 'Changelog 0.6.0'
- PR 177 jburel 'Replace fromstring by frombuffer'
- PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
- PR 147 will-moore 'Name option'
- PR 173 will-moore 'Add test_export_plate_polygons()'
- PR 171 will-moore 'Initial addition of integration tests'
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
Repository: ome/omero-figure
Excluded PRs:
- PR 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#484 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/484/)'
2025-07-22 00:31:37,154 [ scc.git] DEBUG [detached HEAD 26c6a6e] merge master -Dorg -Ssuccess-only
2025-07-22 00:31:37,154 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-07-22 00:31:37,154 [ scc.merge] INFO Repository: ome/omero-plugins
2025-07-22 00:31:37,154 [ scc.merge] INFO Already up to date.
2025-07-22 00:31:37,154 [ scc.merge] INFO
2025-07-22 00:31:37,154 [ scc.merge] INFO Merged PRs:
2025-07-22 00:31:37,154 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-07-22 00:31:37,154 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-07-22 00:31:37,154 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-07-22 00:31:37,154 [ scc.merge] INFO
2025-07-22 00:31:37,154 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-07-22 00:31:37,154 [ scc.merge] INFO Already up to date.
2025-07-22 00:31:37,154 [ scc.merge] INFO
2025-07-22 00:31:37,154 [ scc.merge] INFO
2025-07-22 00:31:37,154 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-07-22 00:31:37,154 [ scc.merge] INFO Excluded PRs:
2025-07-22 00:31:37,155 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-07-22 00:31:37,155 [ scc.merge] INFO Already up to date.
2025-07-22 00:31:37,155 [ scc.merge] INFO
2025-07-22 00:31:37,155 [ scc.merge] INFO
2025-07-22 00:31:37,155 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-07-22 00:31:37,155 [ scc.merge] INFO Excluded PRs:
2025-07-22 00:31:37,155 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-07-22 00:31:37,155 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-07-22 00:31:37,155 [ scc.merge] INFO Already up to date.
2025-07-22 00:31:37,155 [ scc.merge] INFO
2025-07-22 00:31:37,155 [ scc.merge] INFO Merged PRs:
2025-07-22 00:31:37,155 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-07-22 00:31:37,155 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-07-22 00:31:37,155 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-07-22 00:31:37,155 [ scc.merge] INFO
2025-07-22 00:31:37,155 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-07-22 00:31:37,155 [ scc.merge] INFO Excluded PRs:
2025-07-22 00:31:37,155 [ scc.merge] INFO - PR 174 will-moore 'Skip wells' (stage: draft)
2025-07-22 00:31:37,155 [ scc.merge] INFO - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
2025-07-22 00:31:37,155 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-07-22 00:31:37,155 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-07-22 00:31:37,155 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-07-22 00:31:37,155 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-07-22 00:31:37,155 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-07-22 00:31:37,155 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-07-22 00:31:37,155 [ scc.merge] INFO Updating 11d3587..f7eea7c
2025-07-22 00:31:37,155 [ scc.merge] INFO Previously merged:
2025-07-22 00:31:37,155 [ scc.merge] INFO - PR 179 will-moore 'Changelog 0.6.0'
2025-07-22 00:31:37,155 [ scc.merge] INFO - PR 177 jburel 'Replace fromstring by frombuffer'
2025-07-22 00:31:37,155 [ scc.merge] INFO - PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
2025-07-22 00:31:37,155 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-07-22 00:31:37,155 [ scc.merge] INFO - PR 173 will-moore 'Add test_export_plate_polygons()'
2025-07-22 00:31:37,155 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-07-22 00:31:37,155 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-22 00:31:37,155 [ scc.merge] INFO
2025-07-22 00:31:37,155 [ scc.merge] INFO Merged PRs:
2025-07-22 00:31:37,155 [ scc.merge] INFO - PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
2025-07-22 00:31:37,155 [ scc.merge] INFO
2025-07-22 00:31:37,155 [ scc.merge] INFO Repository: ome/omero-figure
2025-07-22 00:31:37,156 [ scc.merge] INFO Excluded PRs:
2025-07-22 00:31:37,156 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-07-22 00:31:37,156 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-07-22 00:31:37,156 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-07-22 00:31:37,156 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-07-22 00:31:37,156 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-07-22 00:31:37,156 [ scc.merge] INFO Previously merged:
2025-07-22 00:31:37,156 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-07-22 00:31:37,156 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-07-22 00:31:37,156 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-07-22 00:31:37,156 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-22 00:31:37,156 [ scc.merge] INFO
2025-07-22 00:31:37,156 [ scc.merge] INFO Merged PRs:
2025-07-22 00:31:37,156 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-07-22 00:31:37,156 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-07-22 00:31:37,156 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-07-22 00:31:37,156 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-07-22 00:31:37,156 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-07-22 00:31:37,156 [ scc.merge] INFO
2025-07-22 00:31:37,156 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-22 00:31:37,156 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-07-22 00:31:37,156 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-07-22 00:31:37,156 [ scc.merge] INFO
2025-07-22 00:31:37,156 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-07-22 00:31:37,156 [ scc.merge] INFO Already up to date.
2025-07-22 00:31:37,156 [ scc.merge] INFO
2025-07-22 00:31:37,156 [ scc.merge] INFO Merged PRs:
2025-07-22 00:31:37,156 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-07-22 00:31:37,156 [ scc.merge] INFO
2025-07-22 00:31:37,156 [ scc.merge] INFO Repository: ome/omero-gallery
2025-07-22 00:31:37,156 [ scc.merge] INFO Already up to date.
2025-07-22 00:31:37,156 [ scc.merge] INFO
2025-07-22 00:31:37,156 [ scc.merge] INFO Merged PRs:
2025-07-22 00:31:37,156 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-07-22 00:31:37,156 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-07-22 00:31:37,156 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-07-22 00:31:37,156 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-07-22 00:31:37,156 [ scc.merge] INFO
2025-07-22 00:31:37,156 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-22 00:31:37,156 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-07-22 00:31:37,157 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-07-22 00:31:37,157 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-07-22 00:31:37,157 [ scc.merge] INFO
2025-07-22 00:31:37,157 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-07-22 00:31:37,157 [ scc.merge] INFO Excluded PRs:
2025-07-22 00:31:37,157 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-07-22 00:31:37,157 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-07-22 00:31:37,157 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-07-22 00:31:37,157 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-07-22 00:31:37,157 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-07-22 00:31:37,157 [ scc.merge] INFO Updating 7a798ce..bb94cf8
2025-07-22 00:31:37,157 [ scc.merge] INFO Previously merged:
2025-07-22 00:31:37,157 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-22 00:31:37,157 [ scc.merge] INFO
2025-07-22 00:31:37,157 [ scc.merge] INFO Merged PRs:
2025-07-22 00:31:37,157 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-07-22 00:31:37,157 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-07-22 00:31:37,157 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-07-22 00:31:37,157 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-07-22 00:31:37,157 [ scc.merge] INFO
2025-07-22 00:31:37,157 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-22 00:31:37,157 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-07-22 00:31:37,157 [ scc.merge] INFO
2025-07-22 00:31:37,157 [ scc.merge] INFO Repository: ome/omero-mapr
2025-07-22 00:31:37,157 [ scc.merge] INFO Excluded PRs:
2025-07-22 00:31:37,157 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-07-22 00:31:37,157 [ scc.merge] INFO Already up to date.
2025-07-22 00:31:37,157 [ scc.merge] INFO
2025-07-22 00:31:37,157 [ scc.merge] INFO Merged PRs:
2025-07-22 00:31:37,157 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-07-22 00:31:37,157 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-22 00:31:37,157 [ scc.merge] INFO
2025-07-22 00:31:37,157 [ scc.merge] INFO Repository: ome/omero-metadata
2025-07-22 00:31:37,157 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-07-22 00:31:37,157 [ scc.merge] INFO Previously merged:
2025-07-22 00:31:37,157 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-22 00:31:37,157 [ scc.merge] INFO
2025-07-22 00:31:37,157 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-22 00:31:37,157 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-07-22 00:31:37,157 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-07-22 00:31:37,158 [ scc.merge] INFO
2025-07-22 00:31:37,158 [ scc.merge] INFO Repository: ome/omero-parade
2025-07-22 00:31:37,158 [ scc.merge] INFO Excluded PRs:
2025-07-22 00:31:37,158 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-07-22 00:31:37,158 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-07-22 00:31:37,158 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-07-22 00:31:37,158 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-07-22 00:31:37,158 [ scc.merge] INFO Already up to date.
2025-07-22 00:31:37,158 [ scc.merge] INFO
2025-07-22 00:31:37,158 [ scc.merge] INFO Merged PRs:
2025-07-22 00:31:37,158 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-07-22 00:31:37,158 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-07-22 00:31:37,158 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-22 00:31:37,158 [ scc.merge] INFO
2025-07-22 00:31:37,158 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-07-22 00:31:37,158 [ scc.merge] INFO Already up to date.
2025-07-22 00:31:37,158 [ scc.merge] INFO
2025-07-22 00:31:37,158 [ scc.merge] INFO
2025-07-22 00:31:37,158 [ scc.merge] INFO Repository: ome/omero-rois
2025-07-22 00:31:37,158 [ scc.merge] INFO Excluded PRs:
2025-07-22 00:31:37,158 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-07-22 00:31:37,158 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-07-22 00:31:37,158 [ scc.merge] INFO Already up to date.
2025-07-22 00:31:37,158 [ scc.merge] INFO
2025-07-22 00:31:37,158 [ scc.merge] INFO
2025-07-22 00:31:37,158 [ scc.merge] INFO Repository: ome/omero-signup
2025-07-22 00:31:37,158 [ scc.merge] INFO Already up to date.
2025-07-22 00:31:37,158 [ scc.merge] INFO
2025-07-22 00:31:37,158 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-22 00:31:37,158 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-07-22 00:31:37,158 [ scc.merge] INFO
2025-07-22 00:31:37,158 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-07-22 00:31:37,158 [ scc.merge] INFO Excluded PRs:
2025-07-22 00:31:37,158 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-07-22 00:31:37,158 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-07-22 00:31:37,158 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-07-22 00:31:37,158 [ scc.merge] INFO Already up to date.
2025-07-22 00:31:37,158 [ scc.merge] INFO
2025-07-22 00:31:37,158 [ scc.merge] INFO Merged PRs:
2025-07-22 00:31:37,158 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-07-22 00:31:37,159 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-07-22 00:31:37,159 [ scc.merge] INFO
2025-07-22 00:31:37,159 [ scc.merge] INFO Repository: ome/omero-upload
2025-07-22 00:31:37,159 [ scc.merge] INFO Already up to date.
2025-07-22 00:31:37,159 [ scc.merge] INFO
2025-07-22 00:31:37,159 [ scc.merge] INFO
2025-07-22 00:31:37,159 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-07-22 00:31:37,159 [ scc.merge] INFO Updating deab817..160d894
2025-07-22 00:31:37,159 [ scc.merge] INFO Previously merged:
2025-07-22 00:31:37,159 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-07-22 00:31:37,159 [ scc.merge] INFO
2025-07-22 00:31:37,159 [ scc.merge] INFO
2025-07-22 00:31:37,159 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-07-22 00:31:37,159 [ scc.merge] INFO Excluded PRs:
2025-07-22 00:31:37,159 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-07-22 00:31:37,159 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-07-22 00:31:37,159 [ scc.merge] INFO Already up to date.
2025-07-22 00:31:37,159 [ scc.merge] INFO
2025-07-22 00:31:37,159 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-22 00:31:37,159 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-07-22 00:31:37,159 [ scc.merge] INFO
2025-07-22 00:31:37,159 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-07-22 00:31:37,159 [ scc.merge] INFO Already up to date.
2025-07-22 00:31:37,159 [ scc.merge] INFO
2025-07-22 00:31:37,159 [ scc.merge] INFO
2025-07-22 00:31:37,159 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-07-22 00:31:37,159 [ scc.merge] INFO Already up to date.
2025-07-22 00:31:37,159 [ scc.merge] INFO
2025-07-22 00:31:37,159 [ scc.merge] INFO
2025-07-22 00:31:37,159 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-07-22 00:31:37,159 [ scc.merge] INFO Already up to date.
2025-07-22 00:31:37,159 [ scc.merge] INFO
2025-07-22 00:31:37,159 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-22 00:31:37,159 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-07-22 00:31:37,159 [ scc.merge] INFO
2025-07-22 00:31:37,159 [ scc.merge] INFO Repository: ome/scripts
2025-07-22 00:31:37,159 [ scc.merge] INFO Excluded PRs:
2025-07-22 00:31:37,159 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-07-22 00:31:37,159 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-07-22 00:31:37,159 [ scc.merge] INFO Updating 4b4c755..573db34
2025-07-22 00:31:37,160 [ scc.merge] INFO Previously merged:
2025-07-22 00:31:37,160 [ scc.merge] INFO - PR 227 jburel 'Replace tostring by tobytes'
2025-07-22 00:31:37,160 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-07-22 00:31:37,160 [ scc.merge] INFO
2025-07-22 00:31:37,160 [ scc.merge] INFO Merged PRs:
2025-07-22 00:31:37,160 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-07-22 00:31:37,160 [ scc.merge] INFO
2025-07-22 00:31:37,160 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-22 00:31:37,160 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-07-22 00:31:37,160 [ scc.merge] INFO
2025-07-22 00:31:37,160 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-07-22 00:31:37,160 [ scc.git] DEBUG Calling 'git remote'
2025-07-22 00:31:37,162 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-07-22 00:31:37,162 [ scc.git] DEBUG Calling 'git remote'
2025-07-22 00:31:37,164 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:37,164 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-07-22 00:31:37,164 [ scc.git] DEBUG Calling 'git remote'
2025-07-22 00:31:37,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:37,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-07-22 00:31:37,166 [ scc.git] DEBUG Calling 'git remote'
2025-07-22 00:31:37,168 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:37,168 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-07-22 00:31:37,169 [ scc.git] DEBUG Calling 'git remote'
2025-07-22 00:31:37,171 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:37,171 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-07-22 00:31:37,171 [ scc.git] DEBUG Calling 'git remote'
2025-07-22 00:31:37,173 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:37,173 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-07-22 00:31:37,173 [ scc.git] DEBUG Calling 'git remote'
2025-07-22 00:31:37,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:37,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-07-22 00:31:37,176 [ scc.git] DEBUG Calling 'git remote'
2025-07-22 00:31:37,178 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:37,178 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-07-22 00:31:37,178 [ scc.git] DEBUG Calling 'git remote'
2025-07-22 00:31:37,180 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:37,180 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-07-22 00:31:37,180 [ scc.git] DEBUG Calling 'git remote'
2025-07-22 00:31:37,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:37,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-07-22 00:31:37,182 [ scc.git] DEBUG Calling 'git remote'
2025-07-22 00:31:37,184 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:37,185 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-07-22 00:31:37,185 [ scc.git] DEBUG Calling 'git remote'
2025-07-22 00:31:37,187 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:37,187 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-07-22 00:31:37,187 [ scc.git] DEBUG Calling 'git remote'
2025-07-22 00:31:37,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:37,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-07-22 00:31:37,189 [ scc.git] DEBUG Calling 'git remote'
2025-07-22 00:31:37,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:37,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-07-22 00:31:37,192 [ scc.git] DEBUG Calling 'git remote'
2025-07-22 00:31:37,194 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:37,194 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-07-22 00:31:37,194 [ scc.git] DEBUG Calling 'git remote'
2025-07-22 00:31:37,196 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:37,196 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-07-22 00:31:37,196 [ scc.git] DEBUG Calling 'git remote'
2025-07-22 00:31:37,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:37,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-07-22 00:31:37,198 [ scc.git] DEBUG Calling 'git remote'
2025-07-22 00:31:37,200 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:37,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-07-22 00:31:37,201 [ scc.git] DEBUG Calling 'git remote'
2025-07-22 00:31:37,203 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:37,203 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-07-22 00:31:37,203 [ scc.git] DEBUG Calling 'git remote'
2025-07-22 00:31:37,205 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:37,205 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-07-22 00:31:37,205 [ scc.git] DEBUG Calling 'git remote'
2025-07-22 00:31:37,207 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:37,207 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-07-22 00:31:37,207 [ scc.git] DEBUG Calling 'git remote'
2025-07-22 00:31:37,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-22 00:31:37,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-07-22 00:31:37,210 [ scc.git] DEBUG Calling 'git remote'
2025-07-22 00:31:37,212 [ 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 7ff3a94] 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 40f4bb7] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-07-22 00:32:25,356 [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-07-22 00:32:35,013 [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-07-22 00:32:37,499 [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-07-22 00:32:42,372 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-07-22 00:33:25,208 [ 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/f2c3e7bc/images/svgs/logo.svg){kind=logo}
