Skipping 217 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-07-20 00:30:33,154 [ scc.git] DEBUG Calling 'git merge-base bb94cf8da960e3283090038b04432f301560f5e4 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-07-20 00:30:33,157 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..bb94cf8da960e3283090038b04432f301560f5e4'
2025-07-20 00:30:33,160 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#482](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-07-20 00:30:33,162 [ scc.config] DEBUG Found github.token
2025-07-20 00:30:33,162 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-07-20 00:30:33,162 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-20 00:30:33,203 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:30:33,203 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:30:33,206 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-20 00:30:33,245 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-20 00:30:33,252 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe23460b710> has no local changes
2025-07-20 00:30:33,252 [ 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#482 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/)'
2025-07-20 00:30:33,258 [ scc.git] DEBUG [detached HEAD 1e874ba] merge master -Dorg -Ssuccess-only
2025-07-20 00:30:33,259 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:30:33,259 [ scc.repo] DEBUG ## PRs found:
2025-07-20 00:30:33,405 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:33,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-07-20 00:30:33,954 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:34,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-07-20 00:30:34,423 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:34,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-07-20 00:30:34,967 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:35,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-20 00:30:35,429 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:35,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-07-20 00:30:35,991 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:36,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-07-20 00:30:36,188 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-20 00:30:36,439 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:36,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-07-20 00:30:36,921 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:37,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-07-20 00:30:37,424 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:37,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-07-20 00:30:37,969 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:38,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-20 00:30:38,456 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:38,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-07-20 00:30:38,912 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:39,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-07-20 00:30:39,111 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-07-20 00:30:39,111 [ scc.repo] DEBUG ## Branches found:
2025-07-20 00:30:39,111 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-07-20 00:30:39,111 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:30:39,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:30:39,114 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-20 00:30:39,116 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-20 00:30:39,117 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-20 00:30:39,120 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-20 00:30:39,124 [ scc.git] DEBUG Already up to date.
2025-07-20 00:30:39,124 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-07-20 00:30:39,414 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-07-20 00:30:39,415 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-07-20 00:30:39,419 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-07-20 00:30:39,701 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-07-20 00:30:39,701 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-07-20 00:30:39,706 [ scc.git] DEBUG ## Unique users: []
2025-07-20 00:30:39,706 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:30:39,706 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:30:39,708 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-07-20 00:30:39,713 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:30:39,715 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-07-20 00:30:39,723 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-20 00:30:39,727 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-07-20 00:30:39,727 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-07-20 00:30:39,727 [ scc.git] DEBUG requirements.txt | 2 +-
2025-07-20 00:30:39,727 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-07-20 00:30:39,727 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-07-20 00:30:39,727 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-07-20 00:30:39,728 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:39,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:30:39,911 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-07-20 00:30:39,915 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:30:39,917 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 94 (Use the release/v1 branch for the PyPA action publishing to PyPI) 1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-07-20 00:30:39,927 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-20 00:30:39,930 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-07-20 00:30:39,930 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-07-20 00:30:40,162 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:40,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:30:40,354 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-20 00:30:40,393 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:30:40,394 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:30:40,397 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-20 00:30:40,435 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-20 00:30:40,439 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe23451bcd0> has no local changes
2025-07-20 00:30:40,439 [ 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#482 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/)'
2025-07-20 00:30:40,445 [ scc.git] DEBUG [detached HEAD 05aef24] merge master -Dorg -Ssuccess-only
2025-07-20 00:30:40,445 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:30:40,445 [ scc.repo] DEBUG ## PRs found:
2025-07-20 00:30:40,604 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:40,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-07-20 00:30:41,158 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:41,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-07-20 00:30:41,631 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:41,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-07-20 00:30:42,117 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:42,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-07-20 00:30:42,628 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:42,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-20 00:30:43,114 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:43,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-07-20 00:30:43,678 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:43,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-07-20 00:30:43,884 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-07-20 00:30:44,135 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:44,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-07-20 00:30:44,632 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:44,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-07-20 00:30:45,118 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:45,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-07-20 00:30:45,663 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:45,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-20 00:30:46,186 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:46,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-07-20 00:30:46,763 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:46,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-07-20 00:30:46,940 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-07-20 00:30:46,940 [ scc.repo] DEBUG ## Branches found:
2025-07-20 00:30:46,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-07-20 00:30:46,941 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:30:46,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:30:46,944 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-20 00:30:46,946 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-20 00:30:46,946 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-20 00:30:46,949 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-20 00:30:46,957 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-07-20 00:30:47,191 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:47,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-07-20 00:30:47,598 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-07-20 00:30:47,886 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-07-20 00:30:47,887 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-07-20 00:30:47,891 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-07-20 00:30:48,174 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-07-20 00:30:48,174 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-07-20 00:30:48,178 [ scc.git] DEBUG ## Unique users: []
2025-07-20 00:30:48,178 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:30:48,178 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:30:48,181 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-07-20 00:30:48,186 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:30:48,188 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-07-20 00:30:48,201 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-07-20 00:30:48,201 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-07-20 00:30:48,201 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-07-20 00:30:48,201 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-07-20 00:30:48,202 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-20 00:30:48,202 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-20 00:30:48,204 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-20 00:30:48,209 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-07-20 00:30:48,210 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:48,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:30:48,381 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-07-20 00:30:48,386 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-20 00:30:48,389 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#482](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-07-20 00:30:48,391 [ scc.config] DEBUG Found github.token
2025-07-20 00:30:48,391 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-07-20 00:30:48,391 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-07-20 00:30:48,396 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:30:48,398 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2025-07-20 00:30:48,413 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-07-20 00:30:48,413 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-07-20 00:30:48,413 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-07-20 00:30:48,414 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-20 00:30:48,414 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-20 00:30:48,417 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-20 00:30:48,422 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-07-20 00:30:48,632 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:48,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:30:48,836 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-07-20 00:30:48,840 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-07-20 00:30:48,843 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#482](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2025-07-20 00:30:48,845 [ scc.config] DEBUG Found github.token
2025-07-20 00:30:48,845 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-07-20 00:30:48,845 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-20 00:30:48,887 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:30:48,887 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:30:48,890 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-20 00:30:48,928 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-20 00:30:48,933 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe234448490> has no local changes
2025-07-20 00:30:48,933 [ 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#482 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/)'
2025-07-20 00:30:48,940 [ scc.git] DEBUG [detached HEAD 315ae96] merge master -Dorg -Ssuccess-only
2025-07-20 00:30:48,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:30:48,940 [ scc.repo] DEBUG ## PRs found:
2025-07-20 00:30:49,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:49,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-07-20 00:30:49,682 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:49,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-07-20 00:30:50,177 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:50,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-07-20 00:30:50,709 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:50,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-20 00:30:51,247 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:51,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-07-20 00:30:51,766 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:52,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-07-20 00:30:52,318 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:52,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-07-20 00:30:52,503 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-20 00:30:52,754 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:53,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-07-20 00:30:53,013 [ scc.repo] DEBUG # ... Include label: dependencies
2025-07-20 00:30:53,264 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:53,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-07-20 00:30:53,817 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:54,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-20 00:30:54,333 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:54,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-07-20 00:30:54,848 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:55,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-07-20 00:30:55,317 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:55,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-07-20 00:30:55,508 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-07-20 00:30:55,759 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:56,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-07-20 00:30:56,006 [ scc.repo] DEBUG # ... Include label: dependencies
2025-07-20 00:30:56,257 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:56,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-07-20 00:30:56,790 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:57,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-20 00:30:57,345 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:57,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-07-20 00:30:57,873 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:58,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-07-20 00:30:58,354 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:58,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-07-20 00:30:58,547 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-07-20 00:30:58,798 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:59,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-07-20 00:30:59,309 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:30:59,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-07-20 00:30:59,823 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:00,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-07-20 00:31:00,304 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:00,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-07-20 00:31:00,830 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:01,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-07-20 00:31:01,337 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:01,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-07-20 00:31:01,852 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:02,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-07-20 00:31:02,124 [ scc.repo] DEBUG ## Branches found:
2025-07-20 00:31:02,124 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-07-20 00:31:02,124 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:02,124 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:02,127 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-20 00:31:02,129 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-20 00:31:02,129 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-20 00:31:02,132 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-20 00:31:02,135 [ scc.git] DEBUG Already up to date.
2025-07-20 00:31:02,135 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-07-20 00:31:02,576 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-07-20 00:31:02,576 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-07-20 00:31:02,580 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-07-20 00:31:02,865 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-07-20 00:31:02,865 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-07-20 00:31:02,869 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-07-20 00:31:03,160 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-07-20 00:31:03,161 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-07-20 00:31:03,165 [ scc.git] DEBUG ## Unique users: []
2025-07-20 00:31:03,165 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:03,165 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:03,168 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-07-20 00:31:03,171 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:03,173 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 140 (Bump vite from 4.2.3 to 4.5.9) 6301bc61b0a877104173846d526382bf15cc70a0'
2025-07-20 00:31:03,181 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-20 00:31:03,185 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-07-20 00:31:03,185 [ scc.git] DEBUG package.json | 2 +-
2025-07-20 00:31:03,185 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-07-20 00:31:03,186 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:03,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:03,362 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-07-20 00:31:03,365 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:03,368 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 141 (Bump axios from 1.6.0 to 1.8.2) de7db17cd62b498179713df276cff151a1f36d80'
2025-07-20 00:31:03,378 [ scc.git] DEBUG Auto-merging package-lock.json
2025-07-20 00:31:03,378 [ scc.git] DEBUG Auto-merging package.json
2025-07-20 00:31:03,379 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-20 00:31:03,382 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-07-20 00:31:03,382 [ scc.git] DEBUG package.json | 2 +-
2025-07-20 00:31:03,382 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-07-20 00:31:03,613 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:03,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:03,797 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-07-20 00:31:03,800 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:03,802 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 142 (Use the release/v1 branch for the PyPA action publishing to PyPI) 16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-07-20 00:31:03,812 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-20 00:31:03,815 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-07-20 00:31:03,815 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-07-20 00:31:04,047 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:04,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:04,238 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-20 00:31:04,280 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:04,280 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:04,282 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-20 00:31:04,322 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-20 00:31:04,326 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe231321790> has no local changes
2025-07-20 00:31:04,326 [ 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#482 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/)'
2025-07-20 00:31:04,333 [ scc.git] DEBUG [detached HEAD 47e0119] merge master -Dorg -Ssuccess-only
2025-07-20 00:31:04,333 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:04,333 [ scc.repo] DEBUG ## PRs found:
2025-07-20 00:31:04,489 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:04,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-07-20 00:31:04,690 [ scc.repo] DEBUG ## Branches found:
2025-07-20 00:31:04,690 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-07-20 00:31:04,690 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:04,690 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:04,693 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-20 00:31:04,695 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-20 00:31:04,695 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-20 00:31:04,698 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-20 00:31:04,701 [ scc.git] DEBUG Already up to date.
2025-07-20 00:31:04,701 [ scc.git] DEBUG ## Unique users: []
2025-07-20 00:31:04,701 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:04,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:04,703 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-20 00:31:04,744 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:04,744 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:04,746 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-20 00:31:04,786 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-20 00:31:04,789 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe231311390> has no local changes
2025-07-20 00:31:04,789 [ 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#482 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/)'
2025-07-20 00:31:04,796 [ scc.git] DEBUG [detached HEAD 7b8cd83] merge master -Dorg -Ssuccess-only
2025-07-20 00:31:04,796 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:04,796 [ scc.repo] DEBUG ## PRs found:
2025-07-20 00:31:04,941 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:05,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-07-20 00:31:05,462 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:05,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-07-20 00:31:05,978 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:06,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-07-20 00:31:06,452 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:06,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-07-20 00:31:06,695 [ scc.repo] DEBUG ## Branches found:
2025-07-20 00:31:06,695 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-07-20 00:31:06,695 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:06,695 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:06,698 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-20 00:31:06,700 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-20 00:31:06,700 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-20 00:31:06,704 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-20 00:31:06,707 [ scc.git] DEBUG Already up to date.
2025-07-20 00:31:06,707 [ scc.git] DEBUG ## Unique users: []
2025-07-20 00:31:06,707 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:06,707 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:06,709 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-20 00:31:06,748 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:06,749 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:06,751 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-20 00:31:06,789 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-20 00:31:06,793 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe234447c50> has no local changes
2025-07-20 00:31:06,793 [ 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#482 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/)'
2025-07-20 00:31:06,799 [ scc.git] DEBUG [detached HEAD 8a17f65] merge master -Dorg -Ssuccess-only
2025-07-20 00:31:06,799 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:06,800 [ scc.repo] DEBUG ## PRs found:
2025-07-20 00:31:06,946 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:07,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-07-20 00:31:07,487 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:07,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-07-20 00:31:07,965 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:08,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-07-20 00:31:08,460 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:08,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-07-20 00:31:09,026 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:09,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-20 00:31:09,503 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:10,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-07-20 00:31:10,294 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:10,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-07-20 00:31:10,491 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-07-20 00:31:10,491 [ scc.repo] DEBUG ## Branches found:
2025-07-20 00:31:10,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-07-20 00:31:10,491 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:10,491 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:10,494 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-20 00:31:10,496 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-20 00:31:10,496 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-20 00:31:10,499 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-20 00:31:10,502 [ scc.git] DEBUG Already up to date.
2025-07-20 00:31:10,502 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-07-20 00:31:10,793 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-07-20 00:31:10,793 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-07-20 00:31:10,798 [ scc.git] DEBUG ## Unique users: []
2025-07-20 00:31:10,798 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:10,798 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:10,800 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-07-20 00:31:10,803 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:10,806 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-07-20 00:31:10,815 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-07-20 00:31:10,815 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-07-20 00:31:10,815 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-07-20 00:31:10,815 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-07-20 00:31:10,815 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-07-20 00:31:10,815 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-07-20 00:31:10,815 [ scc.git] DEBUG Auto-merging setup.py
2025-07-20 00:31:10,815 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-07-20 00:31:10,815 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-20 00:31:10,815 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-20 00:31:10,818 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-07-20 00:31:10,822 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-07-20 00:31:10,824 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:10,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:10,994 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-07-20 00:31:10,997 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-07-20 00:31:11,001 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#482](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- setup.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
--conflicts
2025-07-20 00:31:11,003 [ scc.config] DEBUG Found github.token
2025-07-20 00:31:11,003 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-07-20 00:31:11,004 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-20 00:31:11,044 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:11,044 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:11,046 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-20 00:31:11,084 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-20 00:31:11,087 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe231339710> has no local changes
2025-07-20 00:31:11,087 [ 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#482 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/)'
2025-07-20 00:31:11,093 [ scc.git] DEBUG [detached HEAD 19ad1ec] merge master -Dorg -Ssuccess-only
2025-07-20 00:31:11,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:11,094 [ scc.repo] DEBUG ## PRs found:
2025-07-20 00:31:11,245 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:11,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-07-20 00:31:11,865 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:12,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-07-20 00:31:12,399 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:12,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-07-20 00:31:12,965 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:13,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-20 00:31:13,494 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:13,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-07-20 00:31:14,041 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:14,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-07-20 00:31:14,599 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:14,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6?per_page=1 HTTP/1.1" 200 2
2025-07-20 00:31:14,836 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-07-20 00:31:15,087 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:15,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-07-20 00:31:15,612 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:15,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-07-20 00:31:16,080 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:16,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-07-20 00:31:16,661 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:16,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-20 00:31:17,180 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:17,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-07-20 00:31:17,669 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:17,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-07-20 00:31:18,145 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:18,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-07-20 00:31:18,642 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:18,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-07-20 00:31:19,131 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:19,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-07-20 00:31:19,616 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:19,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-07-20 00:31:20,165 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:20,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-20 00:31:20,628 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:20,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-07-20 00:31:21,118 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:21,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2025-07-20 00:31:21,330 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-07-20 00:31:21,330 [ scc.repo] DEBUG ## Branches found:
2025-07-20 00:31:21,330 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-07-20 00:31:21,330 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:21,330 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:21,333 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-20 00:31:21,335 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-20 00:31:21,336 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-20 00:31:21,338 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-20 00:31:21,341 [ scc.git] DEBUG Already up to date.
2025-07-20 00:31:21,341 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-07-20 00:31:21,661 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-07-20 00:31:21,662 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-07-20 00:31:21,666 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-07-20 00:31:21,983 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-07-20 00:31:21,983 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-07-20 00:31:21,987 [ scc.git] DEBUG ## Unique users: []
2025-07-20 00:31:21,987 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:21,988 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:21,990 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-07-20 00:31:21,994 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:21,997 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2025-07-20 00:31:22,009 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-20 00:31:22,013 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-07-20 00:31:22,013 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-07-20 00:31:22,013 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-07-20 00:31:22,013 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-07-20 00:31:22,013 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-07-20 00:31:22,013 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-07-20 00:31:22,013 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-07-20 00:31:22,013 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-07-20 00:31:22,013 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-07-20 00:31:22,014 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:22,014 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-07-20 00:31:22,014 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-07-20 00:31:22,014 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-07-20 00:31:22,014 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-07-20 00:31:22,014 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-07-20 00:31:22,015 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-07-20 00:31:22,015 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-07-20 00:31:22,015 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-07-20 00:31:22,015 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-07-20 00:31:22,015 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-07-20 00:31:22,015 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-07-20 00:31:22,015 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-07-20 00:31:22,015 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-07-20 00:31:22,015 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-07-20 00:31:22,015 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-07-20 00:31:22,015 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-07-20 00:31:22,015 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-07-20 00:31:22,015 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-07-20 00:31:22,015 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-07-20 00:31:22,015 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-07-20 00:31:22,015 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-07-20 00:31:22,015 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-07-20 00:31:22,015 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-07-20 00:31:22,015 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-07-20 00:31:22,015 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-07-20 00:31:22,015 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-07-20 00:31:22,015 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-07-20 00:31:22,015 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-07-20 00:31:22,015 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-07-20 00:31:22,015 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-07-20 00:31:22,015 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-07-20 00:31:22,016 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-07-20 00:31:22,016 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-07-20 00:31:22,016 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-07-20 00:31:22,016 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-07-20 00:31:22,016 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-07-20 00:31:22,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:22,209 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-07-20 00:31:22,213 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:22,216 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-07-20 00:31:22,226 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-20 00:31:22,229 [ scc.git] DEBUG docker | 1 +
2025-07-20 00:31:22,229 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-07-20 00:31:22,460 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:22,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:22,661 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-20 00:31:22,703 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:22,703 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:22,705 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-20 00:31:22,745 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-20 00:31:22,749 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe234546a50> has no local changes
2025-07-20 00:31:22,750 [ 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#482 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/)'
2025-07-20 00:31:22,846 [ scc.git] DEBUG [detached HEAD 822c68d] merge master -Dorg -Ssuccess-only
2025-07-20 00:31:22,847 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:22,847 [ scc.repo] DEBUG ## PRs found:
2025-07-20 00:31:22,912 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:23,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-07-20 00:31:23,105 [ scc.repo] DEBUG ## Branches found:
2025-07-20 00:31:23,105 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-07-20 00:31:23,106 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:23,106 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:23,108 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-20 00:31:23,110 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-20 00:31:23,110 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-20 00:31:23,113 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-20 00:31:23,116 [ scc.git] DEBUG Already up to date.
2025-07-20 00:31:23,116 [ scc.git] DEBUG ## Unique users: []
2025-07-20 00:31:23,116 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:23,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:23,119 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-20 00:31:23,157 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:23,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:23,160 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-20 00:31:23,196 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-20 00:31:23,200 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe23132d850> has no local changes
2025-07-20 00:31:23,200 [ 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#482 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/)'
2025-07-20 00:31:23,206 [ scc.git] DEBUG [detached HEAD 5a262d8] merge master -Dorg -Ssuccess-only
2025-07-20 00:31:23,206 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:23,206 [ scc.repo] DEBUG ## PRs found:
2025-07-20 00:31:23,356 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:23,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2025-07-20 00:31:23,539 [ scc.repo] DEBUG ## Branches found:
2025-07-20 00:31:23,539 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-07-20 00:31:23,539 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:23,539 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:23,541 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-20 00:31:23,543 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-20 00:31:23,543 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-20 00:31:23,546 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-20 00:31:23,555 [ scc.git] DEBUG Updating deab817..160d894
2025-07-20 00:31:23,790 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:24,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls/20 HTTP/1.1" 200 None
2025-07-20 00:31:24,217 [ scc.git] DEBUG ## Unique users: []
2025-07-20 00:31:24,217 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:24,217 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:24,220 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-20 00:31:24,262 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:24,262 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:24,264 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-20 00:31:24,304 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-20 00:31:24,308 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe2313aac50> has no local changes
2025-07-20 00:31:24,308 [ 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#482 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/)'
2025-07-20 00:31:24,314 [ scc.git] DEBUG [detached HEAD 5c829b4] merge master -Dorg -Ssuccess-only
2025-07-20 00:31:24,315 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:24,315 [ scc.git] INFO Overriding base-branch from master to main
2025-07-20 00:31:24,315 [ scc.repo] DEBUG ## PRs found:
2025-07-20 00:31:24,468 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:24,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-07-20 00:31:24,976 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:25,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-07-20 00:31:25,490 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:25,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-07-20 00:31:25,981 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:26,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-07-20 00:31:26,559 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:26,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-20 00:31:27,059 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:27,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-07-20 00:31:27,567 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:27,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-07-20 00:31:28,054 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:28,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-07-20 00:31:28,532 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:28,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-07-20 00:31:29,001 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:29,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-07-20 00:31:29,543 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:29,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-20 00:31:30,036 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:30,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-07-20 00:31:30,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:30,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-07-20 00:31:30,762 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-07-20 00:31:30,762 [ scc.repo] DEBUG ## Branches found:
2025-07-20 00:31:30,762 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-07-20 00:31:30,762 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:30,762 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:30,765 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-07-20 00:31:30,768 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-20 00:31:30,768 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-07-20 00:31:30,771 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-07-20 00:31:30,774 [ scc.git] DEBUG Already up to date.
2025-07-20 00:31:30,774 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-07-20 00:31:31,070 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-07-20 00:31:31,071 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-07-20 00:31:31,075 [ scc.git] DEBUG ## Unique users: []
2025-07-20 00:31:31,075 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:31,075 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:31,077 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-07-20 00:31:31,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:31,082 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-07-20 00:31:31,090 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-07-20 00:31:31,090 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-07-20 00:31:31,090 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-20 00:31:31,090 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-20 00:31:31,093 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-07-20 00:31:31,097 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-07-20 00:31:31,098 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:31,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:31,281 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-07-20 00:31:31,284 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-07-20 00:31:31,287 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#482](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-07-20 00:31:31,289 [ scc.config] DEBUG Found github.token
2025-07-20 00:31:31,289 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-07-20 00:31:31,289 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-20 00:31:31,330 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:31,330 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:31,332 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-20 00:31:31,370 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-20 00:31:31,373 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe23132e3d0> has no local changes
2025-07-20 00:31:31,374 [ 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#482 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/)'
2025-07-20 00:31:31,380 [ scc.git] DEBUG [detached HEAD 72ed959] merge master -Dorg -Ssuccess-only
2025-07-20 00:31:31,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:31,380 [ scc.repo] DEBUG ## PRs found:
2025-07-20 00:31:31,532 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:31,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-07-20 00:31:31,745 [ scc.repo] DEBUG ## Branches found:
2025-07-20 00:31:31,745 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-07-20 00:31:31,745 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:31,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:31,748 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-20 00:31:31,751 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-20 00:31:31,751 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-20 00:31:31,753 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-20 00:31:31,756 [ scc.git] DEBUG Already up to date.
2025-07-20 00:31:31,756 [ scc.git] DEBUG ## Unique users: []
2025-07-20 00:31:31,756 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:31,756 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:31,759 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-20 00:31:31,801 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:31,801 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:31,803 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-20 00:31:31,843 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-20 00:31:31,846 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe231341ed0> has no local changes
2025-07-20 00:31:31,846 [ 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#482 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/)'
2025-07-20 00:31:31,853 [ scc.git] DEBUG [detached HEAD 84dd4ca] merge master -Dorg -Ssuccess-only
2025-07-20 00:31:31,853 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:31,853 [ scc.repo] DEBUG ## PRs found:
2025-07-20 00:31:31,996 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:32,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-07-20 00:31:32,216 [ scc.repo] DEBUG ## Branches found:
2025-07-20 00:31:32,216 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-07-20 00:31:32,216 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:32,216 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:32,218 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-20 00:31:32,221 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-20 00:31:32,221 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-20 00:31:32,224 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-20 00:31:32,227 [ scc.git] DEBUG Already up to date.
2025-07-20 00:31:32,227 [ scc.git] DEBUG ## Unique users: []
2025-07-20 00:31:32,227 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:32,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:32,229 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-20 00:31:32,268 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:32,268 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:32,271 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-20 00:31:32,308 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-20 00:31:32,312 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe2346f15d0> has no local changes
2025-07-20 00:31:32,312 [ 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#482 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/)'
2025-07-20 00:31:32,318 [ scc.git] DEBUG [detached HEAD c016447] merge master -Dorg -Ssuccess-only
2025-07-20 00:31:32,318 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:32,319 [ scc.repo] DEBUG ## PRs found:
2025-07-20 00:31:32,467 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:32,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-07-20 00:31:33,024 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:33,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-07-20 00:31:33,511 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:33,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-07-20 00:31:33,963 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:34,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-07-20 00:31:34,544 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:34,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-20 00:31:35,041 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:35,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-07-20 00:31:35,572 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:35,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-07-20 00:31:35,783 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-07-20 00:31:35,784 [ scc.repo] DEBUG ## Branches found:
2025-07-20 00:31:35,784 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-07-20 00:31:35,784 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:35,784 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:35,787 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-07-20 00:31:35,789 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-20 00:31:35,789 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-07-20 00:31:35,792 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-07-20 00:31:35,795 [ scc.git] DEBUG Already up to date.
2025-07-20 00:31:35,795 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-07-20 00:31:36,079 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-07-20 00:31:36,079 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-07-20 00:31:36,083 [ scc.git] DEBUG ## Unique users: []
2025-07-20 00:31:36,083 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:36,083 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:36,086 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-07-20 00:31:36,089 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:36,091 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-07-20 00:31:36,099 [ scc.git] DEBUG Auto-merging Dockerfile
2025-07-20 00:31:36,100 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-07-20 00:31:36,100 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-20 00:31:36,100 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-20 00:31:36,103 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-07-20 00:31:36,108 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-07-20 00:31:36,109 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:36,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:36,279 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-07-20 00:31:36,282 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-07-20 00:31:36,284 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#482](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-07-20 00:31:36,286 [ scc.config] DEBUG Found github.token
2025-07-20 00:31:36,287 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-07-20 00:31:36,287 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-20 00:31:36,327 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:36,327 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:36,329 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-20 00:31:36,368 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-20 00:31:36,372 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe234531210> has no local changes
2025-07-20 00:31:36,372 [ 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#482 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/)'
2025-07-20 00:31:36,379 [ scc.git] DEBUG [detached HEAD 959d357] merge master -Dorg -Ssuccess-only
2025-07-20 00:31:36,379 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:36,379 [ scc.git] INFO Overriding base-branch from master to develop
2025-07-20 00:31:36,379 [ scc.repo] DEBUG ## PRs found:
2025-07-20 00:31:36,530 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:36,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-07-20 00:31:37,103 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:37,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-07-20 00:31:37,593 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:37,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-07-20 00:31:38,055 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:38,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-07-20 00:31:38,513 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:38,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-20 00:31:39,004 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:39,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-07-20 00:31:39,519 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:39,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-07-20 00:31:39,974 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:40,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-07-20 00:31:40,157 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-07-20 00:31:40,408 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:40,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-07-20 00:31:40,878 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:41,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-07-20 00:31:41,348 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:41,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-07-20 00:31:41,809 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:42,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-07-20 00:31:42,275 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:42,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-07-20 00:31:42,723 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:42,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-07-20 00:31:42,924 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-07-20 00:31:43,175 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:43,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-07-20 00:31:43,672 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:43,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-07-20 00:31:44,138 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:44,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-07-20 00:31:44,612 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:44,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-07-20 00:31:44,825 [ scc.repo] DEBUG ## Branches found:
2025-07-20 00:31:44,825 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-07-20 00:31:44,825 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:44,825 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:44,828 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-07-20 00:31:44,830 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-07-20 00:31:44,830 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-07-20 00:31:44,834 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-07-20 00:31:44,844 [ scc.git] DEBUG Updating 4b4c755..573db34
2025-07-20 00:31:45,076 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:45,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/227 HTTP/1.1" 200 None
2025-07-20 00:31:45,740 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:46,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-07-20 00:31:46,199 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-07-20 00:31:46,501 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-07-20 00:31:46,501 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-07-20 00:31:46,506 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-07-20 00:31:46,789 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-07-20 00:31:46,789 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-07-20 00:31:46,793 [ scc.git] DEBUG ## Unique users: []
2025-07-20 00:31:46,793 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:46,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:46,796 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-07-20 00:31:46,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:46,804 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-07-20 00:31:46,815 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-07-20 00:31:46,816 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-07-20 00:31:46,816 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-07-20 00:31:46,819 [ scc.git] DEBUG Calling 'git reset --hard 573db340d5d1429fa17c7e486206948412a7c150'
2025-07-20 00:31:46,823 [ scc.git] DEBUG HEAD is now at 573db34 Bump version: 5.9.1 → 5.9.2.dev0
2025-07-20 00:31:46,824 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:47,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:47,005 [ scc.git] DEBUG Calling 'git merge-base 573db340d5d1429fa17c7e486206948412a7c150 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-07-20 00:31:47,011 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..573db340d5d1429fa17c7e486206948412a7c150'
2025-07-20 00:31:47,016 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#482](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-07-20 00:31:47,018 [ scc.config] DEBUG Found github.token
2025-07-20 00:31:47,018 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-07-20 00:31:47,018 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-07-20 00:31:47,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:47,025 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-07-20 00:31:47,035 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-07-20 00:31:47,038 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-07-20 00:31:47,038 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-07-20 00:31:47,256 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:47,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:47,434 [ scc.git] DEBUG Calling 'git submodule update'
2025-07-20 00:31:47,475 [ scc.git] DEBUG Get sha1 of %s
2025-07-20 00:31:47,475 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-07-20 00:31:47,477 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-20 00:31:47,515 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-20 00:31:47,519 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe2313c9050> has no local changes
2025-07-20 00:31:47,519 [ 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#482 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/)'
2025-07-20 00:31:47,525 [ scc.git] DEBUG [detached HEAD be3de10] merge master -Dorg -Ssuccess-only
2025-07-20 00:31:47,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:47,526 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-07-20 00:31:47,604 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-07-20 00:31:47,685 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:47,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:47,859 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-07-20 00:31:47,861 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-07-20 00:31:48,105 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:48,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:48,277 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-07-20 00:31:48,279 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-07-20 00:31:48,524 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:48,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:48,699 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-07-20 00:31:48,701 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-07-20 00:31:48,944 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:49,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:49,121 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-07-20 00:31:49,366 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:49,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:49,539 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-07-20 00:31:49,541 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-07-20 00:31:49,786 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:49,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:49,991 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-07-20 00:31:49,993 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-07-20 00:31:50,238 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:50,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:50,422 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-07-20 00:31:50,424 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-07-20 00:31:50,668 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:50,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:50,837 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-07-20 00:31:50,839 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-07-20 00:31:51,084 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:51,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:51,262 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-07-20 00:31:51,264 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-07-20 00:31:51,509 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:51,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:51,672 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-07-20 00:31:51,674 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-07-20 00:31:51,918 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:52,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:52,103 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-07-20 00:31:52,105 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-07-20 00:31:52,349 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:52,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:52,534 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-07-20 00:31:52,536 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-07-20 00:31:52,780 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:52,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:52,956 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-07-20 00:31:53,201 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:53,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:53,387 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-07-20 00:31:53,631 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:53,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:53,803 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-07-20 00:31:53,805 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-07-20 00:31:54,050 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:54,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:54,233 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-07-20 00:31:54,478 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:54,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:54,664 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-07-20 00:31:54,909 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:55,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:55,083 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-07-20 00:31:55,085 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-07-20 00:31:55,330 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:55,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:55,504 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-07-20 00:31:55,506 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-07-20 00:31:55,750 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:55,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:55,929 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-07-20 00:31:55,931 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-07-20 00:31:56,176 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:56,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:56,352 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-07-20 00:31:56,354 [ scc.config] DEBUG Found submodule.scripts.url
2025-07-20 00:31:56,599 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-07-20 00:31:56,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-07-20 00:31:56,770 [ scc.config] DEBUG Found submodule.scripts.branch
2025-07-20 00:31:56,770 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-07-20 00:31:56,855 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe234479350> has local changes
2025-07-20 00:31:56,855 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
- PR 71 dominikl 'Escape slash character in image names'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 174 will-moore 'Skip wells' (stage: draft)
- PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 167 dominikl 'Add extinfo command' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
Updating 11d3587..f7eea7c
Previously merged:
- PR 179 will-moore 'Changelog 0.6.0'
- PR 177 jburel 'Replace fromstring by frombuffer'
- PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
- PR 147 will-moore 'Name option'
- PR 173 will-moore 'Add test_export_plate_polygons()'
- PR 171 will-moore 'Initial addition of integration tests'
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
Repository: ome/omero-figure
Excluded PRs:
- PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
- PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..3e8fa730
Previously merged:
- PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
- PR 635 dependabot[bot] 'Bump esbuild and vite'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Updating 7a798ce..bb94cf8
Previously merged:
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
- PR 76 will-moore 'Run cli deps'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Updating deab817..160d894
Previously merged:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..573db34
Previously merged:
- PR 227 jburel 'Replace tostring by tobytes'
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#482 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/482/)'
2025-07-20 00:31:56,868 [ scc.git] DEBUG [detached HEAD a30dcd8] merge master -Dorg -Ssuccess-only
2025-07-20 00:31:56,869 [ scc.merge] INFO Repository: ome/omero-plugins
2025-07-20 00:31:56,869 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-07-20 00:31:56,869 [ scc.merge] INFO Already up to date.
2025-07-20 00:31:56,869 [ scc.merge] INFO
2025-07-20 00:31:56,869 [ scc.merge] INFO Merged PRs:
2025-07-20 00:31:56,869 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-07-20 00:31:56,869 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-07-20 00:31:56,869 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-07-20 00:31:56,869 [ scc.merge] INFO
2025-07-20 00:31:56,869 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-07-20 00:31:56,869 [ scc.merge] INFO Already up to date.
2025-07-20 00:31:56,869 [ scc.merge] INFO
2025-07-20 00:31:56,869 [ scc.merge] INFO
2025-07-20 00:31:56,869 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-07-20 00:31:56,869 [ scc.merge] INFO Excluded PRs:
2025-07-20 00:31:56,869 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-07-20 00:31:56,869 [ scc.merge] INFO Already up to date.
2025-07-20 00:31:56,869 [ scc.merge] INFO
2025-07-20 00:31:56,869 [ scc.merge] INFO
2025-07-20 00:31:56,869 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-07-20 00:31:56,869 [ scc.merge] INFO Excluded PRs:
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-07-20 00:31:56,870 [ scc.merge] INFO Already up to date.
2025-07-20 00:31:56,870 [ scc.merge] INFO
2025-07-20 00:31:56,870 [ scc.merge] INFO Merged PRs:
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-07-20 00:31:56,870 [ scc.merge] INFO
2025-07-20 00:31:56,870 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-07-20 00:31:56,870 [ scc.merge] INFO Excluded PRs:
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 174 will-moore 'Skip wells' (stage: draft)
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-07-20 00:31:56,870 [ scc.merge] INFO Updating 11d3587..f7eea7c
2025-07-20 00:31:56,870 [ scc.merge] INFO Previously merged:
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 179 will-moore 'Changelog 0.6.0'
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 177 jburel 'Replace fromstring by frombuffer'
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 173 will-moore 'Add test_export_plate_polygons()'
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-20 00:31:56,870 [ scc.merge] INFO
2025-07-20 00:31:56,870 [ scc.merge] INFO Merged PRs:
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
2025-07-20 00:31:56,870 [ scc.merge] INFO
2025-07-20 00:31:56,870 [ scc.merge] INFO Repository: ome/omero-figure
2025-07-20 00:31:56,870 [ scc.merge] INFO Excluded PRs:
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-07-20 00:31:56,870 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-07-20 00:31:56,870 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-07-20 00:31:56,871 [ scc.merge] INFO Previously merged:
2025-07-20 00:31:56,871 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-07-20 00:31:56,871 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-07-20 00:31:56,871 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-07-20 00:31:56,871 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-20 00:31:56,871 [ scc.merge] INFO
2025-07-20 00:31:56,871 [ scc.merge] INFO Merged PRs:
2025-07-20 00:31:56,871 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-07-20 00:31:56,871 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-07-20 00:31:56,871 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-07-20 00:31:56,871 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-07-20 00:31:56,871 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-07-20 00:31:56,871 [ scc.merge] INFO
2025-07-20 00:31:56,871 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-20 00:31:56,871 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-07-20 00:31:56,871 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-07-20 00:31:56,871 [ scc.merge] INFO
2025-07-20 00:31:56,871 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-07-20 00:31:56,871 [ scc.merge] INFO Already up to date.
2025-07-20 00:31:56,871 [ scc.merge] INFO
2025-07-20 00:31:56,871 [ scc.merge] INFO Merged PRs:
2025-07-20 00:31:56,871 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-07-20 00:31:56,871 [ scc.merge] INFO
2025-07-20 00:31:56,871 [ scc.merge] INFO Repository: ome/omero-gallery
2025-07-20 00:31:56,871 [ scc.merge] INFO Already up to date.
2025-07-20 00:31:56,871 [ scc.merge] INFO
2025-07-20 00:31:56,871 [ scc.merge] INFO Merged PRs:
2025-07-20 00:31:56,871 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-07-20 00:31:56,871 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-07-20 00:31:56,871 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-07-20 00:31:56,871 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-07-20 00:31:56,871 [ scc.merge] INFO
2025-07-20 00:31:56,871 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-20 00:31:56,871 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-07-20 00:31:56,871 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-07-20 00:31:56,871 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-07-20 00:31:56,871 [ scc.merge] INFO
2025-07-20 00:31:56,872 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-07-20 00:31:56,872 [ scc.merge] INFO Excluded PRs:
2025-07-20 00:31:56,872 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-07-20 00:31:56,872 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-07-20 00:31:56,872 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-07-20 00:31:56,872 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-07-20 00:31:56,872 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-07-20 00:31:56,872 [ scc.merge] INFO Updating 7a798ce..bb94cf8
2025-07-20 00:31:56,872 [ scc.merge] INFO Previously merged:
2025-07-20 00:31:56,872 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-20 00:31:56,872 [ scc.merge] INFO
2025-07-20 00:31:56,872 [ scc.merge] INFO Merged PRs:
2025-07-20 00:31:56,872 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-07-20 00:31:56,872 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-07-20 00:31:56,872 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-07-20 00:31:56,872 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-07-20 00:31:56,872 [ scc.merge] INFO
2025-07-20 00:31:56,872 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-20 00:31:56,872 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-07-20 00:31:56,872 [ scc.merge] INFO
2025-07-20 00:31:56,872 [ scc.merge] INFO Repository: ome/omero-mapr
2025-07-20 00:31:56,872 [ scc.merge] INFO Excluded PRs:
2025-07-20 00:31:56,872 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-07-20 00:31:56,872 [ scc.merge] INFO Already up to date.
2025-07-20 00:31:56,872 [ scc.merge] INFO
2025-07-20 00:31:56,872 [ scc.merge] INFO Merged PRs:
2025-07-20 00:31:56,872 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-07-20 00:31:56,872 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-20 00:31:56,872 [ scc.merge] INFO
2025-07-20 00:31:56,872 [ scc.merge] INFO Repository: ome/omero-metadata
2025-07-20 00:31:56,872 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-07-20 00:31:56,872 [ scc.merge] INFO Previously merged:
2025-07-20 00:31:56,872 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-20 00:31:56,872 [ scc.merge] INFO
2025-07-20 00:31:56,872 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-20 00:31:56,872 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-07-20 00:31:56,872 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-07-20 00:31:56,872 [ scc.merge] INFO
2025-07-20 00:31:56,872 [ scc.merge] INFO Repository: ome/omero-parade
2025-07-20 00:31:56,873 [ scc.merge] INFO Excluded PRs:
2025-07-20 00:31:56,873 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-07-20 00:31:56,873 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-07-20 00:31:56,873 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-07-20 00:31:56,873 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-07-20 00:31:56,873 [ scc.merge] INFO Already up to date.
2025-07-20 00:31:56,873 [ scc.merge] INFO
2025-07-20 00:31:56,873 [ scc.merge] INFO Merged PRs:
2025-07-20 00:31:56,873 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-07-20 00:31:56,873 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-07-20 00:31:56,873 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-07-20 00:31:56,873 [ scc.merge] INFO
2025-07-20 00:31:56,873 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-07-20 00:31:56,873 [ scc.merge] INFO Already up to date.
2025-07-20 00:31:56,873 [ scc.merge] INFO
2025-07-20 00:31:56,873 [ scc.merge] INFO
2025-07-20 00:31:56,873 [ scc.merge] INFO Repository: ome/omero-rois
2025-07-20 00:31:56,873 [ scc.merge] INFO Excluded PRs:
2025-07-20 00:31:56,873 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-07-20 00:31:56,873 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-07-20 00:31:56,873 [ scc.merge] INFO Already up to date.
2025-07-20 00:31:56,873 [ scc.merge] INFO
2025-07-20 00:31:56,873 [ scc.merge] INFO
2025-07-20 00:31:56,873 [ scc.merge] INFO Repository: ome/omero-signup
2025-07-20 00:31:56,873 [ scc.merge] INFO Already up to date.
2025-07-20 00:31:56,873 [ scc.merge] INFO
2025-07-20 00:31:56,873 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-20 00:31:56,873 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-07-20 00:31:56,873 [ scc.merge] INFO
2025-07-20 00:31:56,873 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-07-20 00:31:56,873 [ scc.merge] INFO Excluded PRs:
2025-07-20 00:31:56,873 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-07-20 00:31:56,873 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-07-20 00:31:56,873 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-07-20 00:31:56,873 [ scc.merge] INFO Already up to date.
2025-07-20 00:31:56,873 [ scc.merge] INFO
2025-07-20 00:31:56,873 [ scc.merge] INFO Merged PRs:
2025-07-20 00:31:56,873 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-07-20 00:31:56,874 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-07-20 00:31:56,874 [ scc.merge] INFO
2025-07-20 00:31:56,874 [ scc.merge] INFO Repository: ome/omero-upload
2025-07-20 00:31:56,874 [ scc.merge] INFO Already up to date.
2025-07-20 00:31:56,874 [ scc.merge] INFO
2025-07-20 00:31:56,874 [ scc.merge] INFO
2025-07-20 00:31:56,874 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-07-20 00:31:56,874 [ scc.merge] INFO Updating deab817..160d894
2025-07-20 00:31:56,874 [ scc.merge] INFO Previously merged:
2025-07-20 00:31:56,874 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-07-20 00:31:56,874 [ scc.merge] INFO
2025-07-20 00:31:56,874 [ scc.merge] INFO
2025-07-20 00:31:56,874 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-07-20 00:31:56,874 [ scc.merge] INFO Excluded PRs:
2025-07-20 00:31:56,874 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-07-20 00:31:56,874 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-07-20 00:31:56,874 [ scc.merge] INFO Already up to date.
2025-07-20 00:31:56,874 [ scc.merge] INFO
2025-07-20 00:31:56,874 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-20 00:31:56,874 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-07-20 00:31:56,874 [ scc.merge] INFO
2025-07-20 00:31:56,874 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-07-20 00:31:56,874 [ scc.merge] INFO Already up to date.
2025-07-20 00:31:56,874 [ scc.merge] INFO
2025-07-20 00:31:56,874 [ scc.merge] INFO
2025-07-20 00:31:56,874 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-07-20 00:31:56,874 [ scc.merge] INFO Already up to date.
2025-07-20 00:31:56,874 [ scc.merge] INFO
2025-07-20 00:31:56,874 [ scc.merge] INFO
2025-07-20 00:31:56,874 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-07-20 00:31:56,874 [ scc.merge] INFO Already up to date.
2025-07-20 00:31:56,874 [ scc.merge] INFO
2025-07-20 00:31:56,874 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-20 00:31:56,874 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-07-20 00:31:56,874 [ scc.merge] INFO
2025-07-20 00:31:56,874 [ scc.merge] INFO Repository: ome/scripts
2025-07-20 00:31:56,874 [ scc.merge] INFO Excluded PRs:
2025-07-20 00:31:56,874 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-07-20 00:31:56,875 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-07-20 00:31:56,875 [ scc.merge] INFO Updating 4b4c755..573db34
2025-07-20 00:31:56,875 [ scc.merge] INFO Previously merged:
2025-07-20 00:31:56,875 [ scc.merge] INFO - PR 227 jburel 'Replace tostring by tobytes'
2025-07-20 00:31:56,875 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-07-20 00:31:56,875 [ scc.merge] INFO
2025-07-20 00:31:56,875 [ scc.merge] INFO Merged PRs:
2025-07-20 00:31:56,875 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-07-20 00:31:56,875 [ scc.merge] INFO
2025-07-20 00:31:56,875 [ scc.merge] INFO Conflicting PRs (not included):
2025-07-20 00:31:56,875 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-07-20 00:31:56,875 [ scc.merge] INFO
2025-07-20 00:31:56,875 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-07-20 00:31:56,875 [ scc.git] DEBUG Calling 'git remote'
2025-07-20 00:31:56,877 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-07-20 00:31:56,877 [ scc.git] DEBUG Calling 'git remote'
2025-07-20 00:31:56,879 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:56,879 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-07-20 00:31:56,879 [ scc.git] DEBUG Calling 'git remote'
2025-07-20 00:31:56,881 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:56,881 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-07-20 00:31:56,881 [ scc.git] DEBUG Calling 'git remote'
2025-07-20 00:31:56,883 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:56,883 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-07-20 00:31:56,884 [ scc.git] DEBUG Calling 'git remote'
2025-07-20 00:31:56,886 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:56,886 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-07-20 00:31:56,886 [ scc.git] DEBUG Calling 'git remote'
2025-07-20 00:31:56,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:56,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-07-20 00:31:56,888 [ scc.git] DEBUG Calling 'git remote'
2025-07-20 00:31:56,890 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:56,890 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-07-20 00:31:56,890 [ scc.git] DEBUG Calling 'git remote'
2025-07-20 00:31:56,892 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:56,892 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-07-20 00:31:56,892 [ scc.git] DEBUG Calling 'git remote'
2025-07-20 00:31:56,895 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:56,895 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-07-20 00:31:56,895 [ scc.git] DEBUG Calling 'git remote'
2025-07-20 00:31:56,897 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:56,897 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-07-20 00:31:56,897 [ scc.git] DEBUG Calling 'git remote'
2025-07-20 00:31:56,899 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:56,899 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-07-20 00:31:56,899 [ scc.git] DEBUG Calling 'git remote'
2025-07-20 00:31:56,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:56,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-07-20 00:31:56,902 [ scc.git] DEBUG Calling 'git remote'
2025-07-20 00:31:56,904 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:56,904 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-07-20 00:31:56,904 [ scc.git] DEBUG Calling 'git remote'
2025-07-20 00:31:56,906 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:56,906 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-07-20 00:31:56,906 [ scc.git] DEBUG Calling 'git remote'
2025-07-20 00:31:56,908 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:56,908 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-07-20 00:31:56,908 [ scc.git] DEBUG Calling 'git remote'
2025-07-20 00:31:56,910 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:56,910 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-07-20 00:31:56,910 [ scc.git] DEBUG Calling 'git remote'
2025-07-20 00:31:56,913 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:56,913 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-07-20 00:31:56,913 [ scc.git] DEBUG Calling 'git remote'
2025-07-20 00:31:56,915 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:56,915 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-07-20 00:31:56,915 [ scc.git] DEBUG Calling 'git remote'
2025-07-20 00:31:56,917 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:56,917 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-07-20 00:31:56,917 [ scc.git] DEBUG Calling 'git remote'
2025-07-20 00:31:56,919 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:56,919 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-07-20 00:31:56,919 [ scc.git] DEBUG Calling 'git remote'
2025-07-20 00:31:56,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:56,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-07-20 00:31:56,922 [ scc.git] DEBUG Calling 'git remote'
2025-07-20 00:31:56,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-07-20 00:31:56,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-07-20 00:31:56,924 [ scc.git] DEBUG Calling 'git remote'
2025-07-20 00:31:56,926 [ 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 ff37283] 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 dd02a7c] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-07-20 00:32:44,933 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2025-07-20 00:32:54,670 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2025-07-20 00:32:57,454 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-07-20 00:33:02,396 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-07-20 00:33:42,766 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/eb00aee0/images/svgs/logo.svg){kind=logo}
