Skipping 220 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-07-03 00:29:21,445 [ scc.git] DEBUG Calling 'git merge-base bb94cf8da960e3283090038b04432f301560f5e4 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-07-03 00:29:21,448 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..bb94cf8da960e3283090038b04432f301560f5e4'
2025-07-03 00:29:21,451 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#467](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-07-03 00:29:21,453 [ scc.config] DEBUG Found github.token
2025-07-03 00:29:21,453 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-07-03 00:29:21,453 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-03 00:29:21,495 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:29:21,495 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:21,497 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-03 00:29:21,535 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-03 00:29:21,542 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5690e908d0> has no local changes
2025-07-03 00:29:21,542 [ 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#467 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/)'
2025-07-03 00:29:21,551 [ scc.git] DEBUG [detached HEAD 508bf8b] merge master -Dorg -Ssuccess-only
2025-07-03 00:29:21,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:29:21,551 [ scc.repo] DEBUG ## PRs found:
2025-07-03 00:29:21,696 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:21,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-07-03 00:29:22,241 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:22,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-07-03 00:29:22,705 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:22,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-07-03 00:29:23,245 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:23,474 [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-03 00:29:23,726 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:23,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-07-03 00:29:24,228 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:24,420 [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-03 00:29:24,420 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-03 00:29:24,671 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:24,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-07-03 00:29:25,151 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:25,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-07-03 00:29:25,643 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:25,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-07-03 00:29:26,208 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:26,439 [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-03 00:29:26,690 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:26,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-07-03 00:29:27,159 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:27,345 [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-03 00:29:27,345 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-07-03 00:29:27,345 [ scc.repo] DEBUG ## Branches found:
2025-07-03 00:29:27,345 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-07-03 00:29:27,345 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:29:27,345 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:27,348 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-03 00:29:27,350 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-03 00:29:27,350 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-03 00:29:27,354 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-03 00:29:27,357 [ scc.git] DEBUG Already up to date.
2025-07-03 00:29:27,357 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-07-03 00:29:27,660 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-07-03 00:29:27,660 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-07-03 00:29:27,664 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-07-03 00:29:27,969 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-07-03 00:29:27,970 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-07-03 00:29:27,974 [ scc.git] DEBUG ## Unique users: []
2025-07-03 00:29:27,974 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:29:27,974 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:27,976 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-07-03 00:29:27,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:27,982 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-07-03 00:29:27,992 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-03 00:29:27,995 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-07-03 00:29:27,995 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-07-03 00:29:27,995 [ scc.git] DEBUG requirements.txt | 2 +-
2025-07-03 00:29:27,996 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-07-03 00:29:27,996 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-07-03 00:29:27,996 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-07-03 00:29:27,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:28,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:29:28,162 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-07-03 00:29:28,166 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:28,169 [ 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-03 00:29:28,178 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-03 00:29:28,181 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-07-03 00:29:28,181 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-07-03 00:29:28,413 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:28,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:29:28,580 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-03 00:29:28,621 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:29:28,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:28,623 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-03 00:29:28,660 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-03 00:29:28,664 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5690ed4a50> has no local changes
2025-07-03 00:29:28,664 [ 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#467 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/)'
2025-07-03 00:29:28,671 [ scc.git] DEBUG [detached HEAD 7c552fa] merge master -Dorg -Ssuccess-only
2025-07-03 00:29:28,671 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:29:28,671 [ scc.repo] DEBUG ## PRs found:
2025-07-03 00:29:28,831 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:29,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-07-03 00:29:29,383 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:29,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-07-03 00:29:29,869 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:30,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-07-03 00:29:30,352 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:30,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-07-03 00:29:30,914 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:31,112 [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-03 00:29:31,363 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:31,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-07-03 00:29:31,873 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:32,055 [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-03 00:29:32,055 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-07-03 00:29:32,306 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:32,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-07-03 00:29:32,778 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:32,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-07-03 00:29:33,238 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:33,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-07-03 00:29:33,754 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:33,993 [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-03 00:29:34,244 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:34,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-07-03 00:29:34,702 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:34,875 [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-03 00:29:34,875 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-07-03 00:29:34,875 [ scc.repo] DEBUG ## Branches found:
2025-07-03 00:29:34,875 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-07-03 00:29:34,875 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:29:34,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:34,878 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-03 00:29:34,881 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-03 00:29:34,881 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-03 00:29:34,884 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-03 00:29:34,892 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-07-03 00:29:35,126 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:35,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-07-03 00:29:35,517 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-07-03 00:29:35,830 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-07-03 00:29:35,830 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-07-03 00:29:35,834 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-07-03 00:29:36,108 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-07-03 00:29:36,108 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-07-03 00:29:36,112 [ scc.git] DEBUG ## Unique users: []
2025-07-03 00:29:36,112 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:29:36,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:36,115 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-07-03 00:29:36,119 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:36,121 [ 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-03 00:29:36,135 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-07-03 00:29:36,136 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-07-03 00:29:36,136 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-07-03 00:29:36,136 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-07-03 00:29:36,136 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-03 00:29:36,136 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-03 00:29:36,139 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-03 00:29:36,144 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-07-03 00:29:36,145 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:36,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:29:36,297 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-07-03 00:29:36,301 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-03 00:29:36,304 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#467](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-07-03 00:29:36,307 [ scc.config] DEBUG Found github.token
2025-07-03 00:29:36,307 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-07-03 00:29:36,307 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-07-03 00:29:36,311 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:36,313 [ 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-03 00:29:36,329 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-07-03 00:29:36,329 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-07-03 00:29:36,329 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-07-03 00:29:36,329 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-03 00:29:36,329 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-03 00:29:36,332 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-03 00:29:36,338 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-07-03 00:29:36,548 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:36,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:29:36,734 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-07-03 00:29:36,739 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-03 00:29:36,742 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#467](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/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-03 00:29:36,744 [ scc.config] DEBUG Found github.token
2025-07-03 00:29:36,744 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-07-03 00:29:36,744 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-03 00:29:36,785 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:29:36,785 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:36,787 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-03 00:29:36,827 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-03 00:29:36,831 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5690f46810> has no local changes
2025-07-03 00:29:36,831 [ 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#467 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/)'
2025-07-03 00:29:36,838 [ scc.git] DEBUG [detached HEAD e6c1cef] merge master -Dorg -Ssuccess-only
2025-07-03 00:29:36,839 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:29:36,839 [ scc.repo] DEBUG ## PRs found:
2025-07-03 00:29:36,985 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:37,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-07-03 00:29:37,635 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:37,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-07-03 00:29:38,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:38,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-07-03 00:29:38,609 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:38,858 [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-03 00:29:39,110 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:39,355 [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-03 00:29:39,606 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:39,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-07-03 00:29:40,095 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:40,274 [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-03 00:29:40,274 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-03 00:29:40,525 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:40,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-07-03 00:29:40,755 [ scc.repo] DEBUG # ... Include label: dependencies
2025-07-03 00:29:41,006 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:41,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-07-03 00:29:41,567 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:41,889 [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-03 00:29:42,140 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:42,397 [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-03 00:29:42,649 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:42,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-07-03 00:29:43,244 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:43,430 [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-03 00:29:43,431 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-07-03 00:29:43,682 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:43,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-07-03 00:29:43,919 [ scc.repo] DEBUG # ... Include label: dependencies
2025-07-03 00:29:44,170 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:44,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-07-03 00:29:44,729 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:45,000 [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-03 00:29:45,252 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:45,505 [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-03 00:29:45,757 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:46,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-07-03 00:29:46,305 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:46,508 [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-03 00:29:46,509 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-07-03 00:29:46,760 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:47,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-07-03 00:29:47,260 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:47,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-07-03 00:29:47,763 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:47,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-07-03 00:29:48,218 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:48,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-07-03 00:29:48,695 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:48,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-07-03 00:29:49,197 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:49,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-07-03 00:29:49,664 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:49,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-07-03 00:29:49,910 [ scc.repo] DEBUG ## Branches found:
2025-07-03 00:29:49,910 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-07-03 00:29:49,911 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:29:49,911 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:49,913 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-03 00:29:49,916 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-03 00:29:49,916 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-03 00:29:49,919 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-03 00:29:49,922 [ scc.git] DEBUG Already up to date.
2025-07-03 00:29:49,922 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-07-03 00:29:50,229 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-07-03 00:29:50,229 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-07-03 00:29:50,233 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-07-03 00:29:50,531 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-07-03 00:29:50,531 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-07-03 00:29:50,536 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-07-03 00:29:50,797 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-07-03 00:29:50,797 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-07-03 00:29:50,802 [ scc.git] DEBUG ## Unique users: []
2025-07-03 00:29:50,802 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:29:50,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:50,804 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-07-03 00:29:50,807 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:50,809 [ 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-03 00:29:50,818 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-03 00:29:50,821 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-07-03 00:29:50,821 [ scc.git] DEBUG package.json | 2 +-
2025-07-03 00:29:50,821 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-07-03 00:29:50,823 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:51,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:29:51,013 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-07-03 00:29:51,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:51,018 [ 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-03 00:29:51,028 [ scc.git] DEBUG Auto-merging package-lock.json
2025-07-03 00:29:51,028 [ scc.git] DEBUG Auto-merging package.json
2025-07-03 00:29:51,029 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-03 00:29:51,033 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-07-03 00:29:51,033 [ scc.git] DEBUG package.json | 2 +-
2025-07-03 00:29:51,033 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-07-03 00:29:51,264 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:51,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:29:51,432 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-07-03 00:29:51,436 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:51,438 [ 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-03 00:29:51,447 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-03 00:29:51,451 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-07-03 00:29:51,451 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-07-03 00:29:51,683 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:51,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:29:51,845 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-03 00:29:51,888 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:29:51,888 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:51,890 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-03 00:29:51,931 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-03 00:29:51,935 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f569052b410> has no local changes
2025-07-03 00:29:51,935 [ 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#467 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/)'
2025-07-03 00:29:51,942 [ scc.git] DEBUG [detached HEAD 4b23a9f] merge master -Dorg -Ssuccess-only
2025-07-03 00:29:51,943 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:29:51,943 [ scc.repo] DEBUG ## PRs found:
2025-07-03 00:29:52,097 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:52,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-07-03 00:29:52,302 [ scc.repo] DEBUG ## Branches found:
2025-07-03 00:29:52,302 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-07-03 00:29:52,302 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:29:52,302 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:52,305 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-03 00:29:52,307 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-03 00:29:52,307 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-03 00:29:52,310 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-03 00:29:52,313 [ scc.git] DEBUG Already up to date.
2025-07-03 00:29:52,313 [ scc.git] DEBUG ## Unique users: []
2025-07-03 00:29:52,313 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:29:52,313 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:52,316 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-03 00:29:52,355 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:29:52,355 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:52,357 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-03 00:29:52,395 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-03 00:29:52,399 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5690f33010> has no local changes
2025-07-03 00:29:52,399 [ 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#467 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/)'
2025-07-03 00:29:52,405 [ scc.git] DEBUG [detached HEAD 197a09b] merge master -Dorg -Ssuccess-only
2025-07-03 00:29:52,405 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:29:52,405 [ scc.repo] DEBUG ## PRs found:
2025-07-03 00:29:52,553 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:52,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-07-03 00:29:53,096 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:53,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-07-03 00:29:53,596 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:53,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-07-03 00:29:54,094 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:54,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-07-03 00:29:54,366 [ scc.repo] DEBUG ## Branches found:
2025-07-03 00:29:54,366 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-07-03 00:29:54,367 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:29:54,367 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:54,369 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-03 00:29:54,372 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-03 00:29:54,372 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-03 00:29:54,375 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-03 00:29:54,378 [ scc.git] DEBUG Already up to date.
2025-07-03 00:29:54,379 [ scc.git] DEBUG ## Unique users: []
2025-07-03 00:29:54,379 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:29:54,379 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:54,381 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-03 00:29:54,422 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:29:54,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:54,424 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-03 00:29:54,464 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-03 00:29:54,467 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5690e57950> has no local changes
2025-07-03 00:29:54,467 [ 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#467 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/)'
2025-07-03 00:29:54,473 [ scc.git] DEBUG [detached HEAD 8ca6415] merge master -Dorg -Ssuccess-only
2025-07-03 00:29:54,473 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:29:54,473 [ scc.repo] DEBUG ## PRs found:
2025-07-03 00:29:54,617 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:54,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-07-03 00:29:55,152 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:55,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-07-03 00:29:55,682 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:55,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-07-03 00:29:56,170 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:56,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-07-03 00:29:56,729 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:56,973 [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-03 00:29:57,224 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:57,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-07-03 00:29:57,804 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:58,013 [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-03 00:29:58,013 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-07-03 00:29:58,013 [ scc.repo] DEBUG ## Branches found:
2025-07-03 00:29:58,013 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-07-03 00:29:58,013 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:29:58,013 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:58,016 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-03 00:29:58,018 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-03 00:29:58,019 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-03 00:29:58,021 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-03 00:29:58,025 [ scc.git] DEBUG Already up to date.
2025-07-03 00:29:58,025 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-07-03 00:29:58,338 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-07-03 00:29:58,338 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-07-03 00:29:58,343 [ scc.git] DEBUG ## Unique users: []
2025-07-03 00:29:58,343 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:29:58,343 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:58,345 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-07-03 00:29:58,348 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:58,351 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-07-03 00:29:58,360 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-07-03 00:29:58,360 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-07-03 00:29:58,360 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-07-03 00:29:58,360 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-07-03 00:29:58,360 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-07-03 00:29:58,361 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-07-03 00:29:58,361 [ scc.git] DEBUG Auto-merging setup.py
2025-07-03 00:29:58,361 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-07-03 00:29:58,361 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-03 00:29:58,361 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-03 00:29:58,364 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-07-03 00:29:58,368 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-07-03 00:29:58,370 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:58,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:29:58,541 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-07-03 00:29:58,545 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-07-03 00:29:58,548 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#467](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- setup.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
--conflicts
2025-07-03 00:29:58,550 [ scc.config] DEBUG Found github.token
2025-07-03 00:29:58,550 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-07-03 00:29:58,550 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-03 00:29:58,591 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:29:58,591 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:29:58,593 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-03 00:29:58,632 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-03 00:29:58,636 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5692c95690> has no local changes
2025-07-03 00:29:58,636 [ 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#467 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/)'
2025-07-03 00:29:58,642 [ scc.git] DEBUG [detached HEAD bd2daaf] merge master -Dorg -Ssuccess-only
2025-07-03 00:29:58,643 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:29:58,643 [ scc.repo] DEBUG ## PRs found:
2025-07-03 00:29:58,793 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:59,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-07-03 00:29:59,374 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:29:59,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-07-03 00:29:59,853 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:00,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-07-03 00:30:00,424 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:00,683 [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-03 00:30:00,935 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:01,203 [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-03 00:30:01,455 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:01,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-07-03 00:30:02,077 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:02,285 [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-03 00:30:02,286 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-07-03 00:30:02,537 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:02,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-07-03 00:30:03,066 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:03,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-07-03 00:30:03,563 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:03,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-07-03 00:30:04,088 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:04,344 [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-03 00:30:04,596 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:04,872 [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-03 00:30:05,123 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:05,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-07-03 00:30:05,625 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:05,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-07-03 00:30:06,076 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:06,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-07-03 00:30:06,560 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:06,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-07-03 00:30:07,024 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:07,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-07-03 00:30:07,571 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:07,799 [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-03 00:30:08,050 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:08,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-07-03 00:30:08,522 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:08,709 [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-03 00:30:08,710 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-07-03 00:30:08,711 [ scc.repo] DEBUG ## Branches found:
2025-07-03 00:30:08,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-07-03 00:30:08,711 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:30:08,711 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:08,714 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-03 00:30:08,716 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-03 00:30:08,716 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-03 00:30:08,719 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-03 00:30:08,722 [ scc.git] DEBUG Already up to date.
2025-07-03 00:30:08,722 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-07-03 00:30:09,046 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-07-03 00:30:09,046 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-07-03 00:30:09,050 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-07-03 00:30:09,332 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-07-03 00:30:09,332 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-07-03 00:30:09,336 [ scc.git] DEBUG ## Unique users: []
2025-07-03 00:30:09,336 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:30:09,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:09,339 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-07-03 00:30:09,343 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:09,345 [ 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-03 00:30:09,358 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-03 00:30:09,362 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-07-03 00:30:09,362 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-07-03 00:30:09,362 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-07-03 00:30:09,362 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-07-03 00:30:09,362 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-07-03 00:30:09,362 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-07-03 00:30:09,362 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-07-03 00:30:09,363 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-07-03 00:30:09,363 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-07-03 00:30:09,364 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:09,364 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-07-03 00:30:09,364 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-07-03 00:30:09,364 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-07-03 00:30:09,364 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-07-03 00:30:09,364 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-07-03 00:30:09,364 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-07-03 00:30:09,364 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-07-03 00:30:09,364 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-07-03 00:30:09,364 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-07-03 00:30:09,364 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-07-03 00:30:09,364 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-07-03 00:30:09,364 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-07-03 00:30:09,364 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-07-03 00:30:09,364 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-07-03 00:30:09,364 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-07-03 00:30:09,364 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-07-03 00:30:09,364 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-07-03 00:30:09,364 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-07-03 00:30:09,364 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-07-03 00:30:09,364 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-07-03 00:30:09,364 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-07-03 00:30:09,364 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-07-03 00:30:09,364 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-07-03 00:30:09,364 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-07-03 00:30:09,364 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-07-03 00:30:09,364 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-07-03 00:30:09,364 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-07-03 00:30:09,364 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-07-03 00:30:09,365 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-07-03 00:30:09,365 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-07-03 00:30:09,365 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-07-03 00:30:09,365 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-07-03 00:30:09,365 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-07-03 00:30:09,365 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-07-03 00:30:09,365 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-07-03 00:30:09,365 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-07-03 00:30:09,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:09,520 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-07-03 00:30:09,524 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:09,527 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-07-03 00:30:09,537 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-03 00:30:09,539 [ scc.git] DEBUG docker | 1 +
2025-07-03 00:30:09,539 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-07-03 00:30:09,771 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:09,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:09,951 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-03 00:30:09,992 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:30:09,992 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:09,994 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-03 00:30:10,034 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-03 00:30:10,038 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5690f23b50> has no local changes
2025-07-03 00:30:10,038 [ 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#467 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/)'
2025-07-03 00:30:10,045 [ scc.git] DEBUG [detached HEAD de511f8] merge master -Dorg -Ssuccess-only
2025-07-03 00:30:10,045 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:10,046 [ scc.repo] DEBUG ## PRs found:
2025-07-03 00:30:10,202 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:10,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-07-03 00:30:10,386 [ scc.repo] DEBUG ## Branches found:
2025-07-03 00:30:10,386 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-07-03 00:30:10,386 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:30:10,386 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:10,388 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-03 00:30:10,391 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-03 00:30:10,391 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-03 00:30:10,394 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-03 00:30:10,396 [ scc.git] DEBUG Already up to date.
2025-07-03 00:30:10,396 [ scc.git] DEBUG ## Unique users: []
2025-07-03 00:30:10,396 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:30:10,397 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:10,399 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-03 00:30:10,437 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:30:10,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:10,439 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-03 00:30:10,477 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-03 00:30:10,480 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5690593950> has no local changes
2025-07-03 00:30:10,480 [ 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#467 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/)'
2025-07-03 00:30:10,486 [ scc.git] DEBUG [detached HEAD 3c5214f] merge master -Dorg -Ssuccess-only
2025-07-03 00:30:10,487 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:10,487 [ scc.repo] DEBUG ## PRs found:
2025-07-03 00:30:10,637 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:10,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2025-07-03 00:30:10,826 [ scc.repo] DEBUG ## Branches found:
2025-07-03 00:30:10,826 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-07-03 00:30:10,826 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:30:10,826 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:10,829 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-03 00:30:10,831 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-03 00:30:10,831 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-03 00:30:10,834 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-03 00:30:10,844 [ scc.git] DEBUG Updating deab817..160d894
2025-07-03 00:30:11,077 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:11,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls/20 HTTP/1.1" 200 None
2025-07-03 00:30:11,544 [ scc.git] DEBUG ## Unique users: []
2025-07-03 00:30:11,544 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:30:11,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:11,546 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-03 00:30:11,588 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:30:11,588 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:11,590 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-03 00:30:11,630 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-03 00:30:11,634 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5690597510> has no local changes
2025-07-03 00:30:11,634 [ 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#467 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/)'
2025-07-03 00:30:11,640 [ scc.git] DEBUG [detached HEAD c34e7a4] merge master -Dorg -Ssuccess-only
2025-07-03 00:30:11,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:11,641 [ scc.git] INFO Overriding base-branch from master to main
2025-07-03 00:30:11,641 [ scc.repo] DEBUG ## PRs found:
2025-07-03 00:30:11,794 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:12,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-07-03 00:30:12,334 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:12,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-07-03 00:30:12,839 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:13,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-07-03 00:30:13,312 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:13,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-07-03 00:30:13,857 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:14,104 [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-03 00:30:14,356 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:14,613 [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-03 00:30:14,865 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:15,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-07-03 00:30:15,330 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:15,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-07-03 00:30:15,822 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:16,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-07-03 00:30:16,319 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:16,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-07-03 00:30:16,897 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:17,100 [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-03 00:30:17,352 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:17,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-07-03 00:30:17,842 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:18,042 [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-03 00:30:18,042 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-07-03 00:30:18,042 [ scc.repo] DEBUG ## Branches found:
2025-07-03 00:30:18,042 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-07-03 00:30:18,043 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:30:18,043 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:18,045 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-07-03 00:30:18,048 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-03 00:30:18,048 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-07-03 00:30:18,051 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-07-03 00:30:18,054 [ scc.git] DEBUG Already up to date.
2025-07-03 00:30:18,054 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-07-03 00:30:18,382 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-07-03 00:30:18,382 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-07-03 00:30:18,386 [ scc.git] DEBUG ## Unique users: []
2025-07-03 00:30:18,386 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:30:18,386 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:18,388 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-07-03 00:30:18,392 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:18,394 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-07-03 00:30:18,402 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-07-03 00:30:18,402 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-07-03 00:30:18,402 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-03 00:30:18,402 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-03 00:30:18,405 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-07-03 00:30:18,410 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-07-03 00:30:18,411 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:18,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:18,594 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-07-03 00:30:18,597 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-07-03 00:30:18,600 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#467](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-07-03 00:30:18,603 [ scc.config] DEBUG Found github.token
2025-07-03 00:30:18,603 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-07-03 00:30:18,603 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-03 00:30:18,645 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:30:18,645 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:18,647 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-03 00:30:18,686 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-03 00:30:18,689 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f569054ca90> has no local changes
2025-07-03 00:30:18,689 [ 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#467 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/)'
2025-07-03 00:30:18,696 [ scc.git] DEBUG [detached HEAD 77dd7ef] merge master -Dorg -Ssuccess-only
2025-07-03 00:30:18,696 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:18,696 [ scc.repo] DEBUG ## PRs found:
2025-07-03 00:30:18,845 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:19,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-07-03 00:30:19,033 [ scc.repo] DEBUG ## Branches found:
2025-07-03 00:30:19,033 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-07-03 00:30:19,033 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:30:19,033 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:19,036 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-03 00:30:19,038 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-03 00:30:19,038 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-03 00:30:19,041 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-03 00:30:19,044 [ scc.git] DEBUG Already up to date.
2025-07-03 00:30:19,044 [ scc.git] DEBUG ## Unique users: []
2025-07-03 00:30:19,044 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:30:19,044 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:19,046 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-03 00:30:19,086 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:30:19,086 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:19,088 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-03 00:30:19,128 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-03 00:30:19,131 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f569056d590> has no local changes
2025-07-03 00:30:19,131 [ 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#467 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/)'
2025-07-03 00:30:19,137 [ scc.git] DEBUG [detached HEAD 73aaf8d] merge master -Dorg -Ssuccess-only
2025-07-03 00:30:19,138 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:19,138 [ scc.repo] DEBUG ## PRs found:
2025-07-03 00:30:19,284 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:19,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-07-03 00:30:19,482 [ scc.repo] DEBUG ## Branches found:
2025-07-03 00:30:19,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-07-03 00:30:19,482 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:30:19,482 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:19,484 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-03 00:30:19,486 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-03 00:30:19,486 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-03 00:30:19,489 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-03 00:30:19,492 [ scc.git] DEBUG Already up to date.
2025-07-03 00:30:19,492 [ scc.git] DEBUG ## Unique users: []
2025-07-03 00:30:19,492 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:30:19,492 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:19,495 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-03 00:30:19,535 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:30:19,535 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:19,537 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-03 00:30:19,574 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-03 00:30:19,578 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f56905b5dd0> has no local changes
2025-07-03 00:30:19,578 [ 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#467 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/)'
2025-07-03 00:30:19,584 [ scc.git] DEBUG [detached HEAD 42986e0] merge master -Dorg -Ssuccess-only
2025-07-03 00:30:19,585 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:19,585 [ scc.repo] DEBUG ## PRs found:
2025-07-03 00:30:19,733 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:20,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-07-03 00:30:20,267 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:20,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-07-03 00:30:20,767 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:20,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-07-03 00:30:21,234 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:21,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-07-03 00:30:21,759 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:22,014 [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-03 00:30:22,266 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:22,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-07-03 00:30:22,799 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:22,987 [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-03 00:30:22,987 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-07-03 00:30:22,988 [ scc.repo] DEBUG ## Branches found:
2025-07-03 00:30:22,988 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-07-03 00:30:22,988 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:30:22,988 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:22,991 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-03 00:30:22,993 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-03 00:30:22,993 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-03 00:30:22,996 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-03 00:30:22,999 [ scc.git] DEBUG Already up to date.
2025-07-03 00:30:22,999 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-07-03 00:30:23,313 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-07-03 00:30:23,313 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-07-03 00:30:23,317 [ scc.git] DEBUG ## Unique users: []
2025-07-03 00:30:23,317 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:30:23,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:23,320 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-07-03 00:30:23,323 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:23,325 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-07-03 00:30:23,334 [ scc.git] DEBUG Auto-merging Dockerfile
2025-07-03 00:30:23,334 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-07-03 00:30:23,335 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-03 00:30:23,335 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-03 00:30:23,338 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-07-03 00:30:23,343 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-07-03 00:30:23,344 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:23,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:23,498 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-07-03 00:30:23,501 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-07-03 00:30:23,504 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#467](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-07-03 00:30:23,506 [ scc.config] DEBUG Found github.token
2025-07-03 00:30:23,506 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-07-03 00:30:23,506 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-03 00:30:23,546 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:30:23,546 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:23,548 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-03 00:30:23,585 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-03 00:30:23,589 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f56905df890> has no local changes
2025-07-03 00:30:23,589 [ 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#467 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/)'
2025-07-03 00:30:23,597 [ scc.git] DEBUG [detached HEAD 91ec80b] merge master -Dorg -Ssuccess-only
2025-07-03 00:30:23,597 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:23,597 [ scc.git] INFO Overriding base-branch from master to develop
2025-07-03 00:30:23,597 [ scc.repo] DEBUG ## PRs found:
2025-07-03 00:30:23,750 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:24,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-07-03 00:30:24,338 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:24,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-07-03 00:30:24,834 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:25,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-07-03 00:30:25,320 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:25,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-07-03 00:30:25,812 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:26,053 [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-03 00:30:26,305 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:26,561 [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-03 00:30:26,812 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:27,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-07-03 00:30:27,325 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:27,500 [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-03 00:30:27,500 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-07-03 00:30:27,751 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:27,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-07-03 00:30:28,240 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:28,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-07-03 00:30:28,700 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:28,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-07-03 00:30:29,157 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:29,388 [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-03 00:30:29,640 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:29,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-07-03 00:30:30,108 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:30,286 [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-03 00:30:30,287 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-07-03 00:30:30,538 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:30,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-07-03 00:30:31,005 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:31,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-07-03 00:30:31,497 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:31,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-07-03 00:30:32,008 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:32,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-07-03 00:30:32,281 [ scc.repo] DEBUG ## Branches found:
2025-07-03 00:30:32,281 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-07-03 00:30:32,281 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:30:32,281 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:32,284 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-07-03 00:30:32,287 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-03 00:30:32,287 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-07-03 00:30:32,290 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-07-03 00:30:32,301 [ scc.git] DEBUG Updating 4b4c755..573db34
2025-07-03 00:30:32,531 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:32,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/227 HTTP/1.1" 200 None
2025-07-03 00:30:33,230 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:33,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-07-03 00:30:33,653 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-07-03 00:30:33,947 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-07-03 00:30:33,947 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-07-03 00:30:33,951 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-07-03 00:30:34,271 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-07-03 00:30:34,272 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-07-03 00:30:34,276 [ scc.git] DEBUG ## Unique users: []
2025-07-03 00:30:34,276 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:30:34,276 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:34,278 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-07-03 00:30:34,284 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:34,286 [ 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-03 00:30:34,298 [ 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-03 00:30:34,298 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-03 00:30:34,298 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-03 00:30:34,301 [ scc.git] DEBUG Calling 'git reset --hard 573db340d5d1429fa17c7e486206948412a7c150'
2025-07-03 00:30:34,305 [ scc.git] DEBUG HEAD is now at 573db34 Bump version: 5.9.1 → 5.9.2.dev0
2025-07-03 00:30:34,306 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:34,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:34,464 [ scc.git] DEBUG Calling 'git merge-base 573db340d5d1429fa17c7e486206948412a7c150 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-07-03 00:30:34,470 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..573db340d5d1429fa17c7e486206948412a7c150'
2025-07-03 00:30:34,474 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#467](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-07-03 00:30:34,476 [ scc.config] DEBUG Found github.token
2025-07-03 00:30:34,476 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-07-03 00:30:34,476 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-07-03 00:30:34,481 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:34,483 [ 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-03 00:30:34,493 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-03 00:30:34,496 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-07-03 00:30:34,496 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-07-03 00:30:34,715 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:34,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:34,904 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-03 00:30:34,944 [ scc.git] DEBUG Get sha1 of %s
2025-07-03 00:30:34,945 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-03 00:30:34,947 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-03 00:30:34,986 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-03 00:30:34,990 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5690e18690> has no local changes
2025-07-03 00:30:34,990 [ 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#467 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/)'
2025-07-03 00:30:34,997 [ scc.git] DEBUG [detached HEAD b4fbb35] merge master -Dorg -Ssuccess-only
2025-07-03 00:30:34,997 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:34,998 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-03 00:30:35,077 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-07-03 00:30:35,155 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:35,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:35,354 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-07-03 00:30:35,356 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-07-03 00:30:35,600 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:35,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:35,771 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-07-03 00:30:35,773 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-07-03 00:30:36,017 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:36,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:36,182 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-07-03 00:30:36,184 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-07-03 00:30:36,428 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:36,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:36,622 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-07-03 00:30:36,867 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:37,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:37,050 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-07-03 00:30:37,052 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-07-03 00:30:37,297 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:37,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:37,490 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-07-03 00:30:37,492 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-07-03 00:30:37,737 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:37,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:37,901 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-07-03 00:30:37,903 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-07-03 00:30:38,147 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:38,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:38,338 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-07-03 00:30:38,340 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-07-03 00:30:38,584 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:38,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:38,757 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-07-03 00:30:38,759 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-07-03 00:30:39,003 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:39,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:39,190 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-07-03 00:30:39,192 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-07-03 00:30:39,436 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:39,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:39,604 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-07-03 00:30:39,606 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-07-03 00:30:39,850 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:40,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:40,018 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-07-03 00:30:40,020 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-07-03 00:30:40,264 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:40,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:40,430 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-07-03 00:30:40,674 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:40,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:40,843 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-07-03 00:30:41,088 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:41,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:41,260 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-07-03 00:30:41,262 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-07-03 00:30:41,507 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:41,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:41,677 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-07-03 00:30:41,921 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:42,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:42,089 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-07-03 00:30:42,333 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:42,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:42,521 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-07-03 00:30:42,523 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-07-03 00:30:42,767 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:42,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:42,959 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-07-03 00:30:42,961 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-07-03 00:30:43,205 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:43,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:43,383 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-07-03 00:30:43,385 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-07-03 00:30:43,629 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:43,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:43,811 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-07-03 00:30:43,813 [ scc.config] DEBUG Found submodule.scripts.url
2025-07-03 00:30:44,057 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-03 00:30:44,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-03 00:30:44,224 [ scc.config] DEBUG Found submodule.scripts.branch
2025-07-03 00:30:44,224 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-03 00:30:44,318 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5690e898d0> has local changes
2025-07-03 00:30:44,318 [ 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..d7cad16
Previously merged:
- 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'
- PR 179 will-moore 'Changelog 0.6.0'
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#467 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/467/)'
2025-07-03 00:30:44,331 [ scc.git] DEBUG [detached HEAD 9b4e062] merge master -Dorg -Ssuccess-only
2025-07-03 00:30:44,331 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-07-03 00:30:44,332 [ scc.merge] INFO Repository: ome/omero-plugins
2025-07-03 00:30:44,332 [ scc.merge] INFO Already up to date.
2025-07-03 00:30:44,332 [ scc.merge] INFO
2025-07-03 00:30:44,332 [ scc.merge] INFO Merged PRs:
2025-07-03 00:30:44,332 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-07-03 00:30:44,332 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-07-03 00:30:44,332 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-07-03 00:30:44,332 [ scc.merge] INFO
2025-07-03 00:30:44,332 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-07-03 00:30:44,332 [ scc.merge] INFO Already up to date.
2025-07-03 00:30:44,332 [ scc.merge] INFO
2025-07-03 00:30:44,332 [ scc.merge] INFO
2025-07-03 00:30:44,332 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-07-03 00:30:44,332 [ scc.merge] INFO Excluded PRs:
2025-07-03 00:30:44,332 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-07-03 00:30:44,332 [ scc.merge] INFO Already up to date.
2025-07-03 00:30:44,332 [ scc.merge] INFO
2025-07-03 00:30:44,332 [ scc.merge] INFO
2025-07-03 00:30:44,332 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-07-03 00:30:44,332 [ scc.merge] INFO Excluded PRs:
2025-07-03 00:30:44,332 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-07-03 00:30:44,332 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-07-03 00:30:44,332 [ scc.merge] INFO Already up to date.
2025-07-03 00:30:44,332 [ scc.merge] INFO
2025-07-03 00:30:44,332 [ scc.merge] INFO Merged PRs:
2025-07-03 00:30:44,332 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-07-03 00:30:44,332 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-07-03 00:30:44,333 [ scc.merge] INFO
2025-07-03 00:30:44,333 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-07-03 00:30:44,333 [ scc.merge] INFO Excluded PRs:
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 174 will-moore 'Skip wells' (stage: draft)
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-07-03 00:30:44,333 [ scc.merge] INFO Updating 11d3587..d7cad16
2025-07-03 00:30:44,333 [ scc.merge] INFO Previously merged:
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 177 jburel 'Replace fromstring by frombuffer'
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 173 will-moore 'Add test_export_plate_polygons()'
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-03 00:30:44,333 [ scc.merge] INFO
2025-07-03 00:30:44,333 [ scc.merge] INFO Merged PRs:
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 179 will-moore 'Changelog 0.6.0'
2025-07-03 00:30:44,333 [ scc.merge] INFO
2025-07-03 00:30:44,333 [ scc.merge] INFO Repository: ome/omero-figure
2025-07-03 00:30:44,333 [ scc.merge] INFO Excluded PRs:
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-07-03 00:30:44,333 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-07-03 00:30:44,333 [ scc.merge] INFO Previously merged:
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-07-03 00:30:44,333 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-03 00:30:44,333 [ scc.merge] INFO
2025-07-03 00:30:44,333 [ scc.merge] INFO Merged PRs:
2025-07-03 00:30:44,334 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-07-03 00:30:44,334 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-07-03 00:30:44,334 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-07-03 00:30:44,334 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-07-03 00:30:44,334 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-07-03 00:30:44,334 [ scc.merge] INFO
2025-07-03 00:30:44,334 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-03 00:30:44,334 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-07-03 00:30:44,334 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-07-03 00:30:44,334 [ scc.merge] INFO
2025-07-03 00:30:44,334 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-07-03 00:30:44,334 [ scc.merge] INFO Already up to date.
2025-07-03 00:30:44,334 [ scc.merge] INFO
2025-07-03 00:30:44,334 [ scc.merge] INFO Merged PRs:
2025-07-03 00:30:44,334 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-07-03 00:30:44,334 [ scc.merge] INFO
2025-07-03 00:30:44,334 [ scc.merge] INFO Repository: ome/omero-gallery
2025-07-03 00:30:44,334 [ scc.merge] INFO Already up to date.
2025-07-03 00:30:44,334 [ scc.merge] INFO
2025-07-03 00:30:44,334 [ scc.merge] INFO Merged PRs:
2025-07-03 00:30:44,334 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-07-03 00:30:44,334 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-07-03 00:30:44,334 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-07-03 00:30:44,334 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-07-03 00:30:44,334 [ scc.merge] INFO
2025-07-03 00:30:44,334 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-03 00:30:44,334 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-07-03 00:30:44,334 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-07-03 00:30:44,334 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-07-03 00:30:44,334 [ scc.merge] INFO
2025-07-03 00:30:44,334 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-07-03 00:30:44,334 [ scc.merge] INFO Excluded PRs:
2025-07-03 00:30:44,334 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-07-03 00:30:44,334 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-07-03 00:30:44,334 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-07-03 00:30:44,334 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-07-03 00:30:44,334 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-07-03 00:30:44,334 [ scc.merge] INFO Updating 7a798ce..bb94cf8
2025-07-03 00:30:44,335 [ scc.merge] INFO Previously merged:
2025-07-03 00:30:44,335 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-03 00:30:44,335 [ scc.merge] INFO
2025-07-03 00:30:44,335 [ scc.merge] INFO Merged PRs:
2025-07-03 00:30:44,335 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-07-03 00:30:44,335 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-07-03 00:30:44,335 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-07-03 00:30:44,335 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-07-03 00:30:44,335 [ scc.merge] INFO
2025-07-03 00:30:44,335 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-03 00:30:44,335 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-07-03 00:30:44,335 [ scc.merge] INFO
2025-07-03 00:30:44,335 [ scc.merge] INFO Repository: ome/omero-mapr
2025-07-03 00:30:44,335 [ scc.merge] INFO Excluded PRs:
2025-07-03 00:30:44,335 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-07-03 00:30:44,335 [ scc.merge] INFO Already up to date.
2025-07-03 00:30:44,335 [ scc.merge] INFO
2025-07-03 00:30:44,335 [ scc.merge] INFO Merged PRs:
2025-07-03 00:30:44,335 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-07-03 00:30:44,335 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-03 00:30:44,335 [ scc.merge] INFO
2025-07-03 00:30:44,335 [ scc.merge] INFO Repository: ome/omero-metadata
2025-07-03 00:30:44,335 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-07-03 00:30:44,335 [ scc.merge] INFO Previously merged:
2025-07-03 00:30:44,335 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-03 00:30:44,335 [ scc.merge] INFO
2025-07-03 00:30:44,335 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-03 00:30:44,335 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-07-03 00:30:44,335 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-07-03 00:30:44,335 [ scc.merge] INFO
2025-07-03 00:30:44,335 [ scc.merge] INFO Repository: ome/omero-parade
2025-07-03 00:30:44,335 [ scc.merge] INFO Excluded PRs:
2025-07-03 00:30:44,335 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-07-03 00:30:44,335 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-07-03 00:30:44,335 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-07-03 00:30:44,335 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-07-03 00:30:44,335 [ scc.merge] INFO Already up to date.
2025-07-03 00:30:44,335 [ scc.merge] INFO
2025-07-03 00:30:44,335 [ scc.merge] INFO Merged PRs:
2025-07-03 00:30:44,336 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-07-03 00:30:44,336 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-07-03 00:30:44,336 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-03 00:30:44,336 [ scc.merge] INFO
2025-07-03 00:30:44,336 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-07-03 00:30:44,336 [ scc.merge] INFO Already up to date.
2025-07-03 00:30:44,336 [ scc.merge] INFO
2025-07-03 00:30:44,336 [ scc.merge] INFO
2025-07-03 00:30:44,336 [ scc.merge] INFO Repository: ome/omero-rois
2025-07-03 00:30:44,336 [ scc.merge] INFO Excluded PRs:
2025-07-03 00:30:44,336 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-07-03 00:30:44,336 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-07-03 00:30:44,336 [ scc.merge] INFO Already up to date.
2025-07-03 00:30:44,336 [ scc.merge] INFO
2025-07-03 00:30:44,336 [ scc.merge] INFO
2025-07-03 00:30:44,336 [ scc.merge] INFO Repository: ome/omero-signup
2025-07-03 00:30:44,336 [ scc.merge] INFO Already up to date.
2025-07-03 00:30:44,336 [ scc.merge] INFO
2025-07-03 00:30:44,336 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-03 00:30:44,336 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-07-03 00:30:44,336 [ scc.merge] INFO
2025-07-03 00:30:44,336 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-07-03 00:30:44,336 [ scc.merge] INFO Excluded PRs:
2025-07-03 00:30:44,336 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-07-03 00:30:44,336 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-07-03 00:30:44,336 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-07-03 00:30:44,336 [ scc.merge] INFO Already up to date.
2025-07-03 00:30:44,336 [ scc.merge] INFO
2025-07-03 00:30:44,336 [ scc.merge] INFO Merged PRs:
2025-07-03 00:30:44,336 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-07-03 00:30:44,336 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-07-03 00:30:44,336 [ scc.merge] INFO
2025-07-03 00:30:44,336 [ scc.merge] INFO Repository: ome/omero-upload
2025-07-03 00:30:44,336 [ scc.merge] INFO Already up to date.
2025-07-03 00:30:44,336 [ scc.merge] INFO
2025-07-03 00:30:44,336 [ scc.merge] INFO
2025-07-03 00:30:44,336 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-07-03 00:30:44,336 [ scc.merge] INFO Updating deab817..160d894
2025-07-03 00:30:44,336 [ scc.merge] INFO Previously merged:
2025-07-03 00:30:44,337 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-07-03 00:30:44,337 [ scc.merge] INFO
2025-07-03 00:30:44,337 [ scc.merge] INFO
2025-07-03 00:30:44,337 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-07-03 00:30:44,337 [ scc.merge] INFO Excluded PRs:
2025-07-03 00:30:44,337 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-07-03 00:30:44,337 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-07-03 00:30:44,337 [ scc.merge] INFO Already up to date.
2025-07-03 00:30:44,337 [ scc.merge] INFO
2025-07-03 00:30:44,337 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-03 00:30:44,337 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-07-03 00:30:44,337 [ scc.merge] INFO
2025-07-03 00:30:44,337 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-07-03 00:30:44,337 [ scc.merge] INFO Already up to date.
2025-07-03 00:30:44,337 [ scc.merge] INFO
2025-07-03 00:30:44,337 [ scc.merge] INFO
2025-07-03 00:30:44,337 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-07-03 00:30:44,337 [ scc.merge] INFO Already up to date.
2025-07-03 00:30:44,337 [ scc.merge] INFO
2025-07-03 00:30:44,337 [ scc.merge] INFO
2025-07-03 00:30:44,337 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-07-03 00:30:44,337 [ scc.merge] INFO Already up to date.
2025-07-03 00:30:44,337 [ scc.merge] INFO
2025-07-03 00:30:44,337 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-03 00:30:44,337 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-07-03 00:30:44,337 [ scc.merge] INFO
2025-07-03 00:30:44,337 [ scc.merge] INFO Repository: ome/scripts
2025-07-03 00:30:44,337 [ scc.merge] INFO Excluded PRs:
2025-07-03 00:30:44,337 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-07-03 00:30:44,337 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-07-03 00:30:44,337 [ scc.merge] INFO Updating 4b4c755..573db34
2025-07-03 00:30:44,337 [ scc.merge] INFO Previously merged:
2025-07-03 00:30:44,337 [ scc.merge] INFO - PR 227 jburel 'Replace tostring by tobytes'
2025-07-03 00:30:44,337 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-07-03 00:30:44,337 [ scc.merge] INFO
2025-07-03 00:30:44,337 [ scc.merge] INFO Merged PRs:
2025-07-03 00:30:44,337 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-07-03 00:30:44,337 [ scc.merge] INFO
2025-07-03 00:30:44,337 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-03 00:30:44,338 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-07-03 00:30:44,338 [ scc.merge] INFO
2025-07-03 00:30:44,338 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-07-03 00:30:44,338 [ scc.git] DEBUG Calling 'git remote'
2025-07-03 00:30:44,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-07-03 00:30:44,340 [ scc.git] DEBUG Calling 'git remote'
2025-07-03 00:30:44,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:44,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-07-03 00:30:44,342 [ scc.git] DEBUG Calling 'git remote'
2025-07-03 00:30:44,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:44,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-07-03 00:30:44,344 [ scc.git] DEBUG Calling 'git remote'
2025-07-03 00:30:44,346 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:44,346 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-07-03 00:30:44,346 [ scc.git] DEBUG Calling 'git remote'
2025-07-03 00:30:44,348 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:44,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-07-03 00:30:44,349 [ scc.git] DEBUG Calling 'git remote'
2025-07-03 00:30:44,351 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:44,351 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-07-03 00:30:44,351 [ scc.git] DEBUG Calling 'git remote'
2025-07-03 00:30:44,353 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:44,353 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-07-03 00:30:44,353 [ scc.git] DEBUG Calling 'git remote'
2025-07-03 00:30:44,355 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:44,355 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-07-03 00:30:44,355 [ scc.git] DEBUG Calling 'git remote'
2025-07-03 00:30:44,357 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:44,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-07-03 00:30:44,358 [ scc.git] DEBUG Calling 'git remote'
2025-07-03 00:30:44,360 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:44,360 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-07-03 00:30:44,360 [ scc.git] DEBUG Calling 'git remote'
2025-07-03 00:30:44,362 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:44,362 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-07-03 00:30:44,362 [ scc.git] DEBUG Calling 'git remote'
2025-07-03 00:30:44,364 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:44,364 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-07-03 00:30:44,365 [ scc.git] DEBUG Calling 'git remote'
2025-07-03 00:30:44,367 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:44,367 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-07-03 00:30:44,367 [ scc.git] DEBUG Calling 'git remote'
2025-07-03 00:30:44,369 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:44,369 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-07-03 00:30:44,369 [ scc.git] DEBUG Calling 'git remote'
2025-07-03 00:30:44,371 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:44,371 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-07-03 00:30:44,371 [ scc.git] DEBUG Calling 'git remote'
2025-07-03 00:30:44,373 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:44,373 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-07-03 00:30:44,373 [ scc.git] DEBUG Calling 'git remote'
2025-07-03 00:30:44,375 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:44,376 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-07-03 00:30:44,376 [ scc.git] DEBUG Calling 'git remote'
2025-07-03 00:30:44,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:44,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-07-03 00:30:44,378 [ scc.git] DEBUG Calling 'git remote'
2025-07-03 00:30:44,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:44,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-07-03 00:30:44,380 [ scc.git] DEBUG Calling 'git remote'
2025-07-03 00:30:44,382 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:44,382 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-07-03 00:30:44,382 [ scc.git] DEBUG Calling 'git remote'
2025-07-03 00:30:44,384 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:44,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-07-03 00:30:44,385 [ scc.git] DEBUG Calling 'git remote'
2025-07-03 00:30:44,387 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-03 00:30:44,387 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-07-03 00:30:44,387 [ scc.git] DEBUG Calling 'git remote'
2025-07-03 00:30:44,389 [ 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 9bc131a] 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 f3bf3fe] 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-03 00:31:32,550 [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-03 00:31:42,391 [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-03 00:31:44,888 [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-03 00:31:49,646 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-07-03 00:32:31,026 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/eb00aee0/images/svgs/logo.svg){kind=logo}
