Skipping 220 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-08-03 00:44:36,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:44:36,636 [ scc.git] DEBUG Calling 'git merge-base bb94cf8da960e3283090038b04432f301560f5e4 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-08-03 00:44:36,639 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..bb94cf8da960e3283090038b04432f301560f5e4'
2025-08-03 00:44:36,642 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#493](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-08-03 00:44:36,644 [ scc.config] DEBUG Found github.token
2025-08-03 00:44:36,644 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-08-03 00:44:36,644 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-03 00:44:36,687 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:44:36,687 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:44:36,689 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-03 00:44:36,730 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-03 00:44:36,738 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9f7ac1cbd0> has no local changes
2025-08-03 00:44:36,738 [ 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#493 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/)'
2025-08-03 00:44:36,747 [ scc.git] DEBUG [detached HEAD d255cbf] merge master -Dorg -Ssuccess-only
2025-08-03 00:44:36,748 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:44:36,748 [ scc.repo] DEBUG ## PRs found:
2025-08-03 00:44:36,887 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:37,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-08-03 00:44:37,449 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:37,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-08-03 00:44:37,981 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:38,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-08-03 00:44:38,497 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:38,745 [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-03 00:44:38,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:39,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-08-03 00:44:39,517 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:39,749 [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-03 00:44:39,750 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-03 00:44:40,001 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:40,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-08-03 00:44:40,509 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:40,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-08-03 00:44:40,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:41,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-08-03 00:44:41,513 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:41,753 [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-03 00:44:42,004 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:42,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-08-03 00:44:42,492 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:42,666 [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-03 00:44:42,666 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-08-03 00:44:42,667 [ scc.repo] DEBUG ## Branches found:
2025-08-03 00:44:42,667 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-08-03 00:44:42,667 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:44:42,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:44:42,670 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-03 00:44:42,672 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-03 00:44:42,672 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-03 00:44:42,675 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-03 00:44:42,678 [ scc.git] DEBUG Already up to date.
2025-08-03 00:44:42,678 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-08-03 00:44:42,956 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-08-03 00:44:42,956 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-08-03 00:44:42,960 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-08-03 00:44:43,241 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-08-03 00:44:43,242 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-08-03 00:44:43,246 [ scc.git] DEBUG ## Unique users: []
2025-08-03 00:44:43,246 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:44:43,246 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:44:43,248 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-08-03 00:44:43,252 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:44:43,255 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-08-03 00:44:43,264 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-03 00:44:43,267 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-08-03 00:44:43,267 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-08-03 00:44:43,267 [ scc.git] DEBUG requirements.txt | 2 +-
2025-08-03 00:44:43,267 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-08-03 00:44:43,267 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-08-03 00:44:43,267 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-08-03 00:44:43,269 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:43,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:44:43,453 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-08-03 00:44:43,457 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:44:43,459 [ 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-03 00:44:43,469 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-03 00:44:43,472 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-08-03 00:44:43,472 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-08-03 00:44:43,704 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:43,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:44:43,914 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-03 00:44:43,956 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:44:43,957 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:44:43,959 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-03 00:44:43,999 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-03 00:44:44,003 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9f7abdd850> has no local changes
2025-08-03 00:44:44,003 [ 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#493 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/)'
2025-08-03 00:44:44,010 [ scc.git] DEBUG [detached HEAD 1d18e8a] merge master -Dorg -Ssuccess-only
2025-08-03 00:44:44,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:44:44,010 [ scc.repo] DEBUG ## PRs found:
2025-08-03 00:44:44,165 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:44,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-08-03 00:44:44,710 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:44,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-08-03 00:44:45,208 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:45,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-08-03 00:44:45,715 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:45,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-08-03 00:44:46,238 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:46,459 [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-03 00:44:46,711 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:47,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-08-03 00:44:47,258 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:47,468 [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-03 00:44:47,469 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-08-03 00:44:47,720 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:47,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-08-03 00:44:48,191 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:48,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-08-03 00:44:48,661 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:48,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-08-03 00:44:49,200 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:49,421 [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-03 00:44:49,672 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:49,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-08-03 00:44:50,180 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:50,398 [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-03 00:44:50,398 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-08-03 00:44:50,398 [ scc.repo] DEBUG ## Branches found:
2025-08-03 00:44:50,398 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-08-03 00:44:50,398 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:44:50,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:44:50,401 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-03 00:44:50,403 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-03 00:44:50,403 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-03 00:44:50,407 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-03 00:44:50,415 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-08-03 00:44:50,649 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:51,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-08-03 00:44:51,155 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-08-03 00:44:51,441 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-08-03 00:44:51,441 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-08-03 00:44:51,445 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-08-03 00:44:51,718 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-08-03 00:44:51,718 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-08-03 00:44:51,723 [ scc.git] DEBUG ## Unique users: []
2025-08-03 00:44:51,723 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:44:51,723 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:44:51,725 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-08-03 00:44:51,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:44:51,732 [ 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-03 00:44:51,746 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-08-03 00:44:51,746 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-08-03 00:44:51,746 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-08-03 00:44:51,746 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-08-03 00:44:51,746 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-03 00:44:51,747 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-03 00:44:51,749 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-08-03 00:44:51,754 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-08-03 00:44:51,755 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:51,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:44:51,978 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-08-03 00:44:51,983 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-08-03 00:44:51,986 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#493](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-08-03 00:44:51,988 [ scc.config] DEBUG Found github.token
2025-08-03 00:44:51,988 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-08-03 00:44:51,988 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-08-03 00:44:51,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:44:51,995 [ 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-03 00:44:52,011 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-08-03 00:44:52,011 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-08-03 00:44:52,011 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-08-03 00:44:52,011 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-03 00:44:52,011 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-03 00:44:52,014 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-08-03 00:44:52,019 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-08-03 00:44:52,229 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:52,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:44:52,532 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-08-03 00:44:52,537 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-08-03 00:44:52,540 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#493](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/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-03 00:44:52,542 [ scc.config] DEBUG Found github.token
2025-08-03 00:44:52,542 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-08-03 00:44:52,542 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-03 00:44:52,584 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:44:52,584 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:44:52,586 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-03 00:44:52,628 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-03 00:44:52,633 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9f7abbf450> has no local changes
2025-08-03 00:44:52,633 [ 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#493 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/)'
2025-08-03 00:44:52,640 [ scc.git] DEBUG [detached HEAD ff19845] merge master -Dorg -Ssuccess-only
2025-08-03 00:44:52,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:44:52,641 [ scc.repo] DEBUG ## PRs found:
2025-08-03 00:44:52,783 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:53,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-08-03 00:44:53,393 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:53,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-08-03 00:44:53,905 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:54,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-08-03 00:44:54,439 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:54,662 [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-03 00:44:54,913 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:55,128 [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-03 00:44:55,379 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:55,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-08-03 00:44:55,839 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:56,037 [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-03 00:44:56,037 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-03 00:44:56,288 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:56,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-08-03 00:44:56,520 [ scc.repo] DEBUG # ... Include label: dependencies
2025-08-03 00:44:56,770 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:57,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-08-03 00:44:57,350 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:57,648 [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-03 00:44:57,900 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:58,230 [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-03 00:44:58,482 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:58,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-08-03 00:44:59,063 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:59,272 [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-03 00:44:59,273 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-08-03 00:44:59,524 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:44:59,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-08-03 00:44:59,782 [ scc.repo] DEBUG # ... Include label: dependencies
2025-08-03 00:45:00,033 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:00,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-08-03 00:45:00,623 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:00,891 [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-03 00:45:01,143 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:01,440 [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-03 00:45:01,691 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:01,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-08-03 00:45:02,182 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:02,386 [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-03 00:45:02,387 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-08-03 00:45:02,638 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:02,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-08-03 00:45:03,115 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:03,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-08-03 00:45:03,609 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:03,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-08-03 00:45:04,065 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:04,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-08-03 00:45:04,551 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:04,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-08-03 00:45:05,063 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:05,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-08-03 00:45:05,521 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:05,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-08-03 00:45:05,757 [ scc.repo] DEBUG ## Branches found:
2025-08-03 00:45:05,757 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-08-03 00:45:05,757 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:05,757 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:05,760 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-03 00:45:05,763 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-03 00:45:05,763 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-03 00:45:05,766 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-03 00:45:05,769 [ scc.git] DEBUG Already up to date.
2025-08-03 00:45:05,770 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-08-03 00:45:06,058 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-08-03 00:45:06,058 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-08-03 00:45:06,063 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-08-03 00:45:06,340 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-08-03 00:45:06,340 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-08-03 00:45:06,345 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-08-03 00:45:06,621 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-08-03 00:45:06,621 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-08-03 00:45:06,626 [ scc.git] DEBUG ## Unique users: []
2025-08-03 00:45:06,626 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:06,626 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:06,628 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-08-03 00:45:06,631 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:06,633 [ 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-03 00:45:06,642 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-03 00:45:06,645 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-08-03 00:45:06,645 [ scc.git] DEBUG package.json | 2 +-
2025-08-03 00:45:06,645 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-08-03 00:45:06,647 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:06,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:06,902 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-08-03 00:45:06,905 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:06,908 [ 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-03 00:45:06,918 [ scc.git] DEBUG Auto-merging package-lock.json
2025-08-03 00:45:06,918 [ scc.git] DEBUG Auto-merging package.json
2025-08-03 00:45:06,919 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-03 00:45:06,923 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-08-03 00:45:06,923 [ scc.git] DEBUG package.json | 2 +-
2025-08-03 00:45:06,923 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-08-03 00:45:07,153 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:07,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:07,340 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-08-03 00:45:07,343 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:07,345 [ 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-03 00:45:07,355 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-03 00:45:07,358 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-08-03 00:45:07,358 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-08-03 00:45:07,591 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:07,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:07,758 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-03 00:45:07,800 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:07,800 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:07,803 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-03 00:45:07,843 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-03 00:45:07,848 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9f7d24e690> has no local changes
2025-08-03 00:45:07,848 [ 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#493 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/)'
2025-08-03 00:45:07,855 [ scc.git] DEBUG [detached HEAD 8e88356] merge master -Dorg -Ssuccess-only
2025-08-03 00:45:07,855 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:45:07,855 [ scc.repo] DEBUG ## PRs found:
2025-08-03 00:45:08,009 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:08,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-08-03 00:45:08,190 [ scc.repo] DEBUG ## Branches found:
2025-08-03 00:45:08,190 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-08-03 00:45:08,190 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:08,190 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:08,193 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-03 00:45:08,195 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-03 00:45:08,195 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-03 00:45:08,198 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-03 00:45:08,201 [ scc.git] DEBUG Already up to date.
2025-08-03 00:45:08,201 [ scc.git] DEBUG ## Unique users: []
2025-08-03 00:45:08,201 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:08,201 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:08,204 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-03 00:45:08,243 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:08,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:08,245 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-03 00:45:08,285 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-03 00:45:08,289 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9f7ac3c8d0> has no local changes
2025-08-03 00:45:08,289 [ 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#493 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/)'
2025-08-03 00:45:08,295 [ scc.git] DEBUG [detached HEAD ebdafa4] merge master -Dorg -Ssuccess-only
2025-08-03 00:45:08,296 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:45:08,296 [ scc.repo] DEBUG ## PRs found:
2025-08-03 00:45:08,441 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:08,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-08-03 00:45:08,979 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:09,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-08-03 00:45:09,467 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:09,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-08-03 00:45:09,954 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:10,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-08-03 00:45:10,185 [ scc.repo] DEBUG ## Branches found:
2025-08-03 00:45:10,185 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-08-03 00:45:10,185 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:10,185 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:10,188 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-03 00:45:10,190 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-03 00:45:10,190 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-03 00:45:10,193 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-03 00:45:10,196 [ scc.git] DEBUG Already up to date.
2025-08-03 00:45:10,196 [ scc.git] DEBUG ## Unique users: []
2025-08-03 00:45:10,196 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:10,196 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:10,198 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-03 00:45:10,241 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:10,241 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:10,243 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-03 00:45:10,285 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-03 00:45:10,288 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9f7ac2db90> has no local changes
2025-08-03 00:45:10,288 [ 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#493 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/)'
2025-08-03 00:45:10,294 [ scc.git] DEBUG [detached HEAD 3d686db] merge master -Dorg -Ssuccess-only
2025-08-03 00:45:10,295 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:45:10,295 [ scc.repo] DEBUG ## PRs found:
2025-08-03 00:45:10,436 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:10,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-08-03 00:45:10,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:11,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-08-03 00:45:11,487 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:11,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-08-03 00:45:11,971 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:12,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-08-03 00:45:12,525 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:12,783 [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-03 00:45:13,034 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:13,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-08-03 00:45:13,632 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:13,811 [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-03 00:45:13,811 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-08-03 00:45:13,811 [ scc.repo] DEBUG ## Branches found:
2025-08-03 00:45:13,812 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-08-03 00:45:13,812 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:13,812 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:13,814 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-03 00:45:13,817 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-03 00:45:13,817 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-03 00:45:13,820 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-03 00:45:13,823 [ scc.git] DEBUG Already up to date.
2025-08-03 00:45:13,823 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-08-03 00:45:14,100 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-08-03 00:45:14,101 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-08-03 00:45:14,105 [ scc.git] DEBUG ## Unique users: []
2025-08-03 00:45:14,105 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:14,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:14,107 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-08-03 00:45:14,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:14,113 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-08-03 00:45:14,122 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-08-03 00:45:14,122 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-08-03 00:45:14,122 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-08-03 00:45:14,122 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-08-03 00:45:14,122 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-08-03 00:45:14,122 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-08-03 00:45:14,122 [ scc.git] DEBUG Auto-merging setup.py
2025-08-03 00:45:14,122 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-08-03 00:45:14,122 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-03 00:45:14,123 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-03 00:45:14,126 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-08-03 00:45:14,130 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-08-03 00:45:14,131 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:14,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:14,299 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-08-03 00:45:14,303 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-08-03 00:45:14,306 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#493](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- setup.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
--conflicts
2025-08-03 00:45:14,308 [ scc.config] DEBUG Found github.token
2025-08-03 00:45:14,308 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-08-03 00:45:14,308 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-03 00:45:14,350 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:14,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:14,352 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-03 00:45:14,394 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-03 00:45:14,397 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9f7ae006d0> has no local changes
2025-08-03 00:45:14,398 [ 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#493 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/)'
2025-08-03 00:45:14,405 [ scc.git] DEBUG [detached HEAD 3a60e99] merge master -Dorg -Ssuccess-only
2025-08-03 00:45:14,405 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:45:14,405 [ scc.repo] DEBUG ## PRs found:
2025-08-03 00:45:14,550 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:14,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-08-03 00:45:15,154 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:15,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-08-03 00:45:15,646 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:15,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-08-03 00:45:16,220 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:16,470 [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-03 00:45:16,721 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:16,990 [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-03 00:45:17,241 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:17,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-08-03 00:45:17,729 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:17,916 [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-03 00:45:17,917 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-08-03 00:45:18,168 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:18,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-08-03 00:45:18,664 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:18,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-08-03 00:45:19,158 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:19,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-08-03 00:45:19,692 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:19,945 [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-03 00:45:20,196 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:20,485 [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-03 00:45:20,737 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:20,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-08-03 00:45:21,240 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:21,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-08-03 00:45:21,701 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:21,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-08-03 00:45:22,181 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:22,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-08-03 00:45:22,707 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:23,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-08-03 00:45:23,280 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:23,492 [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-03 00:45:23,743 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:24,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-08-03 00:45:24,274 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:24,465 [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-03 00:45:24,465 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-08-03 00:45:24,465 [ scc.repo] DEBUG ## Branches found:
2025-08-03 00:45:24,465 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-08-03 00:45:24,465 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:24,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:24,468 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-03 00:45:24,471 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-03 00:45:24,471 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-03 00:45:24,474 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-03 00:45:24,477 [ scc.git] DEBUG Already up to date.
2025-08-03 00:45:24,477 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-08-03 00:45:24,762 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-08-03 00:45:24,763 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-08-03 00:45:24,767 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-08-03 00:45:25,063 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-08-03 00:45:25,063 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-08-03 00:45:25,067 [ scc.git] DEBUG ## Unique users: []
2025-08-03 00:45:25,067 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:25,067 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:25,070 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-08-03 00:45:25,074 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:25,077 [ 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-03 00:45:25,090 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-03 00:45:25,094 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-08-03 00:45:25,094 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-08-03 00:45:25,094 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-08-03 00:45:25,094 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-08-03 00:45:25,094 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-08-03 00:45:25,094 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-08-03 00:45:25,094 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-08-03 00:45:25,094 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-08-03 00:45:25,094 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-08-03 00:45:25,094 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-08-03 00:45:25,094 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-08-03 00:45:25,094 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-08-03 00:45:25,095 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:25,095 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-08-03 00:45:25,095 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-08-03 00:45:25,095 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-08-03 00:45:25,095 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-08-03 00:45:25,095 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-08-03 00:45:25,095 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-08-03 00:45:25,095 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-08-03 00:45:25,095 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-08-03 00:45:25,095 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-08-03 00:45:25,095 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-08-03 00:45:25,095 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-08-03 00:45:25,095 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-08-03 00:45:25,096 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-08-03 00:45:25,096 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-08-03 00:45:25,096 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-08-03 00:45:25,096 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-08-03 00:45:25,096 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-08-03 00:45:25,096 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-08-03 00:45:25,096 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-08-03 00:45:25,096 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-08-03 00:45:25,096 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-08-03 00:45:25,096 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-08-03 00:45:25,096 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-08-03 00:45:25,096 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-08-03 00:45:25,096 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-08-03 00:45:25,096 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-08-03 00:45:25,096 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-08-03 00:45:25,096 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-08-03 00:45:25,096 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-08-03 00:45:25,096 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-08-03 00:45:25,096 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-08-03 00:45:25,096 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-08-03 00:45:25,096 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-08-03 00:45:25,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:25,263 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-08-03 00:45:25,268 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:25,270 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-08-03 00:45:25,280 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-03 00:45:25,283 [ scc.git] DEBUG docker | 1 +
2025-08-03 00:45:25,283 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-08-03 00:45:25,514 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:25,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:25,692 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-03 00:45:25,735 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:25,735 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:25,738 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-03 00:45:25,779 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-03 00:45:25,783 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9f78224110> has no local changes
2025-08-03 00:45:25,783 [ 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#493 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/)'
2025-08-03 00:45:25,791 [ scc.git] DEBUG [detached HEAD 127f23a] merge master -Dorg -Ssuccess-only
2025-08-03 00:45:25,791 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:45:25,791 [ scc.repo] DEBUG ## PRs found:
2025-08-03 00:45:25,943 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:26,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-08-03 00:45:26,132 [ scc.repo] DEBUG ## Branches found:
2025-08-03 00:45:26,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-08-03 00:45:26,132 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:26,132 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:26,135 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-03 00:45:26,137 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-03 00:45:26,137 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-03 00:45:26,140 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-03 00:45:26,143 [ scc.git] DEBUG Already up to date.
2025-08-03 00:45:26,143 [ scc.git] DEBUG ## Unique users: []
2025-08-03 00:45:26,143 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:26,143 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:26,145 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-03 00:45:26,184 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:26,184 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:26,186 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-03 00:45:26,224 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-03 00:45:26,227 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9f78256550> has no local changes
2025-08-03 00:45:26,228 [ 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#493 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/)'
2025-08-03 00:45:26,234 [ scc.git] DEBUG [detached HEAD cacf03b] merge master -Dorg -Ssuccess-only
2025-08-03 00:45:26,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:45:26,234 [ scc.repo] DEBUG ## PRs found:
2025-08-03 00:45:26,383 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:26,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2025-08-03 00:45:26,572 [ scc.repo] DEBUG ## Branches found:
2025-08-03 00:45:26,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-08-03 00:45:26,572 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:26,572 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:26,574 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-03 00:45:26,577 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-03 00:45:26,577 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-03 00:45:26,580 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-03 00:45:26,588 [ scc.git] DEBUG Updating deab817..160d894
2025-08-03 00:45:26,823 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:27,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls/20 HTTP/1.1" 200 None
2025-08-03 00:45:27,286 [ scc.git] DEBUG ## Unique users: []
2025-08-03 00:45:27,286 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:27,286 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:27,289 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-03 00:45:27,332 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:27,332 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:27,334 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-03 00:45:27,375 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-03 00:45:27,379 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9f7ac1c910> has no local changes
2025-08-03 00:45:27,379 [ 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#493 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/)'
2025-08-03 00:45:27,386 [ scc.git] DEBUG [detached HEAD a4050ce] merge master -Dorg -Ssuccess-only
2025-08-03 00:45:27,386 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:45:27,386 [ scc.git] INFO Overriding base-branch from master to main
2025-08-03 00:45:27,386 [ scc.repo] DEBUG ## PRs found:
2025-08-03 00:45:27,537 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:27,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-08-03 00:45:28,055 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:28,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-08-03 00:45:28,541 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:28,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-08-03 00:45:29,032 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:29,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-08-03 00:45:29,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:29,860 [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-03 00:45:30,112 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:30,347 [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-03 00:45:30,598 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:30,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-08-03 00:45:31,109 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:31,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-08-03 00:45:31,627 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:31,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-08-03 00:45:32,119 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:32,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-08-03 00:45:32,658 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:32,879 [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-03 00:45:33,131 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:33,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-08-03 00:45:33,681 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:33,865 [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-03 00:45:33,865 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-08-03 00:45:33,865 [ scc.repo] DEBUG ## Branches found:
2025-08-03 00:45:33,865 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-08-03 00:45:33,865 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:33,865 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:33,868 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-08-03 00:45:33,871 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-03 00:45:33,871 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-08-03 00:45:33,874 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-08-03 00:45:33,877 [ scc.git] DEBUG Already up to date.
2025-08-03 00:45:33,877 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-08-03 00:45:34,179 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-08-03 00:45:34,179 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-08-03 00:45:34,184 [ scc.git] DEBUG ## Unique users: []
2025-08-03 00:45:34,184 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:34,184 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:34,186 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-08-03 00:45:34,189 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:34,191 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-08-03 00:45:34,199 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-08-03 00:45:34,199 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-08-03 00:45:34,199 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-03 00:45:34,200 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-03 00:45:34,203 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-08-03 00:45:34,207 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-08-03 00:45:34,208 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:34,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:34,377 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-08-03 00:45:34,379 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-08-03 00:45:34,382 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#493](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-08-03 00:45:34,385 [ scc.config] DEBUG Found github.token
2025-08-03 00:45:34,385 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-08-03 00:45:34,385 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-03 00:45:34,428 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:34,428 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:34,430 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-03 00:45:34,470 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-03 00:45:34,474 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9f78241190> has no local changes
2025-08-03 00:45:34,474 [ 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#493 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/)'
2025-08-03 00:45:34,480 [ scc.git] DEBUG [detached HEAD d629568] merge master -Dorg -Ssuccess-only
2025-08-03 00:45:34,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:45:34,481 [ scc.repo] DEBUG ## PRs found:
2025-08-03 00:45:34,628 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:34,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-08-03 00:45:34,814 [ scc.repo] DEBUG ## Branches found:
2025-08-03 00:45:34,814 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-08-03 00:45:34,814 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:34,814 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:34,816 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-03 00:45:34,819 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-03 00:45:34,819 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-03 00:45:34,821 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-03 00:45:34,824 [ scc.git] DEBUG Already up to date.
2025-08-03 00:45:34,824 [ scc.git] DEBUG ## Unique users: []
2025-08-03 00:45:34,824 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:34,824 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:34,827 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-03 00:45:34,865 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:34,865 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:34,867 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-03 00:45:34,906 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-03 00:45:34,909 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9f7ac1ca10> has no local changes
2025-08-03 00:45:34,909 [ 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#493 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/)'
2025-08-03 00:45:34,915 [ scc.git] DEBUG [detached HEAD 288bed7] merge master -Dorg -Ssuccess-only
2025-08-03 00:45:34,915 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:45:34,915 [ scc.repo] DEBUG ## PRs found:
2025-08-03 00:45:35,065 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:35,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-08-03 00:45:35,248 [ scc.repo] DEBUG ## Branches found:
2025-08-03 00:45:35,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-08-03 00:45:35,248 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:35,248 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:35,250 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-03 00:45:35,252 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-03 00:45:35,252 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-03 00:45:35,255 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-03 00:45:35,258 [ scc.git] DEBUG Already up to date.
2025-08-03 00:45:35,258 [ scc.git] DEBUG ## Unique users: []
2025-08-03 00:45:35,258 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:35,258 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:35,260 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-03 00:45:35,299 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:35,299 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:35,301 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-03 00:45:35,341 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-03 00:45:35,345 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9f7827ec90> has no local changes
2025-08-03 00:45:35,345 [ 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#493 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/)'
2025-08-03 00:45:35,351 [ scc.git] DEBUG [detached HEAD 4ce4fbc] merge master -Dorg -Ssuccess-only
2025-08-03 00:45:35,352 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:45:35,352 [ scc.repo] DEBUG ## PRs found:
2025-08-03 00:45:35,499 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:35,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-08-03 00:45:36,094 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:36,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-08-03 00:45:36,589 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:36,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-08-03 00:45:37,060 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:37,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-08-03 00:45:37,586 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:37,819 [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-03 00:45:38,070 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:38,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-08-03 00:45:38,535 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:38,713 [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-03 00:45:38,713 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-08-03 00:45:38,713 [ scc.repo] DEBUG ## Branches found:
2025-08-03 00:45:38,713 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-08-03 00:45:38,713 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:38,713 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:38,716 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-03 00:45:38,718 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-03 00:45:38,719 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-03 00:45:38,721 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-03 00:45:38,724 [ scc.git] DEBUG Already up to date.
2025-08-03 00:45:38,724 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-08-03 00:45:39,010 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-08-03 00:45:39,011 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-08-03 00:45:39,015 [ scc.git] DEBUG ## Unique users: []
2025-08-03 00:45:39,015 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:39,015 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:39,017 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-08-03 00:45:39,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:39,022 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-08-03 00:45:39,031 [ scc.git] DEBUG Auto-merging Dockerfile
2025-08-03 00:45:39,031 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-08-03 00:45:39,032 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-03 00:45:39,032 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-03 00:45:39,035 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-08-03 00:45:39,040 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-08-03 00:45:39,041 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:39,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:39,222 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-08-03 00:45:39,225 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-08-03 00:45:39,227 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#493](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-08-03 00:45:39,230 [ scc.config] DEBUG Found github.token
2025-08-03 00:45:39,230 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-08-03 00:45:39,230 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-03 00:45:39,270 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:39,271 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:39,273 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-03 00:45:39,311 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-03 00:45:39,315 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9f7ae03210> has no local changes
2025-08-03 00:45:39,315 [ 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#493 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/)'
2025-08-03 00:45:39,322 [ scc.git] DEBUG [detached HEAD 48bb8d0] merge master -Dorg -Ssuccess-only
2025-08-03 00:45:39,322 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:45:39,322 [ scc.git] INFO Overriding base-branch from master to develop
2025-08-03 00:45:39,322 [ scc.repo] DEBUG ## PRs found:
2025-08-03 00:45:39,473 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:39,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-08-03 00:45:40,078 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:40,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-08-03 00:45:40,572 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:40,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-08-03 00:45:41,070 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:41,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-08-03 00:45:41,545 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:41,781 [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-03 00:45:42,032 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:42,303 [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-03 00:45:42,554 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:42,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-08-03 00:45:43,024 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:43,218 [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-03 00:45:43,218 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-08-03 00:45:43,469 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:43,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-08-03 00:45:43,935 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:44,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-08-03 00:45:44,402 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:44,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-08-03 00:45:44,885 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:45,109 [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-03 00:45:45,361 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:45,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-08-03 00:45:45,872 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:46,073 [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-03 00:45:46,074 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-08-03 00:45:46,325 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:46,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-08-03 00:45:46,831 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:47,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-08-03 00:45:47,328 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:47,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-08-03 00:45:47,822 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:48,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-08-03 00:45:48,048 [ scc.repo] DEBUG ## Branches found:
2025-08-03 00:45:48,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-08-03 00:45:48,048 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:48,048 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:48,050 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-08-03 00:45:48,053 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-03 00:45:48,053 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-08-03 00:45:48,056 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-08-03 00:45:48,067 [ scc.git] DEBUG Updating 4b4c755..573db34
2025-08-03 00:45:48,297 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:48,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/227 HTTP/1.1" 200 None
2025-08-03 00:45:48,966 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:49,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-08-03 00:45:49,379 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-08-03 00:45:49,679 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-08-03 00:45:49,680 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-08-03 00:45:49,684 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-08-03 00:45:49,995 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-08-03 00:45:49,995 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-08-03 00:45:50,000 [ scc.git] DEBUG ## Unique users: []
2025-08-03 00:45:50,000 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:50,000 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:50,003 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-08-03 00:45:50,009 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:50,011 [ 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-03 00:45:50,023 [ 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-03 00:45:50,023 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-03 00:45:50,024 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-03 00:45:50,026 [ scc.git] DEBUG Calling 'git reset --hard 573db340d5d1429fa17c7e486206948412a7c150'
2025-08-03 00:45:50,030 [ scc.git] DEBUG HEAD is now at 573db34 Bump version: 5.9.1 → 5.9.2.dev0
2025-08-03 00:45:50,031 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:50,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:50,201 [ scc.git] DEBUG Calling 'git merge-base 573db340d5d1429fa17c7e486206948412a7c150 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-08-03 00:45:50,207 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..573db340d5d1429fa17c7e486206948412a7c150'
2025-08-03 00:45:50,211 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#493](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-08-03 00:45:50,213 [ scc.config] DEBUG Found github.token
2025-08-03 00:45:50,213 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-08-03 00:45:50,213 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-08-03 00:45:50,218 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:50,220 [ 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-03 00:45:50,230 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-03 00:45:50,233 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-08-03 00:45:50,233 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-08-03 00:45:50,452 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:50,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:50,619 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-03 00:45:50,659 [ scc.git] DEBUG Get sha1 of %s
2025-08-03 00:45:50,659 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-03 00:45:50,662 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-03 00:45:50,703 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-03 00:45:50,706 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9f78216750> has no local changes
2025-08-03 00:45:50,706 [ 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#493 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/)'
2025-08-03 00:45:50,713 [ scc.git] DEBUG [detached HEAD 9fb2ba4] merge master -Dorg -Ssuccess-only
2025-08-03 00:45:50,713 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:45:50,713 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-03 00:45:50,791 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-08-03 00:45:50,870 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:51,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:51,047 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-08-03 00:45:51,049 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-08-03 00:45:51,293 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:51,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:51,460 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-08-03 00:45:51,462 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-08-03 00:45:51,707 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:51,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:51,899 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-08-03 00:45:51,902 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-08-03 00:45:52,145 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:52,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:52,337 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-08-03 00:45:52,582 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:52,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:52,756 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-08-03 00:45:52,758 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-08-03 00:45:53,003 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:53,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:53,196 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-08-03 00:45:53,198 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-08-03 00:45:53,442 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:53,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:53,627 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-08-03 00:45:53,629 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-08-03 00:45:53,874 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:54,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:54,080 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-08-03 00:45:54,082 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-08-03 00:45:54,326 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:54,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:54,519 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-08-03 00:45:54,521 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-08-03 00:45:54,765 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:54,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:54,937 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-08-03 00:45:54,939 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-08-03 00:45:55,184 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:55,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:55,368 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-08-03 00:45:55,370 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-08-03 00:45:55,614 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:55,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:55,781 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-08-03 00:45:55,783 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-08-03 00:45:56,028 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:56,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:56,205 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-08-03 00:45:56,450 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:56,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:56,624 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-08-03 00:45:56,870 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:57,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:57,061 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-08-03 00:45:57,062 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-08-03 00:45:57,307 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:57,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:57,493 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-08-03 00:45:57,738 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:57,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:57,954 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-08-03 00:45:58,199 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:58,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:58,374 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-08-03 00:45:58,376 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-08-03 00:45:58,621 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:58,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:58,819 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-08-03 00:45:58,821 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-08-03 00:45:59,066 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:59,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:59,248 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-08-03 00:45:59,250 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-08-03 00:45:59,495 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:45:59,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:45:59,676 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-08-03 00:45:59,678 [ scc.config] DEBUG Found submodule.scripts.url
2025-08-03 00:45:59,922 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-03 00:46:00,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-03 00:46:00,107 [ scc.config] DEBUG Found submodule.scripts.branch
2025-08-03 00:46:00,107 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-03 00:46:00,199 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9f7adfad10> has local changes
2025-08-03 00:46:00,199 [ 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#493 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/493/)'
2025-08-03 00:46:00,213 [ scc.git] DEBUG [detached HEAD ba685db] merge master -Dorg -Ssuccess-only
2025-08-03 00:46:00,213 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-08-03 00:46:00,213 [ scc.merge] INFO Repository: ome/omero-plugins
2025-08-03 00:46:00,213 [ scc.merge] INFO Already up to date.
2025-08-03 00:46:00,213 [ scc.merge] INFO
2025-08-03 00:46:00,213 [ scc.merge] INFO Merged PRs:
2025-08-03 00:46:00,213 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-08-03 00:46:00,213 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-08-03 00:46:00,213 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-08-03 00:46:00,213 [ scc.merge] INFO
2025-08-03 00:46:00,213 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-08-03 00:46:00,213 [ scc.merge] INFO Already up to date.
2025-08-03 00:46:00,213 [ scc.merge] INFO
2025-08-03 00:46:00,213 [ scc.merge] INFO
2025-08-03 00:46:00,213 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-08-03 00:46:00,213 [ scc.merge] INFO Excluded PRs:
2025-08-03 00:46:00,213 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-08-03 00:46:00,214 [ scc.merge] INFO Already up to date.
2025-08-03 00:46:00,214 [ scc.merge] INFO
2025-08-03 00:46:00,214 [ scc.merge] INFO
2025-08-03 00:46:00,214 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-08-03 00:46:00,214 [ scc.merge] INFO Excluded PRs:
2025-08-03 00:46:00,214 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-08-03 00:46:00,214 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-08-03 00:46:00,214 [ scc.merge] INFO Already up to date.
2025-08-03 00:46:00,214 [ scc.merge] INFO
2025-08-03 00:46:00,214 [ scc.merge] INFO Merged PRs:
2025-08-03 00:46:00,214 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-08-03 00:46:00,214 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-08-03 00:46:00,214 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-08-03 00:46:00,214 [ scc.merge] INFO
2025-08-03 00:46:00,214 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-08-03 00:46:00,214 [ scc.merge] INFO Excluded PRs:
2025-08-03 00:46:00,214 [ scc.merge] INFO - PR 174 will-moore 'Skip wells' (stage: draft)
2025-08-03 00:46:00,214 [ scc.merge] INFO - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
2025-08-03 00:46:00,214 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-08-03 00:46:00,214 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-08-03 00:46:00,214 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-08-03 00:46:00,214 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-08-03 00:46:00,214 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-08-03 00:46:00,214 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-08-03 00:46:00,214 [ scc.merge] INFO Updating 11d3587..f7eea7c
2025-08-03 00:46:00,214 [ scc.merge] INFO Previously merged:
2025-08-03 00:46:00,214 [ scc.merge] INFO - PR 179 will-moore 'Changelog 0.6.0'
2025-08-03 00:46:00,214 [ scc.merge] INFO - PR 177 jburel 'Replace fromstring by frombuffer'
2025-08-03 00:46:00,214 [ scc.merge] INFO - PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
2025-08-03 00:46:00,214 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-08-03 00:46:00,214 [ scc.merge] INFO - PR 173 will-moore 'Add test_export_plate_polygons()'
2025-08-03 00:46:00,214 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-08-03 00:46:00,214 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-03 00:46:00,214 [ scc.merge] INFO
2025-08-03 00:46:00,214 [ scc.merge] INFO Merged PRs:
2025-08-03 00:46:00,214 [ scc.merge] INFO - PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
2025-08-03 00:46:00,214 [ scc.merge] INFO
2025-08-03 00:46:00,214 [ scc.merge] INFO Repository: ome/omero-figure
2025-08-03 00:46:00,214 [ scc.merge] INFO Excluded PRs:
2025-08-03 00:46:00,214 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-08-03 00:46:00,215 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-08-03 00:46:00,215 [ scc.merge] INFO Updating 9cc36cde..d2c6f5bc
2025-08-03 00:46:00,215 [ scc.merge] INFO Previously merged:
2025-08-03 00:46:00,215 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity'
2025-08-03 00:46:00,215 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-08-03 00:46:00,215 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-08-03 00:46:00,215 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-08-03 00:46:00,215 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-03 00:46:00,215 [ scc.merge] INFO
2025-08-03 00:46:00,215 [ scc.merge] INFO Merged PRs:
2025-08-03 00:46:00,215 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-08-03 00:46:00,215 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-08-03 00:46:00,215 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-08-03 00:46:00,215 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-08-03 00:46:00,215 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-08-03 00:46:00,215 [ scc.merge] INFO
2025-08-03 00:46:00,215 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-03 00:46:00,215 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-08-03 00:46:00,215 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-08-03 00:46:00,215 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position'
2025-08-03 00:46:00,215 [ scc.merge] INFO
2025-08-03 00:46:00,215 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-08-03 00:46:00,215 [ scc.merge] INFO Already up to date.
2025-08-03 00:46:00,215 [ scc.merge] INFO
2025-08-03 00:46:00,215 [ scc.merge] INFO Merged PRs:
2025-08-03 00:46:00,215 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-08-03 00:46:00,215 [ scc.merge] INFO
2025-08-03 00:46:00,215 [ scc.merge] INFO Repository: ome/omero-gallery
2025-08-03 00:46:00,215 [ scc.merge] INFO Already up to date.
2025-08-03 00:46:00,215 [ scc.merge] INFO
2025-08-03 00:46:00,215 [ scc.merge] INFO Merged PRs:
2025-08-03 00:46:00,215 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-08-03 00:46:00,215 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-08-03 00:46:00,215 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-08-03 00:46:00,215 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-08-03 00:46:00,215 [ scc.merge] INFO
2025-08-03 00:46:00,215 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-03 00:46:00,215 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-08-03 00:46:00,215 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-08-03 00:46:00,215 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-08-03 00:46:00,215 [ scc.merge] INFO
2025-08-03 00:46:00,216 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-08-03 00:46:00,216 [ scc.merge] INFO Excluded PRs:
2025-08-03 00:46:00,216 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-08-03 00:46:00,216 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-08-03 00:46:00,216 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-08-03 00:46:00,216 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-08-03 00:46:00,216 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-08-03 00:46:00,216 [ scc.merge] INFO Updating 7a798ce..bb94cf8
2025-08-03 00:46:00,216 [ scc.merge] INFO Previously merged:
2025-08-03 00:46:00,216 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-03 00:46:00,216 [ scc.merge] INFO
2025-08-03 00:46:00,216 [ scc.merge] INFO Merged PRs:
2025-08-03 00:46:00,216 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-08-03 00:46:00,216 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-08-03 00:46:00,216 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-08-03 00:46:00,216 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-08-03 00:46:00,216 [ scc.merge] INFO
2025-08-03 00:46:00,216 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-03 00:46:00,216 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-08-03 00:46:00,216 [ scc.merge] INFO
2025-08-03 00:46:00,216 [ scc.merge] INFO Repository: ome/omero-mapr
2025-08-03 00:46:00,216 [ scc.merge] INFO Excluded PRs:
2025-08-03 00:46:00,216 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-08-03 00:46:00,216 [ scc.merge] INFO Already up to date.
2025-08-03 00:46:00,216 [ scc.merge] INFO
2025-08-03 00:46:00,216 [ scc.merge] INFO Merged PRs:
2025-08-03 00:46:00,216 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-08-03 00:46:00,216 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-03 00:46:00,216 [ scc.merge] INFO
2025-08-03 00:46:00,216 [ scc.merge] INFO Repository: ome/omero-metadata
2025-08-03 00:46:00,216 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-08-03 00:46:00,216 [ scc.merge] INFO Previously merged:
2025-08-03 00:46:00,216 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-03 00:46:00,216 [ scc.merge] INFO
2025-08-03 00:46:00,216 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-03 00:46:00,216 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-08-03 00:46:00,216 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-08-03 00:46:00,216 [ scc.merge] INFO
2025-08-03 00:46:00,216 [ scc.merge] INFO Repository: ome/omero-parade
2025-08-03 00:46:00,216 [ scc.merge] INFO Excluded PRs:
2025-08-03 00:46:00,216 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-08-03 00:46:00,217 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-08-03 00:46:00,217 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-08-03 00:46:00,217 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-08-03 00:46:00,217 [ scc.merge] INFO Already up to date.
2025-08-03 00:46:00,217 [ scc.merge] INFO
2025-08-03 00:46:00,217 [ scc.merge] INFO Merged PRs:
2025-08-03 00:46:00,217 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-08-03 00:46:00,217 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-08-03 00:46:00,217 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-03 00:46:00,217 [ scc.merge] INFO
2025-08-03 00:46:00,217 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-08-03 00:46:00,217 [ scc.merge] INFO Already up to date.
2025-08-03 00:46:00,217 [ scc.merge] INFO
2025-08-03 00:46:00,217 [ scc.merge] INFO
2025-08-03 00:46:00,217 [ scc.merge] INFO Repository: ome/omero-rois
2025-08-03 00:46:00,217 [ scc.merge] INFO Excluded PRs:
2025-08-03 00:46:00,217 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-08-03 00:46:00,217 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-08-03 00:46:00,217 [ scc.merge] INFO Already up to date.
2025-08-03 00:46:00,217 [ scc.merge] INFO
2025-08-03 00:46:00,217 [ scc.merge] INFO
2025-08-03 00:46:00,217 [ scc.merge] INFO Repository: ome/omero-signup
2025-08-03 00:46:00,217 [ scc.merge] INFO Already up to date.
2025-08-03 00:46:00,217 [ scc.merge] INFO
2025-08-03 00:46:00,217 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-03 00:46:00,217 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-08-03 00:46:00,217 [ scc.merge] INFO
2025-08-03 00:46:00,217 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-08-03 00:46:00,217 [ scc.merge] INFO Excluded PRs:
2025-08-03 00:46:00,217 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-08-03 00:46:00,217 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-08-03 00:46:00,217 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-08-03 00:46:00,217 [ scc.merge] INFO Already up to date.
2025-08-03 00:46:00,217 [ scc.merge] INFO
2025-08-03 00:46:00,217 [ scc.merge] INFO Merged PRs:
2025-08-03 00:46:00,217 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-08-03 00:46:00,217 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-08-03 00:46:00,217 [ scc.merge] INFO
2025-08-03 00:46:00,217 [ scc.merge] INFO Repository: ome/omero-upload
2025-08-03 00:46:00,217 [ scc.merge] INFO Already up to date.
2025-08-03 00:46:00,217 [ scc.merge] INFO
2025-08-03 00:46:00,218 [ scc.merge] INFO
2025-08-03 00:46:00,218 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-08-03 00:46:00,218 [ scc.merge] INFO Updating deab817..160d894
2025-08-03 00:46:00,218 [ scc.merge] INFO Previously merged:
2025-08-03 00:46:00,218 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-08-03 00:46:00,218 [ scc.merge] INFO
2025-08-03 00:46:00,218 [ scc.merge] INFO
2025-08-03 00:46:00,218 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-08-03 00:46:00,218 [ scc.merge] INFO Excluded PRs:
2025-08-03 00:46:00,218 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-08-03 00:46:00,218 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-08-03 00:46:00,218 [ scc.merge] INFO Already up to date.
2025-08-03 00:46:00,218 [ scc.merge] INFO
2025-08-03 00:46:00,218 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-03 00:46:00,218 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-08-03 00:46:00,218 [ scc.merge] INFO
2025-08-03 00:46:00,218 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-08-03 00:46:00,218 [ scc.merge] INFO Already up to date.
2025-08-03 00:46:00,218 [ scc.merge] INFO
2025-08-03 00:46:00,218 [ scc.merge] INFO
2025-08-03 00:46:00,218 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-08-03 00:46:00,218 [ scc.merge] INFO Already up to date.
2025-08-03 00:46:00,218 [ scc.merge] INFO
2025-08-03 00:46:00,218 [ scc.merge] INFO
2025-08-03 00:46:00,218 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-08-03 00:46:00,218 [ scc.merge] INFO Already up to date.
2025-08-03 00:46:00,218 [ scc.merge] INFO
2025-08-03 00:46:00,218 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-03 00:46:00,218 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-08-03 00:46:00,218 [ scc.merge] INFO
2025-08-03 00:46:00,218 [ scc.merge] INFO Repository: ome/scripts
2025-08-03 00:46:00,218 [ scc.merge] INFO Excluded PRs:
2025-08-03 00:46:00,218 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-08-03 00:46:00,218 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-08-03 00:46:00,218 [ scc.merge] INFO Updating 4b4c755..573db34
2025-08-03 00:46:00,218 [ scc.merge] INFO Previously merged:
2025-08-03 00:46:00,218 [ scc.merge] INFO - PR 227 jburel 'Replace tostring by tobytes'
2025-08-03 00:46:00,218 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-08-03 00:46:00,218 [ scc.merge] INFO
2025-08-03 00:46:00,218 [ scc.merge] INFO Merged PRs:
2025-08-03 00:46:00,218 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-08-03 00:46:00,218 [ scc.merge] INFO
2025-08-03 00:46:00,218 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-03 00:46:00,219 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-08-03 00:46:00,219 [ scc.merge] INFO
2025-08-03 00:46:00,219 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-08-03 00:46:00,219 [ scc.git] DEBUG Calling 'git remote'
2025-08-03 00:46:00,221 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-08-03 00:46:00,221 [ scc.git] DEBUG Calling 'git remote'
2025-08-03 00:46:00,223 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:46:00,223 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-08-03 00:46:00,223 [ scc.git] DEBUG Calling 'git remote'
2025-08-03 00:46:00,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:46:00,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-08-03 00:46:00,225 [ scc.git] DEBUG Calling 'git remote'
2025-08-03 00:46:00,228 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:46:00,228 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-08-03 00:46:00,228 [ scc.git] DEBUG Calling 'git remote'
2025-08-03 00:46:00,230 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:46:00,230 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-08-03 00:46:00,230 [ scc.git] DEBUG Calling 'git remote'
2025-08-03 00:46:00,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:46:00,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-08-03 00:46:00,232 [ scc.git] DEBUG Calling 'git remote'
2025-08-03 00:46:00,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:46:00,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-08-03 00:46:00,234 [ scc.git] DEBUG Calling 'git remote'
2025-08-03 00:46:00,236 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:46:00,236 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-08-03 00:46:00,236 [ scc.git] DEBUG Calling 'git remote'
2025-08-03 00:46:00,239 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:46:00,239 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-08-03 00:46:00,239 [ scc.git] DEBUG Calling 'git remote'
2025-08-03 00:46:00,241 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:46:00,241 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-08-03 00:46:00,241 [ scc.git] DEBUG Calling 'git remote'
2025-08-03 00:46:00,243 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:46:00,243 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-08-03 00:46:00,243 [ scc.git] DEBUG Calling 'git remote'
2025-08-03 00:46:00,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:46:00,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-08-03 00:46:00,245 [ scc.git] DEBUG Calling 'git remote'
2025-08-03 00:46:00,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:46:00,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-08-03 00:46:00,248 [ scc.git] DEBUG Calling 'git remote'
2025-08-03 00:46:00,250 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:46:00,250 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-08-03 00:46:00,250 [ scc.git] DEBUG Calling 'git remote'
2025-08-03 00:46:00,252 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:46:00,252 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-08-03 00:46:00,252 [ scc.git] DEBUG Calling 'git remote'
2025-08-03 00:46:00,254 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:46:00,254 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-08-03 00:46:00,254 [ scc.git] DEBUG Calling 'git remote'
2025-08-03 00:46:00,256 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:46:00,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-08-03 00:46:00,257 [ scc.git] DEBUG Calling 'git remote'
2025-08-03 00:46:00,259 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:46:00,259 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-08-03 00:46:00,259 [ scc.git] DEBUG Calling 'git remote'
2025-08-03 00:46:00,261 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:46:00,261 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-08-03 00:46:00,261 [ scc.git] DEBUG Calling 'git remote'
2025-08-03 00:46:00,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:46:00,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-08-03 00:46:00,263 [ scc.git] DEBUG Calling 'git remote'
2025-08-03 00:46:00,265 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:46:00,265 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-08-03 00:46:00,265 [ scc.git] DEBUG Calling 'git remote'
2025-08-03 00:46:00,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-03 00:46:00,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-08-03 00:46:00,268 [ scc.git] DEBUG Calling 'git remote'
2025-08-03 00:46:00,270 [ 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 4e7c093] 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 99f2c6f] 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-03 00:46:48,256 [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-03 00:46:57,951 [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-03 00:47:00,460 [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-03 00:47:05,543 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-08-03 00:47:46,047 [ 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/9bac06d9/images/svgs/logo.svg){kind=logo}
