Skipping 220 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-08-02 00:44:34,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:44:34,480 [ scc.git] DEBUG Calling 'git merge-base bb94cf8da960e3283090038b04432f301560f5e4 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-08-02 00:44:34,483 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..bb94cf8da960e3283090038b04432f301560f5e4'
2025-08-02 00:44:34,486 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#492](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-08-02 00:44:34,488 [ scc.config] DEBUG Found github.token
2025-08-02 00:44:34,488 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-08-02 00:44:34,488 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-02 00:44:34,529 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:44:34,529 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:44:34,531 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-02 00:44:34,571 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-02 00:44:34,578 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa5132cc6d0> has no local changes
2025-08-02 00:44:34,578 [ 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#492 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/)'
2025-08-02 00:44:34,587 [ scc.git] DEBUG [detached HEAD 61aa7cd] merge master -Dorg -Ssuccess-only
2025-08-02 00:44:34,587 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:44:34,587 [ scc.repo] DEBUG ## PRs found:
2025-08-02 00:44:34,730 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:35,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-08-02 00:44:35,266 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:35,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-08-02 00:44:35,787 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:36,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-08-02 00:44:36,382 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:36,627 [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-08-02 00:44:36,878 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:37,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-08-02 00:44:37,441 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:37,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-08-02 00:44:37,648 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-02 00:44:37,899 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:38,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-08-02 00:44:38,417 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:38,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-08-02 00:44:38,908 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:39,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-08-02 00:44:39,451 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:39,686 [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-08-02 00:44:39,938 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:40,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-08-02 00:44:40,456 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:40,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-08-02 00:44:40,659 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-08-02 00:44:40,659 [ scc.repo] DEBUG ## Branches found:
2025-08-02 00:44:40,659 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-08-02 00:44:40,660 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:44:40,660 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:44:40,663 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-02 00:44:40,665 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-02 00:44:40,665 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-02 00:44:40,668 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-02 00:44:40,671 [ scc.git] DEBUG Already up to date.
2025-08-02 00:44:40,671 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-08-02 00:44:40,947 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-08-02 00:44:40,947 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-08-02 00:44:40,951 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-08-02 00:44:41,234 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-08-02 00:44:41,234 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-08-02 00:44:41,238 [ scc.git] DEBUG ## Unique users: []
2025-08-02 00:44:41,238 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:44:41,238 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:44:41,241 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-08-02 00:44:41,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:44:41,247 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-08-02 00:44:41,257 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-02 00:44:41,260 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-08-02 00:44:41,260 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-08-02 00:44:41,261 [ scc.git] DEBUG requirements.txt | 2 +-
2025-08-02 00:44:41,261 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-08-02 00:44:41,261 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-08-02 00:44:41,261 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-08-02 00:44:41,262 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:41,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:44:41,449 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-08-02 00:44:41,453 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:44:41,455 [ 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-08-02 00:44:41,465 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-02 00:44:41,468 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-08-02 00:44:41,468 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-08-02 00:44:41,699 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:41,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:44:41,878 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-02 00:44:41,918 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:44:41,918 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:44:41,921 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-02 00:44:41,961 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-02 00:44:41,965 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa51308ecd0> has no local changes
2025-08-02 00:44:41,965 [ 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#492 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/)'
2025-08-02 00:44:41,972 [ scc.git] DEBUG [detached HEAD b435359] merge master -Dorg -Ssuccess-only
2025-08-02 00:44:41,973 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:44:41,973 [ scc.repo] DEBUG ## PRs found:
2025-08-02 00:44:42,129 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:42,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-08-02 00:44:42,715 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:42,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-08-02 00:44:43,206 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:43,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-08-02 00:44:43,710 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:43,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-08-02 00:44:44,240 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:44,454 [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-08-02 00:44:44,706 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:45,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-08-02 00:44:45,254 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:45,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-08-02 00:44:45,453 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-08-02 00:44:45,704 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:45,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-08-02 00:44:46,210 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:46,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-08-02 00:44:46,708 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:47,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-08-02 00:44:47,265 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:47,502 [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-08-02 00:44:47,753 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:47,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-08-02 00:44:48,202 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:48,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-08-02 00:44:48,436 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-08-02 00:44:48,436 [ scc.repo] DEBUG ## Branches found:
2025-08-02 00:44:48,436 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-08-02 00:44:48,436 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:44:48,436 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:44:48,439 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-02 00:44:48,441 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-02 00:44:48,441 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-02 00:44:48,445 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-02 00:44:48,452 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-08-02 00:44:48,687 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:49,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-08-02 00:44:49,066 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-08-02 00:44:49,349 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-08-02 00:44:49,349 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-08-02 00:44:49,353 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-08-02 00:44:49,629 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-08-02 00:44:49,629 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-08-02 00:44:49,633 [ scc.git] DEBUG ## Unique users: []
2025-08-02 00:44:49,633 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:44:49,633 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:44:49,636 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-08-02 00:44:49,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:44:49,643 [ 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-08-02 00:44:49,656 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-08-02 00:44:49,657 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-08-02 00:44:49,657 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-08-02 00:44:49,657 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-08-02 00:44:49,657 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-02 00:44:49,657 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-02 00:44:49,660 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-08-02 00:44:49,665 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-08-02 00:44:49,666 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:49,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:44:49,835 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-08-02 00:44:49,840 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-08-02 00:44:49,843 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#492](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-08-02 00:44:49,845 [ scc.config] DEBUG Found github.token
2025-08-02 00:44:49,845 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-08-02 00:44:49,845 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-08-02 00:44:49,850 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:44:49,852 [ 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-08-02 00:44:49,868 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-08-02 00:44:49,868 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-08-02 00:44:49,868 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-08-02 00:44:49,868 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-02 00:44:49,868 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-02 00:44:49,871 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-08-02 00:44:49,877 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-08-02 00:44:50,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:50,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:44:50,265 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-08-02 00:44:50,269 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-08-02 00:44:50,272 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#492](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/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-08-02 00:44:50,275 [ scc.config] DEBUG Found github.token
2025-08-02 00:44:50,275 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-08-02 00:44:50,275 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-02 00:44:50,317 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:44:50,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:44:50,320 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-02 00:44:50,357 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-02 00:44:50,361 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa5130d3710> has no local changes
2025-08-02 00:44:50,362 [ 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#492 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/)'
2025-08-02 00:44:50,368 [ scc.git] DEBUG [detached HEAD ee30e66] merge master -Dorg -Ssuccess-only
2025-08-02 00:44:50,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:44:50,368 [ scc.repo] DEBUG ## PRs found:
2025-08-02 00:44:50,516 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:50,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-08-02 00:44:51,080 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:51,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-08-02 00:44:51,581 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:51,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-08-02 00:44:52,187 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:52,465 [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-08-02 00:44:52,716 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:52,938 [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-08-02 00:44:53,189 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:53,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-08-02 00:44:53,659 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:53,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-08-02 00:44:53,880 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-02 00:44:54,131 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:54,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-08-02 00:44:54,391 [ scc.repo] DEBUG # ... Include label: dependencies
2025-08-02 00:44:54,642 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:54,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-08-02 00:44:55,215 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:55,500 [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-08-02 00:44:55,751 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:56,021 [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-08-02 00:44:56,273 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:56,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-08-02 00:44:56,755 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:56,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-08-02 00:44:56,934 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-08-02 00:44:57,185 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:57,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-08-02 00:44:57,415 [ scc.repo] DEBUG # ... Include label: dependencies
2025-08-02 00:44:57,666 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:58,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-08-02 00:44:58,267 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:58,547 [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-08-02 00:44:58,798 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:59,076 [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-08-02 00:44:59,328 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:44:59,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-08-02 00:44:59,868 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:00,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-08-02 00:45:00,093 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-08-02 00:45:00,344 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:00,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-08-02 00:45:00,847 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:01,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-08-02 00:45:01,351 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:01,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-08-02 00:45:01,838 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:02,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-08-02 00:45:02,332 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:02,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-08-02 00:45:02,797 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:03,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-08-02 00:45:03,320 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:03,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-08-02 00:45:03,581 [ scc.repo] DEBUG ## Branches found:
2025-08-02 00:45:03,581 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-08-02 00:45:03,581 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:03,581 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:03,584 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-02 00:45:03,586 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-02 00:45:03,586 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-02 00:45:03,589 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-02 00:45:03,592 [ scc.git] DEBUG Already up to date.
2025-08-02 00:45:03,592 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-08-02 00:45:03,876 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-08-02 00:45:03,876 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-08-02 00:45:03,881 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-08-02 00:45:04,169 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-08-02 00:45:04,169 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-08-02 00:45:04,173 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-08-02 00:45:04,448 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-08-02 00:45:04,448 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-08-02 00:45:04,453 [ scc.git] DEBUG ## Unique users: []
2025-08-02 00:45:04,453 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:04,453 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:04,455 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-08-02 00:45:04,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:04,460 [ 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-08-02 00:45:04,469 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-02 00:45:04,473 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-08-02 00:45:04,473 [ scc.git] DEBUG package.json | 2 +-
2025-08-02 00:45:04,473 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-08-02 00:45:04,474 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:04,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:04,648 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-08-02 00:45:04,651 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:04,653 [ 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-08-02 00:45:04,664 [ scc.git] DEBUG Auto-merging package-lock.json
2025-08-02 00:45:04,664 [ scc.git] DEBUG Auto-merging package.json
2025-08-02 00:45:04,665 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-02 00:45:04,669 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-08-02 00:45:04,669 [ scc.git] DEBUG package.json | 2 +-
2025-08-02 00:45:04,669 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-08-02 00:45:04,899 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:05,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:05,072 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-08-02 00:45:05,076 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:05,078 [ 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-08-02 00:45:05,087 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-02 00:45:05,090 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-08-02 00:45:05,090 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-08-02 00:45:05,323 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:05,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:05,500 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-02 00:45:05,541 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:05,542 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:05,544 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-02 00:45:05,584 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-02 00:45:05,588 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa5130c8350> has no local changes
2025-08-02 00:45:05,588 [ 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#492 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/)'
2025-08-02 00:45:05,595 [ scc.git] DEBUG [detached HEAD a8348f4] merge master -Dorg -Ssuccess-only
2025-08-02 00:45:05,595 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:05,595 [ scc.repo] DEBUG ## PRs found:
2025-08-02 00:45:05,751 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:05,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-08-02 00:45:05,956 [ scc.repo] DEBUG ## Branches found:
2025-08-02 00:45:05,956 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-08-02 00:45:05,956 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:05,956 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:05,959 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-02 00:45:05,961 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-02 00:45:05,961 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-02 00:45:05,964 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-02 00:45:05,967 [ scc.git] DEBUG Already up to date.
2025-08-02 00:45:05,967 [ scc.git] DEBUG ## Unique users: []
2025-08-02 00:45:05,967 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:05,967 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:05,969 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-02 00:45:06,009 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:06,009 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:06,011 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-02 00:45:06,052 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-02 00:45:06,055 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa5106efa90> has no local changes
2025-08-02 00:45:06,055 [ 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#492 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/)'
2025-08-02 00:45:06,061 [ scc.git] DEBUG [detached HEAD 4055f04] merge master -Dorg -Ssuccess-only
2025-08-02 00:45:06,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:06,061 [ scc.repo] DEBUG ## PRs found:
2025-08-02 00:45:06,207 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:06,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-08-02 00:45:06,739 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:07,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-08-02 00:45:07,277 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:07,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-08-02 00:45:07,741 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:08,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-08-02 00:45:08,001 [ scc.repo] DEBUG ## Branches found:
2025-08-02 00:45:08,002 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-08-02 00:45:08,002 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:08,002 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:08,004 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-02 00:45:08,007 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-02 00:45:08,007 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-02 00:45:08,011 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-02 00:45:08,014 [ scc.git] DEBUG Already up to date.
2025-08-02 00:45:08,014 [ scc.git] DEBUG ## Unique users: []
2025-08-02 00:45:08,014 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:08,014 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:08,016 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-02 00:45:08,058 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:08,058 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:08,060 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-02 00:45:08,101 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-02 00:45:08,104 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa51415c4d0> has no local changes
2025-08-02 00:45:08,104 [ 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#492 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/)'
2025-08-02 00:45:08,110 [ scc.git] DEBUG [detached HEAD 93e85b4] merge master -Dorg -Ssuccess-only
2025-08-02 00:45:08,110 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:08,110 [ scc.repo] DEBUG ## PRs found:
2025-08-02 00:45:08,252 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:08,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-08-02 00:45:08,840 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:09,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-08-02 00:45:09,328 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:09,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-08-02 00:45:09,811 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:10,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-08-02 00:45:10,375 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:10,588 [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-08-02 00:45:10,839 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:11,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-08-02 00:45:11,293 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:11,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-08-02 00:45:11,517 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-08-02 00:45:11,517 [ scc.repo] DEBUG ## Branches found:
2025-08-02 00:45:11,517 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-08-02 00:45:11,517 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:11,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:11,520 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-02 00:45:11,523 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-02 00:45:11,523 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-02 00:45:11,526 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-02 00:45:11,529 [ scc.git] DEBUG Already up to date.
2025-08-02 00:45:11,529 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-08-02 00:45:11,819 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-08-02 00:45:11,819 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-08-02 00:45:11,823 [ scc.git] DEBUG ## Unique users: []
2025-08-02 00:45:11,823 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:11,823 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:11,825 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-08-02 00:45:11,828 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:11,831 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-08-02 00:45:11,840 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-08-02 00:45:11,840 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-08-02 00:45:11,840 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-08-02 00:45:11,840 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-08-02 00:45:11,840 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-08-02 00:45:11,840 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-08-02 00:45:11,840 [ scc.git] DEBUG Auto-merging setup.py
2025-08-02 00:45:11,840 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-08-02 00:45:11,840 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-02 00:45:11,840 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-02 00:45:11,843 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-08-02 00:45:11,847 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-08-02 00:45:11,849 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:12,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:12,027 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-08-02 00:45:12,030 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-08-02 00:45:12,034 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#492](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/views.py
- setup.py
- omero_signup/signup_settings.py
--conflicts
2025-08-02 00:45:12,036 [ scc.config] DEBUG Found github.token
2025-08-02 00:45:12,036 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-08-02 00:45:12,036 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-02 00:45:12,077 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:12,077 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:12,079 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-02 00:45:12,116 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-02 00:45:12,119 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa510722050> has no local changes
2025-08-02 00:45:12,119 [ 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#492 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/)'
2025-08-02 00:45:12,125 [ scc.git] DEBUG [detached HEAD 60c4893] merge master -Dorg -Ssuccess-only
2025-08-02 00:45:12,126 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:12,126 [ scc.repo] DEBUG ## PRs found:
2025-08-02 00:45:12,278 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:12,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-08-02 00:45:12,847 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:13,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-08-02 00:45:13,342 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:13,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-08-02 00:45:13,934 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:14,196 [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-08-02 00:45:14,447 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:14,711 [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-08-02 00:45:14,962 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:15,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-08-02 00:45:15,426 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:15,634 [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-08-02 00:45:15,635 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-08-02 00:45:15,886 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:16,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-08-02 00:45:16,375 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:16,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-08-02 00:45:16,850 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:17,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-08-02 00:45:17,361 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:17,640 [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-08-02 00:45:17,892 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:18,129 [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-08-02 00:45:18,381 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:18,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-08-02 00:45:18,917 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:19,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-08-02 00:45:19,370 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:19,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-08-02 00:45:19,867 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:20,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-08-02 00:45:20,336 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:20,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-08-02 00:45:20,883 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:21,126 [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-08-02 00:45:21,377 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:21,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-08-02 00:45:21,887 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:22,065 [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-08-02 00:45:22,065 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-08-02 00:45:22,065 [ scc.repo] DEBUG ## Branches found:
2025-08-02 00:45:22,065 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-08-02 00:45:22,065 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:22,065 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:22,068 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-02 00:45:22,071 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-02 00:45:22,071 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-02 00:45:22,074 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-02 00:45:22,077 [ scc.git] DEBUG Already up to date.
2025-08-02 00:45:22,077 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-08-02 00:45:22,358 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-08-02 00:45:22,358 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-08-02 00:45:22,363 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-08-02 00:45:22,656 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-08-02 00:45:22,656 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-08-02 00:45:22,661 [ scc.git] DEBUG ## Unique users: []
2025-08-02 00:45:22,661 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:22,661 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:22,663 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-08-02 00:45:22,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:22,670 [ 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-08-02 00:45:22,682 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-02 00:45:22,685 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-08-02 00:45:22,686 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-08-02 00:45:22,686 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-08-02 00:45:22,686 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-08-02 00:45:22,686 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-08-02 00:45:22,686 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-08-02 00:45:22,686 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-08-02 00:45:22,686 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-08-02 00:45:22,686 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-08-02 00:45:22,687 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:22,687 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-08-02 00:45:22,687 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-08-02 00:45:22,687 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-08-02 00:45:22,687 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-08-02 00:45:22,687 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-08-02 00:45:22,687 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-08-02 00:45:22,687 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-08-02 00:45:22,687 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-08-02 00:45:22,687 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-08-02 00:45:22,687 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-08-02 00:45:22,687 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-08-02 00:45:22,687 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-08-02 00:45:22,688 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-08-02 00:45:22,688 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-08-02 00:45:22,688 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-08-02 00:45:22,688 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-08-02 00:45:22,688 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-08-02 00:45:22,688 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-08-02 00:45:22,688 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-08-02 00:45:22,688 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-08-02 00:45:22,688 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-08-02 00:45:22,688 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-08-02 00:45:22,688 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-08-02 00:45:22,688 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-08-02 00:45:22,688 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-08-02 00:45:22,688 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-08-02 00:45:22,688 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-08-02 00:45:22,688 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-08-02 00:45:22,688 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-08-02 00:45:22,688 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-08-02 00:45:22,688 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-08-02 00:45:22,688 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-08-02 00:45:22,688 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-08-02 00:45:22,688 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-08-02 00:45:22,688 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-08-02 00:45:22,688 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-08-02 00:45:22,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:22,854 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-08-02 00:45:22,859 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:22,861 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-08-02 00:45:22,872 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-02 00:45:22,875 [ scc.git] DEBUG docker | 1 +
2025-08-02 00:45:22,875 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-08-02 00:45:23,105 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:23,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:23,278 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-02 00:45:23,320 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:23,320 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:23,322 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-02 00:45:23,362 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-02 00:45:23,366 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa5106fb5d0> has no local changes
2025-08-02 00:45:23,367 [ 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#492 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/)'
2025-08-02 00:45:23,372 [ scc.git] DEBUG [detached HEAD d4d16b1] merge master -Dorg -Ssuccess-only
2025-08-02 00:45:23,373 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:23,373 [ scc.repo] DEBUG ## PRs found:
2025-08-02 00:45:23,530 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:23,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-08-02 00:45:23,715 [ scc.repo] DEBUG ## Branches found:
2025-08-02 00:45:23,715 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-08-02 00:45:23,715 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:23,715 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:23,718 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-02 00:45:23,720 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-02 00:45:23,720 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-02 00:45:23,723 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-02 00:45:23,726 [ scc.git] DEBUG Already up to date.
2025-08-02 00:45:23,726 [ scc.git] DEBUG ## Unique users: []
2025-08-02 00:45:23,726 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:23,726 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:23,729 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-02 00:45:23,767 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:23,768 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:23,770 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-02 00:45:23,810 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-02 00:45:23,813 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa510727410> has no local changes
2025-08-02 00:45:23,813 [ 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#492 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/)'
2025-08-02 00:45:23,820 [ scc.git] DEBUG [detached HEAD 5e072d1] merge master -Dorg -Ssuccess-only
2025-08-02 00:45:23,820 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:23,820 [ scc.repo] DEBUG ## PRs found:
2025-08-02 00:45:23,966 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:24,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2025-08-02 00:45:24,174 [ scc.repo] DEBUG ## Branches found:
2025-08-02 00:45:24,174 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-08-02 00:45:24,174 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:24,174 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:24,177 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-02 00:45:24,179 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-02 00:45:24,179 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-02 00:45:24,182 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-02 00:45:24,191 [ scc.git] DEBUG Updating deab817..160d894
2025-08-02 00:45:24,425 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:24,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls/20 HTTP/1.1" 200 None
2025-08-02 00:45:24,896 [ scc.git] DEBUG ## Unique users: []
2025-08-02 00:45:24,896 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:24,896 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:24,898 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-02 00:45:24,940 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:24,940 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:24,943 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-02 00:45:24,982 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-02 00:45:24,986 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa512fef7d0> has no local changes
2025-08-02 00:45:24,986 [ 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#492 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/)'
2025-08-02 00:45:24,992 [ scc.git] DEBUG [detached HEAD ae7f7c7] merge master -Dorg -Ssuccess-only
2025-08-02 00:45:24,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:24,993 [ scc.git] INFO Overriding base-branch from master to main
2025-08-02 00:45:24,993 [ scc.repo] DEBUG ## PRs found:
2025-08-02 00:45:25,147 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:25,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-08-02 00:45:25,687 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:25,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-08-02 00:45:26,197 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:26,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-08-02 00:45:26,678 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:26,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-08-02 00:45:27,196 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:27,460 [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-08-02 00:45:27,711 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:27,961 [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-08-02 00:45:28,213 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:28,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-08-02 00:45:28,702 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:28,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-08-02 00:45:29,198 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:29,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-08-02 00:45:29,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:29,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-08-02 00:45:30,188 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:30,412 [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-08-02 00:45:30,663 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:30,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-08-02 00:45:31,209 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:31,406 [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-08-02 00:45:31,407 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-08-02 00:45:31,407 [ scc.repo] DEBUG ## Branches found:
2025-08-02 00:45:31,407 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-08-02 00:45:31,407 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:31,407 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:31,410 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-08-02 00:45:31,412 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-02 00:45:31,412 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-08-02 00:45:31,415 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-08-02 00:45:31,418 [ scc.git] DEBUG Already up to date.
2025-08-02 00:45:31,418 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-08-02 00:45:31,721 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-08-02 00:45:31,722 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-08-02 00:45:31,726 [ scc.git] DEBUG ## Unique users: []
2025-08-02 00:45:31,726 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:31,726 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:31,728 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-08-02 00:45:31,731 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:31,734 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-08-02 00:45:31,742 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-08-02 00:45:31,742 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-08-02 00:45:31,742 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-02 00:45:31,743 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-02 00:45:31,745 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-08-02 00:45:31,749 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-08-02 00:45:31,751 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:31,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:31,931 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-08-02 00:45:31,935 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-08-02 00:45:31,938 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#492](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-08-02 00:45:31,940 [ scc.config] DEBUG Found github.token
2025-08-02 00:45:31,940 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-08-02 00:45:31,940 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-02 00:45:31,980 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:31,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:31,982 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-02 00:45:32,022 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-02 00:45:32,025 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa510702bd0> has no local changes
2025-08-02 00:45:32,025 [ 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#492 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/)'
2025-08-02 00:45:32,031 [ scc.git] DEBUG [detached HEAD 845c716] merge master -Dorg -Ssuccess-only
2025-08-02 00:45:32,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:32,032 [ scc.repo] DEBUG ## PRs found:
2025-08-02 00:45:32,183 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:32,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-08-02 00:45:32,386 [ scc.repo] DEBUG ## Branches found:
2025-08-02 00:45:32,386 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-08-02 00:45:32,387 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:32,387 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:32,389 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-02 00:45:32,391 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-02 00:45:32,392 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-02 00:45:32,394 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-02 00:45:32,397 [ scc.git] DEBUG Already up to date.
2025-08-02 00:45:32,397 [ scc.git] DEBUG ## Unique users: []
2025-08-02 00:45:32,398 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:32,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:32,400 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-02 00:45:32,439 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:32,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:32,441 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-02 00:45:32,480 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-02 00:45:32,483 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa510724f50> has no local changes
2025-08-02 00:45:32,483 [ 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#492 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/)'
2025-08-02 00:45:32,490 [ scc.git] DEBUG [detached HEAD 6640bcd] merge master -Dorg -Ssuccess-only
2025-08-02 00:45:32,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:32,490 [ scc.repo] DEBUG ## PRs found:
2025-08-02 00:45:32,637 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:32,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-08-02 00:45:32,834 [ scc.repo] DEBUG ## Branches found:
2025-08-02 00:45:32,835 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-08-02 00:45:32,835 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:32,835 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:32,837 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-02 00:45:32,840 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-02 00:45:32,840 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-02 00:45:32,842 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-02 00:45:32,846 [ scc.git] DEBUG Already up to date.
2025-08-02 00:45:32,846 [ scc.git] DEBUG ## Unique users: []
2025-08-02 00:45:32,846 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:32,846 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:32,848 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-02 00:45:32,888 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:32,888 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:32,890 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-02 00:45:32,929 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-02 00:45:32,933 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa51075e3d0> has no local changes
2025-08-02 00:45:32,933 [ 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#492 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/)'
2025-08-02 00:45:32,939 [ scc.git] DEBUG [detached HEAD 3917cf2] merge master -Dorg -Ssuccess-only
2025-08-02 00:45:32,939 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:32,939 [ scc.repo] DEBUG ## PRs found:
2025-08-02 00:45:33,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:33,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-08-02 00:45:33,634 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:33,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-08-02 00:45:34,148 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:34,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-08-02 00:45:34,635 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:34,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-08-02 00:45:35,155 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:35,429 [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-08-02 00:45:35,681 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:36,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-08-02 00:45:36,255 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:36,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-08-02 00:45:36,459 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-08-02 00:45:36,459 [ scc.repo] DEBUG ## Branches found:
2025-08-02 00:45:36,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-08-02 00:45:36,459 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:36,459 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:36,462 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-02 00:45:36,465 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-02 00:45:36,465 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-02 00:45:36,468 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-02 00:45:36,471 [ scc.git] DEBUG Already up to date.
2025-08-02 00:45:36,471 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-08-02 00:45:36,751 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-08-02 00:45:36,751 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-08-02 00:45:36,756 [ scc.git] DEBUG ## Unique users: []
2025-08-02 00:45:36,756 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:36,756 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:36,758 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-08-02 00:45:36,761 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:36,763 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-08-02 00:45:36,772 [ scc.git] DEBUG Auto-merging Dockerfile
2025-08-02 00:45:36,772 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-08-02 00:45:36,773 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-02 00:45:36,773 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-02 00:45:36,776 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-08-02 00:45:36,781 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-08-02 00:45:36,782 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:36,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:36,951 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-08-02 00:45:36,954 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-08-02 00:45:36,957 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#492](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-08-02 00:45:36,959 [ scc.config] DEBUG Found github.token
2025-08-02 00:45:36,959 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-08-02 00:45:36,959 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-02 00:45:37,000 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:37,000 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:37,002 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-02 00:45:37,041 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-02 00:45:37,045 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa5107689d0> has no local changes
2025-08-02 00:45:37,045 [ 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#492 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/)'
2025-08-02 00:45:37,051 [ scc.git] DEBUG [detached HEAD b135950] merge master -Dorg -Ssuccess-only
2025-08-02 00:45:37,052 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:37,052 [ scc.git] INFO Overriding base-branch from master to develop
2025-08-02 00:45:37,052 [ scc.repo] DEBUG ## PRs found:
2025-08-02 00:45:37,202 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:37,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-08-02 00:45:37,812 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:38,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-08-02 00:45:38,340 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:38,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-08-02 00:45:38,815 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:39,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-08-02 00:45:39,305 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:39,531 [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-08-02 00:45:39,782 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:40,025 [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-08-02 00:45:40,277 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:40,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-08-02 00:45:40,862 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:41,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-08-02 00:45:41,051 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-08-02 00:45:41,302 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:41,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-08-02 00:45:41,773 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:41,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-08-02 00:45:42,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:42,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-08-02 00:45:42,789 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:43,007 [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-08-02 00:45:43,258 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:43,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-08-02 00:45:43,729 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:43,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-08-02 00:45:43,926 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-08-02 00:45:44,176 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:44,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-08-02 00:45:44,685 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:44,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-08-02 00:45:45,208 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:45,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-08-02 00:45:45,753 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:46,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-08-02 00:45:46,009 [ scc.repo] DEBUG ## Branches found:
2025-08-02 00:45:46,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-08-02 00:45:46,009 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:46,009 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:46,012 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-08-02 00:45:46,014 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-02 00:45:46,014 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-08-02 00:45:46,018 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-08-02 00:45:46,028 [ scc.git] DEBUG Updating 4b4c755..573db34
2025-08-02 00:45:46,258 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:46,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/227 HTTP/1.1" 200 None
2025-08-02 00:45:46,979 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:47,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-08-02 00:45:47,403 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-08-02 00:45:47,696 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-08-02 00:45:47,696 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-08-02 00:45:47,700 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-08-02 00:45:47,987 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-08-02 00:45:47,987 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-08-02 00:45:47,992 [ scc.git] DEBUG ## Unique users: []
2025-08-02 00:45:47,992 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:47,992 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:47,994 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-08-02 00:45:48,000 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:48,002 [ 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-08-02 00:45:48,014 [ 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-08-02 00:45:48,014 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-02 00:45:48,014 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-02 00:45:48,017 [ scc.git] DEBUG Calling 'git reset --hard 573db340d5d1429fa17c7e486206948412a7c150'
2025-08-02 00:45:48,021 [ scc.git] DEBUG HEAD is now at 573db34 Bump version: 5.9.1 → 5.9.2.dev0
2025-08-02 00:45:48,022 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:48,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:48,197 [ scc.git] DEBUG Calling 'git merge-base 573db340d5d1429fa17c7e486206948412a7c150 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-08-02 00:45:48,203 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..573db340d5d1429fa17c7e486206948412a7c150'
2025-08-02 00:45:48,207 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#492](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-08-02 00:45:48,209 [ scc.config] DEBUG Found github.token
2025-08-02 00:45:48,209 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-08-02 00:45:48,209 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-08-02 00:45:48,213 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:48,216 [ 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-08-02 00:45:48,226 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-02 00:45:48,229 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-08-02 00:45:48,230 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-08-02 00:45:48,448 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:48,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:48,615 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-02 00:45:48,656 [ scc.git] DEBUG Get sha1 of %s
2025-08-02 00:45:48,656 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-02 00:45:48,659 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-02 00:45:48,696 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-02 00:45:48,699 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa51076a310> has no local changes
2025-08-02 00:45:48,699 [ 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#492 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/)'
2025-08-02 00:45:48,706 [ scc.git] DEBUG [detached HEAD cc42f46] merge master -Dorg -Ssuccess-only
2025-08-02 00:45:48,706 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:48,707 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-02 00:45:48,782 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-08-02 00:45:48,866 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:49,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:49,038 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-08-02 00:45:49,041 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-08-02 00:45:49,284 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:49,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:49,458 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-08-02 00:45:49,460 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-08-02 00:45:49,704 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:49,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:49,879 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-08-02 00:45:49,881 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-08-02 00:45:50,126 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:50,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:50,309 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-08-02 00:45:50,554 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:50,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:50,727 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-08-02 00:45:50,729 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-08-02 00:45:50,973 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:51,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:51,152 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-08-02 00:45:51,154 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-08-02 00:45:51,398 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:51,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:51,608 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-08-02 00:45:51,610 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-08-02 00:45:51,854 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:52,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:52,021 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-08-02 00:45:52,023 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-08-02 00:45:52,268 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:52,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:52,453 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-08-02 00:45:52,455 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-08-02 00:45:52,699 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:52,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:52,972 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-08-02 00:45:52,974 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-08-02 00:45:53,219 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:53,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:53,397 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-08-02 00:45:53,399 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-08-02 00:45:53,643 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:53,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:53,820 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-08-02 00:45:53,822 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-08-02 00:45:54,066 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:54,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:54,247 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-08-02 00:45:54,492 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:54,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:54,671 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-08-02 00:45:54,916 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:55,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:55,093 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-08-02 00:45:55,095 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-08-02 00:45:55,339 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:55,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:55,507 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-08-02 00:45:55,750 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:55,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:55,945 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-08-02 00:45:56,190 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:56,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:56,385 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-08-02 00:45:56,387 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-08-02 00:45:56,631 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:56,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:56,820 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-08-02 00:45:56,822 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-08-02 00:45:57,067 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:57,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:57,295 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-08-02 00:45:57,297 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-08-02 00:45:57,541 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:57,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:57,729 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-08-02 00:45:57,731 [ scc.config] DEBUG Found submodule.scripts.url
2025-08-02 00:45:57,975 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-02 00:45:58,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-02 00:45:58,148 [ scc.config] DEBUG Found submodule.scripts.branch
2025-08-02 00:45:58,148 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-02 00:45:58,237 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa51416c150> has local changes
2025-08-02 00:45:58,237 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
- PR 71 dominikl 'Escape slash character in image names'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 174 will-moore 'Skip wells' (stage: draft)
- PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 167 dominikl 'Add extinfo command' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
Updating 11d3587..f7eea7c
Previously merged:
- PR 179 will-moore 'Changelog 0.6.0'
- PR 177 jburel 'Replace fromstring by frombuffer'
- PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
- PR 147 will-moore 'Name option'
- PR 173 will-moore 'Add test_export_plate_polygons()'
- PR 171 will-moore 'Initial addition of integration tests'
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..d2c6f5bc
Previously merged:
- PR 638 Rdornier 'Fix arrow opacity'
- 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'
- PR 637 Rdornier 'Fix scalebar position'
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#492 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/492/)'
2025-08-02 00:45:58,250 [ scc.git] DEBUG [detached HEAD bcc9ac3] merge master -Dorg -Ssuccess-only
2025-08-02 00:45:58,250 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-08-02 00:45:58,251 [ scc.merge] INFO Repository: ome/omero-plugins
2025-08-02 00:45:58,251 [ scc.merge] INFO Already up to date.
2025-08-02 00:45:58,251 [ scc.merge] INFO
2025-08-02 00:45:58,251 [ scc.merge] INFO Merged PRs:
2025-08-02 00:45:58,251 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-08-02 00:45:58,251 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-08-02 00:45:58,251 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-08-02 00:45:58,251 [ scc.merge] INFO
2025-08-02 00:45:58,251 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-08-02 00:45:58,251 [ scc.merge] INFO Already up to date.
2025-08-02 00:45:58,251 [ scc.merge] INFO
2025-08-02 00:45:58,251 [ scc.merge] INFO
2025-08-02 00:45:58,251 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-08-02 00:45:58,251 [ scc.merge] INFO Excluded PRs:
2025-08-02 00:45:58,251 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-08-02 00:45:58,251 [ scc.merge] INFO Already up to date.
2025-08-02 00:45:58,251 [ scc.merge] INFO
2025-08-02 00:45:58,251 [ scc.merge] INFO
2025-08-02 00:45:58,251 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-08-02 00:45:58,251 [ scc.merge] INFO Excluded PRs:
2025-08-02 00:45:58,251 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-08-02 00:45:58,251 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-08-02 00:45:58,251 [ scc.merge] INFO Already up to date.
2025-08-02 00:45:58,251 [ scc.merge] INFO
2025-08-02 00:45:58,251 [ scc.merge] INFO Merged PRs:
2025-08-02 00:45:58,251 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-08-02 00:45:58,251 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-08-02 00:45:58,252 [ scc.merge] INFO
2025-08-02 00:45:58,252 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-08-02 00:45:58,252 [ scc.merge] INFO Excluded PRs:
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 174 will-moore 'Skip wells' (stage: draft)
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-08-02 00:45:58,252 [ scc.merge] INFO Updating 11d3587..f7eea7c
2025-08-02 00:45:58,252 [ scc.merge] INFO Previously merged:
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 179 will-moore 'Changelog 0.6.0'
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 177 jburel 'Replace fromstring by frombuffer'
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 173 will-moore 'Add test_export_plate_polygons()'
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-02 00:45:58,252 [ scc.merge] INFO
2025-08-02 00:45:58,252 [ scc.merge] INFO Merged PRs:
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
2025-08-02 00:45:58,252 [ scc.merge] INFO
2025-08-02 00:45:58,252 [ scc.merge] INFO Repository: ome/omero-figure
2025-08-02 00:45:58,252 [ scc.merge] INFO Excluded PRs:
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-08-02 00:45:58,252 [ scc.merge] INFO Updating 9cc36cde..d2c6f5bc
2025-08-02 00:45:58,252 [ scc.merge] INFO Previously merged:
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity'
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-02 00:45:58,252 [ scc.merge] INFO
2025-08-02 00:45:58,252 [ scc.merge] INFO Merged PRs:
2025-08-02 00:45:58,252 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-08-02 00:45:58,253 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-08-02 00:45:58,253 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-08-02 00:45:58,253 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-08-02 00:45:58,253 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-08-02 00:45:58,253 [ scc.merge] INFO
2025-08-02 00:45:58,253 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-02 00:45:58,253 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-08-02 00:45:58,253 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-08-02 00:45:58,253 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position'
2025-08-02 00:45:58,253 [ scc.merge] INFO
2025-08-02 00:45:58,253 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-08-02 00:45:58,253 [ scc.merge] INFO Already up to date.
2025-08-02 00:45:58,253 [ scc.merge] INFO
2025-08-02 00:45:58,253 [ scc.merge] INFO Merged PRs:
2025-08-02 00:45:58,253 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-08-02 00:45:58,253 [ scc.merge] INFO
2025-08-02 00:45:58,253 [ scc.merge] INFO Repository: ome/omero-gallery
2025-08-02 00:45:58,253 [ scc.merge] INFO Already up to date.
2025-08-02 00:45:58,253 [ scc.merge] INFO
2025-08-02 00:45:58,253 [ scc.merge] INFO Merged PRs:
2025-08-02 00:45:58,253 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-08-02 00:45:58,253 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-08-02 00:45:58,253 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-08-02 00:45:58,253 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-08-02 00:45:58,253 [ scc.merge] INFO
2025-08-02 00:45:58,253 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-02 00:45:58,253 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-08-02 00:45:58,253 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-08-02 00:45:58,253 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-08-02 00:45:58,253 [ scc.merge] INFO
2025-08-02 00:45:58,253 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-08-02 00:45:58,253 [ scc.merge] INFO Excluded PRs:
2025-08-02 00:45:58,253 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-08-02 00:45:58,253 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-08-02 00:45:58,253 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-08-02 00:45:58,253 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-08-02 00:45:58,253 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-08-02 00:45:58,253 [ scc.merge] INFO Updating 7a798ce..bb94cf8
2025-08-02 00:45:58,253 [ scc.merge] INFO Previously merged:
2025-08-02 00:45:58,254 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-02 00:45:58,254 [ scc.merge] INFO
2025-08-02 00:45:58,254 [ scc.merge] INFO Merged PRs:
2025-08-02 00:45:58,254 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-08-02 00:45:58,254 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-08-02 00:45:58,254 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-08-02 00:45:58,254 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-08-02 00:45:58,254 [ scc.merge] INFO
2025-08-02 00:45:58,254 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-02 00:45:58,254 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-08-02 00:45:58,254 [ scc.merge] INFO
2025-08-02 00:45:58,254 [ scc.merge] INFO Repository: ome/omero-mapr
2025-08-02 00:45:58,254 [ scc.merge] INFO Excluded PRs:
2025-08-02 00:45:58,254 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-08-02 00:45:58,254 [ scc.merge] INFO Already up to date.
2025-08-02 00:45:58,254 [ scc.merge] INFO
2025-08-02 00:45:58,254 [ scc.merge] INFO Merged PRs:
2025-08-02 00:45:58,254 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-08-02 00:45:58,254 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-02 00:45:58,254 [ scc.merge] INFO
2025-08-02 00:45:58,254 [ scc.merge] INFO Repository: ome/omero-metadata
2025-08-02 00:45:58,254 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-08-02 00:45:58,254 [ scc.merge] INFO Previously merged:
2025-08-02 00:45:58,254 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-02 00:45:58,254 [ scc.merge] INFO
2025-08-02 00:45:58,254 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-02 00:45:58,254 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-08-02 00:45:58,254 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-08-02 00:45:58,254 [ scc.merge] INFO
2025-08-02 00:45:58,254 [ scc.merge] INFO Repository: ome/omero-parade
2025-08-02 00:45:58,254 [ scc.merge] INFO Excluded PRs:
2025-08-02 00:45:58,254 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-08-02 00:45:58,254 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-08-02 00:45:58,254 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-08-02 00:45:58,254 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-08-02 00:45:58,254 [ scc.merge] INFO Already up to date.
2025-08-02 00:45:58,254 [ scc.merge] INFO
2025-08-02 00:45:58,254 [ scc.merge] INFO Merged PRs:
2025-08-02 00:45:58,254 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-08-02 00:45:58,255 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-08-02 00:45:58,255 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-02 00:45:58,255 [ scc.merge] INFO
2025-08-02 00:45:58,255 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-08-02 00:45:58,255 [ scc.merge] INFO Already up to date.
2025-08-02 00:45:58,255 [ scc.merge] INFO
2025-08-02 00:45:58,255 [ scc.merge] INFO
2025-08-02 00:45:58,255 [ scc.merge] INFO Repository: ome/omero-rois
2025-08-02 00:45:58,255 [ scc.merge] INFO Excluded PRs:
2025-08-02 00:45:58,255 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-08-02 00:45:58,255 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-08-02 00:45:58,255 [ scc.merge] INFO Already up to date.
2025-08-02 00:45:58,255 [ scc.merge] INFO
2025-08-02 00:45:58,255 [ scc.merge] INFO
2025-08-02 00:45:58,255 [ scc.merge] INFO Repository: ome/omero-signup
2025-08-02 00:45:58,255 [ scc.merge] INFO Already up to date.
2025-08-02 00:45:58,255 [ scc.merge] INFO
2025-08-02 00:45:58,255 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-02 00:45:58,255 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-08-02 00:45:58,255 [ scc.merge] INFO
2025-08-02 00:45:58,255 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-08-02 00:45:58,255 [ scc.merge] INFO Excluded PRs:
2025-08-02 00:45:58,255 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-08-02 00:45:58,255 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-08-02 00:45:58,255 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-08-02 00:45:58,255 [ scc.merge] INFO Already up to date.
2025-08-02 00:45:58,255 [ scc.merge] INFO
2025-08-02 00:45:58,255 [ scc.merge] INFO Merged PRs:
2025-08-02 00:45:58,255 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-08-02 00:45:58,255 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-08-02 00:45:58,255 [ scc.merge] INFO
2025-08-02 00:45:58,255 [ scc.merge] INFO Repository: ome/omero-upload
2025-08-02 00:45:58,255 [ scc.merge] INFO Already up to date.
2025-08-02 00:45:58,255 [ scc.merge] INFO
2025-08-02 00:45:58,255 [ scc.merge] INFO
2025-08-02 00:45:58,255 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-08-02 00:45:58,255 [ scc.merge] INFO Updating deab817..160d894
2025-08-02 00:45:58,255 [ scc.merge] INFO Previously merged:
2025-08-02 00:45:58,255 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-08-02 00:45:58,256 [ scc.merge] INFO
2025-08-02 00:45:58,256 [ scc.merge] INFO
2025-08-02 00:45:58,256 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-08-02 00:45:58,256 [ scc.merge] INFO Excluded PRs:
2025-08-02 00:45:58,256 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-08-02 00:45:58,256 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-08-02 00:45:58,256 [ scc.merge] INFO Already up to date.
2025-08-02 00:45:58,256 [ scc.merge] INFO
2025-08-02 00:45:58,256 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-02 00:45:58,256 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-08-02 00:45:58,256 [ scc.merge] INFO
2025-08-02 00:45:58,256 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-08-02 00:45:58,256 [ scc.merge] INFO Already up to date.
2025-08-02 00:45:58,256 [ scc.merge] INFO
2025-08-02 00:45:58,256 [ scc.merge] INFO
2025-08-02 00:45:58,256 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-08-02 00:45:58,256 [ scc.merge] INFO Already up to date.
2025-08-02 00:45:58,256 [ scc.merge] INFO
2025-08-02 00:45:58,256 [ scc.merge] INFO
2025-08-02 00:45:58,256 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-08-02 00:45:58,256 [ scc.merge] INFO Already up to date.
2025-08-02 00:45:58,256 [ scc.merge] INFO
2025-08-02 00:45:58,256 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-02 00:45:58,256 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-08-02 00:45:58,256 [ scc.merge] INFO
2025-08-02 00:45:58,256 [ scc.merge] INFO Repository: ome/scripts
2025-08-02 00:45:58,256 [ scc.merge] INFO Excluded PRs:
2025-08-02 00:45:58,256 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-08-02 00:45:58,256 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-08-02 00:45:58,256 [ scc.merge] INFO Updating 4b4c755..573db34
2025-08-02 00:45:58,256 [ scc.merge] INFO Previously merged:
2025-08-02 00:45:58,256 [ scc.merge] INFO - PR 227 jburel 'Replace tostring by tobytes'
2025-08-02 00:45:58,256 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-08-02 00:45:58,256 [ scc.merge] INFO
2025-08-02 00:45:58,256 [ scc.merge] INFO Merged PRs:
2025-08-02 00:45:58,256 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-08-02 00:45:58,256 [ scc.merge] INFO
2025-08-02 00:45:58,256 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-02 00:45:58,256 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-08-02 00:45:58,256 [ scc.merge] INFO
2025-08-02 00:45:58,257 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-08-02 00:45:58,257 [ scc.git] DEBUG Calling 'git remote'
2025-08-02 00:45:58,259 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-08-02 00:45:58,259 [ scc.git] DEBUG Calling 'git remote'
2025-08-02 00:45:58,261 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:58,261 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-08-02 00:45:58,261 [ scc.git] DEBUG Calling 'git remote'
2025-08-02 00:45:58,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:58,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-08-02 00:45:58,263 [ scc.git] DEBUG Calling 'git remote'
2025-08-02 00:45:58,265 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:58,265 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-08-02 00:45:58,265 [ scc.git] DEBUG Calling 'git remote'
2025-08-02 00:45:58,268 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:58,268 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-08-02 00:45:58,268 [ scc.git] DEBUG Calling 'git remote'
2025-08-02 00:45:58,270 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:58,270 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-08-02 00:45:58,270 [ scc.git] DEBUG Calling 'git remote'
2025-08-02 00:45:58,272 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:58,272 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-08-02 00:45:58,272 [ scc.git] DEBUG Calling 'git remote'
2025-08-02 00:45:58,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:58,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-08-02 00:45:58,274 [ scc.git] DEBUG Calling 'git remote'
2025-08-02 00:45:58,277 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:58,277 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-08-02 00:45:58,277 [ scc.git] DEBUG Calling 'git remote'
2025-08-02 00:45:58,279 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:58,279 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-08-02 00:45:58,279 [ scc.git] DEBUG Calling 'git remote'
2025-08-02 00:45:58,281 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:58,281 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-08-02 00:45:58,281 [ scc.git] DEBUG Calling 'git remote'
2025-08-02 00:45:58,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:58,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-08-02 00:45:58,284 [ scc.git] DEBUG Calling 'git remote'
2025-08-02 00:45:58,286 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:58,286 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-08-02 00:45:58,286 [ scc.git] DEBUG Calling 'git remote'
2025-08-02 00:45:58,288 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:58,288 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-08-02 00:45:58,288 [ scc.git] DEBUG Calling 'git remote'
2025-08-02 00:45:58,290 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:58,291 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-08-02 00:45:58,291 [ scc.git] DEBUG Calling 'git remote'
2025-08-02 00:45:58,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:58,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-08-02 00:45:58,293 [ scc.git] DEBUG Calling 'git remote'
2025-08-02 00:45:58,295 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:58,295 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-08-02 00:45:58,295 [ scc.git] DEBUG Calling 'git remote'
2025-08-02 00:45:58,297 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:58,297 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-08-02 00:45:58,297 [ scc.git] DEBUG Calling 'git remote'
2025-08-02 00:45:58,300 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:58,300 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-08-02 00:45:58,300 [ scc.git] DEBUG Calling 'git remote'
2025-08-02 00:45:58,302 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:58,302 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-08-02 00:45:58,302 [ scc.git] DEBUG Calling 'git remote'
2025-08-02 00:45:58,304 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:58,304 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-08-02 00:45:58,305 [ scc.git] DEBUG Calling 'git remote'
2025-08-02 00:45:58,307 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-02 00:45:58,307 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-08-02 00:45:58,307 [ scc.git] DEBUG Calling 'git remote'
2025-08-02 00:45:58,309 [ 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 f48f91b] 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 753a6e5] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-08-02 00:46:46,365 [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-08-02 00:46:55,969 [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-08-02 00:46:58,505 [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-08-02 00:47:03,490 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-08-02 00:47:44,743 [ 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/9161e9ff/images/svgs/logo.svg){kind=logo}
