Skipping 223 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
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)
Already up to date.
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'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#421 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/)'
2025-05-15 00:41:31,239 [ scc.git] DEBUG [detached HEAD f6714f6] merge master -Dorg -Ssuccess-only
2025-05-15 00:41:31,240 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:41:31,240 [ scc.repo] DEBUG ## PRs found:
2025-05-15 00:41:31,390 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:31,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-05-15 00:41:31,897 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:32,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-05-15 00:41:32,373 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:32,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-15 00:41:32,918 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:33,152 [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-05-15 00:41:33,403 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:33,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-15 00:41:33,942 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:34,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-05-15 00:41:34,120 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-15 00:41:34,372 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:34,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-05-15 00:41:34,873 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:35,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-05-15 00:41:35,415 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:35,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-15 00:41:35,991 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:36,214 [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-05-15 00:41:36,466 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:36,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-15 00:41:36,991 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:37,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-05-15 00:41:37,172 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-05-15 00:41:37,172 [ scc.repo] DEBUG ## Branches found:
2025-05-15 00:41:37,173 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-15 00:41:37,173 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:41:37,173 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:41:37,176 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-15 00:41:37,178 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-15 00:41:37,178 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-15 00:41:37,181 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-15 00:41:37,185 [ scc.git] DEBUG Already up to date.
2025-05-15 00:41:37,185 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-05-15 00:41:37,491 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-15 00:41:37,491 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-05-15 00:41:37,497 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-05-15 00:41:37,779 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-15 00:41:37,779 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-05-15 00:41:37,785 [ scc.git] DEBUG ## Unique users: []
2025-05-15 00:41:37,785 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:41:37,785 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:41:37,787 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-15 00:41:37,792 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:41:37,794 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-15 00:41:37,804 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-15 00:41:37,808 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-05-15 00:41:37,808 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-05-15 00:41:37,808 [ scc.git] DEBUG requirements.txt | 2 +-
2025-05-15 00:41:37,808 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-05-15 00:41:37,808 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-05-15 00:41:37,808 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-05-15 00:41:37,810 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:37,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:41:37,981 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-05-15 00:41:37,986 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:41:37,988 [ 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-05-15 00:41:37,998 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-15 00:41:38,002 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-15 00:41:38,002 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-15 00:41:38,232 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:38,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:41:38,404 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-15 00:41:38,446 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:41:38,446 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:41:38,449 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-15 00:41:38,490 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-15 00:41:38,494 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8c94503350> has no local changes
2025-05-15 00:41:38,495 [ 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#421 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/)'
2025-05-15 00:41:38,501 [ scc.git] DEBUG [detached HEAD aefc904] merge master -Dorg -Ssuccess-only
2025-05-15 00:41:38,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:41:38,502 [ scc.repo] DEBUG ## PRs found:
2025-05-15 00:41:38,655 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:38,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-05-15 00:41:39,194 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:39,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-05-15 00:41:39,700 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:39,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-05-15 00:41:40,243 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:40,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-15 00:41:40,800 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:41,023 [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-05-15 00:41:41,275 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:41,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-15 00:41:41,800 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:41,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-05-15 00:41:41,994 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-15 00:41:42,246 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:42,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-05-15 00:41:42,737 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:43,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-05-15 00:41:43,259 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:43,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-15 00:41:43,812 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:44,032 [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-05-15 00:41:44,284 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:44,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-15 00:41:44,749 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:44,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-05-15 00:41:44,925 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-15 00:41:44,925 [ scc.repo] DEBUG ## Branches found:
2025-05-15 00:41:44,925 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-15 00:41:44,925 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:41:44,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:41:44,928 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-15 00:41:44,930 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-15 00:41:44,931 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-15 00:41:44,934 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-15 00:41:44,943 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-05-15 00:41:45,176 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:45,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-05-15 00:41:45,600 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-05-15 00:41:45,932 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-15 00:41:45,932 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-05-15 00:41:45,937 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-05-15 00:41:46,382 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-15 00:41:46,382 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-05-15 00:41:46,387 [ scc.git] DEBUG ## Unique users: []
2025-05-15 00:41:46,387 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:41:46,387 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:41:46,390 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-15 00:41:46,395 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:41:46,398 [ 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-05-15 00:41:46,414 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-05-15 00:41:46,414 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-05-15 00:41:46,414 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-15 00:41:46,414 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-15 00:41:46,415 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-15 00:41:46,415 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-15 00:41:46,418 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-15 00:41:46,424 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-15 00:41:46,426 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:46,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:41:46,601 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-15 00:41:46,607 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-15 00:41:46,611 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#421](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-05-15 00:41:46,613 [ scc.config] DEBUG Found github.token
2025-05-15 00:41:46,613 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-05-15 00:41:46,613 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-15 00:41:46,618 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:41:46,620 [ 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-05-15 00:41:46,637 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-15 00:41:46,637 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-15 00:41:46,637 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-05-15 00:41:46,638 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-15 00:41:46,638 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-15 00:41:46,642 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-15 00:41:46,647 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-15 00:41:46,852 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:47,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:41:47,008 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-15 00:41:47,014 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-15 00:41:47,017 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#421](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/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-05-15 00:41:47,019 [ scc.config] DEBUG Found github.token
2025-05-15 00:41:47,019 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-05-15 00:41:47,020 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-15 00:41:47,062 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:41:47,062 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:41:47,065 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-15 00:41:47,107 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-15 00:41:47,112 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8c9332c750> has no local changes
2025-05-15 00:41:47,112 [ 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#421 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/)'
2025-05-15 00:41:47,118 [ scc.git] DEBUG [detached HEAD ae9aceb] merge master -Dorg -Ssuccess-only
2025-05-15 00:41:47,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:41:47,119 [ scc.repo] DEBUG ## PRs found:
2025-05-15 00:41:47,259 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:47,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-05-15 00:41:47,871 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:48,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-05-15 00:41:48,368 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:48,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-15 00:41:48,925 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:49,209 [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-05-15 00:41:49,461 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:49,702 [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-05-15 00:41:49,954 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:50,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-15 00:41:50,472 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:50,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-05-15 00:41:50,651 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-15 00:41:50,902 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:51,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-05-15 00:41:51,145 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-15 00:41:51,396 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:51,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-15 00:41:51,940 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:52,247 [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-05-15 00:41:52,499 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:52,761 [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-05-15 00:41:53,013 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:53,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-15 00:41:53,546 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:53,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-05-15 00:41:53,735 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-15 00:41:53,986 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:54,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-05-15 00:41:54,236 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-15 00:41:54,487 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:54,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-15 00:41:55,071 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:55,311 [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-05-15 00:41:55,563 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:55,853 [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-05-15 00:41:56,105 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:56,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-15 00:41:56,602 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:56,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-05-15 00:41:56,801 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-15 00:41:57,053 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:57,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-05-15 00:41:57,641 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:57,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-05-15 00:41:58,150 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:58,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-05-15 00:41:58,642 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:58,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-05-15 00:41:59,114 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:59,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-05-15 00:41:59,615 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:41:59,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-05-15 00:42:00,143 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:00,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-05-15 00:42:00,420 [ scc.repo] DEBUG ## Branches found:
2025-05-15 00:42:00,420 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-15 00:42:00,420 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:00,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:00,424 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-15 00:42:00,427 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-15 00:42:00,427 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-15 00:42:00,431 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-15 00:42:00,435 [ scc.git] DEBUG Already up to date.
2025-05-15 00:42:00,435 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-05-15 00:42:00,743 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-15 00:42:00,743 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-05-15 00:42:00,748 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-05-15 00:42:01,071 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-15 00:42:01,071 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-05-15 00:42:01,076 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-05-15 00:42:01,360 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-15 00:42:01,360 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-05-15 00:42:01,366 [ scc.git] DEBUG ## Unique users: []
2025-05-15 00:42:01,366 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:01,366 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:01,368 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-05-15 00:42:01,372 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:01,375 [ 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-05-15 00:42:01,384 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-15 00:42:01,387 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-05-15 00:42:01,387 [ scc.git] DEBUG package.json | 2 +-
2025-05-15 00:42:01,387 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-05-15 00:42:01,389 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:01,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:01,549 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-05-15 00:42:01,553 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:01,556 [ 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-05-15 00:42:01,568 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-15 00:42:01,568 [ scc.git] DEBUG Auto-merging package.json
2025-05-15 00:42:01,569 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-15 00:42:01,574 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-05-15 00:42:01,574 [ scc.git] DEBUG package.json | 2 +-
2025-05-15 00:42:01,574 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-05-15 00:42:01,801 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:01,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:01,959 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-05-15 00:42:01,963 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:01,966 [ 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-05-15 00:42:01,976 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-15 00:42:01,980 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-15 00:42:01,980 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-15 00:42:02,210 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:02,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:02,375 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-15 00:42:02,420 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:02,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:02,422 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-15 00:42:02,465 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-15 00:42:02,470 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8c94463ed0> has no local changes
2025-05-15 00:42:02,470 [ 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#421 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/)'
2025-05-15 00:42:02,477 [ scc.git] DEBUG [detached HEAD f01aa38] merge master -Dorg -Ssuccess-only
2025-05-15 00:42:02,478 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:02,478 [ scc.repo] DEBUG ## PRs found:
2025-05-15 00:42:02,626 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:02,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-05-15 00:42:02,807 [ scc.repo] DEBUG ## Branches found:
2025-05-15 00:42:02,807 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-15 00:42:02,807 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:02,807 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:02,810 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-15 00:42:02,812 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-15 00:42:02,812 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-15 00:42:02,816 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-15 00:42:02,819 [ scc.git] DEBUG Already up to date.
2025-05-15 00:42:02,819 [ scc.git] DEBUG ## Unique users: []
2025-05-15 00:42:02,819 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:02,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:02,821 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-15 00:42:02,864 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:02,864 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:02,867 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-15 00:42:02,909 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-15 00:42:02,913 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8c94531b90> has no local changes
2025-05-15 00:42:02,913 [ 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#421 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/)'
2025-05-15 00:42:02,920 [ scc.git] DEBUG [detached HEAD 588cff7] merge master -Dorg -Ssuccess-only
2025-05-15 00:42:02,921 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:02,921 [ scc.repo] DEBUG ## PRs found:
2025-05-15 00:42:03,058 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:03,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-05-15 00:42:03,613 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:03,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-05-15 00:42:04,162 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:04,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-05-15 00:42:04,641 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:04,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-05-15 00:42:04,933 [ scc.repo] DEBUG ## Branches found:
2025-05-15 00:42:04,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-15 00:42:04,933 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:04,933 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:04,936 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-15 00:42:04,939 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-15 00:42:04,939 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-15 00:42:04,942 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-15 00:42:04,945 [ scc.git] DEBUG Already up to date.
2025-05-15 00:42:04,946 [ scc.git] DEBUG ## Unique users: []
2025-05-15 00:42:04,946 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:04,946 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:04,948 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-15 00:42:04,992 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:04,992 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:04,994 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-15 00:42:05,038 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-15 00:42:05,042 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8c946e3650> has no local changes
2025-05-15 00:42:05,042 [ 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#421 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/)'
2025-05-15 00:42:05,048 [ scc.git] DEBUG [detached HEAD a02bb82] merge master -Dorg -Ssuccess-only
2025-05-15 00:42:05,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:05,049 [ scc.repo] DEBUG ## PRs found:
2025-05-15 00:42:05,184 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:05,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-05-15 00:42:05,758 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:05,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-05-15 00:42:06,224 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:06,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-05-15 00:42:06,693 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:07,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-15 00:42:07,311 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:07,519 [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-05-15 00:42:07,771 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:08,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-15 00:42:08,258 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:08,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-05-15 00:42:08,431 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-15 00:42:08,431 [ scc.repo] DEBUG ## Branches found:
2025-05-15 00:42:08,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-15 00:42:08,431 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:08,431 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:08,434 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-15 00:42:08,437 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-15 00:42:08,437 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-15 00:42:08,441 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-15 00:42:08,445 [ scc.git] DEBUG Already up to date.
2025-05-15 00:42:08,445 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-05-15 00:42:08,741 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-05-15 00:42:08,741 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-05-15 00:42:08,746 [ scc.git] DEBUG ## Unique users: []
2025-05-15 00:42:08,746 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:08,746 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:08,750 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-15 00:42:08,753 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:08,756 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-15 00:42:08,766 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-05-15 00:42:08,766 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-05-15 00:42:08,766 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-05-15 00:42:08,766 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-05-15 00:42:08,766 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-05-15 00:42:08,766 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-05-15 00:42:08,766 [ scc.git] DEBUG Auto-merging setup.py
2025-05-15 00:42:08,766 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-05-15 00:42:08,766 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-15 00:42:08,766 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-15 00:42:08,769 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-15 00:42:08,774 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-05-15 00:42:08,775 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:08,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:08,943 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-15 00:42:08,947 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-15 00:42:08,950 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#421](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/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-05-15 00:42:08,952 [ scc.config] DEBUG Found github.token
2025-05-15 00:42:08,953 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-05-15 00:42:08,953 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-15 00:42:08,993 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:08,994 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:08,996 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-15 00:42:09,037 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-15 00:42:09,041 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8c9335d010> has no local changes
2025-05-15 00:42:09,041 [ 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#421 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/)'
2025-05-15 00:42:09,048 [ scc.git] DEBUG [detached HEAD 77c6687] merge master -Dorg -Ssuccess-only
2025-05-15 00:42:09,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:09,048 [ scc.repo] DEBUG ## PRs found:
2025-05-15 00:42:09,194 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:09,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-05-15 00:42:09,795 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:10,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-05-15 00:42:10,266 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:10,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-15 00:42:10,842 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:11,119 [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-05-15 00:42:11,371 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:11,614 [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-05-15 00:42:11,866 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:12,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-15 00:42:12,450 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:12,631 [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-05-15 00:42:12,632 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-05-15 00:42:12,883 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:13,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-05-15 00:42:13,368 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:13,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-05-15 00:42:13,860 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:14,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-05-15 00:42:14,396 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:14,660 [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-05-15 00:42:14,912 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:15,165 [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-05-15 00:42:15,419 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:15,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-05-15 00:42:15,939 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:16,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-05-15 00:42:16,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:16,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-05-15 00:42:16,919 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:17,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-05-15 00:42:17,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:17,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-15 00:42:18,000 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:18,234 [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-05-15 00:42:18,486 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:18,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-15 00:42:19,017 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:19,241 [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-05-15 00:42:19,242 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-15 00:42:19,242 [ scc.repo] DEBUG ## Branches found:
2025-05-15 00:42:19,242 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-15 00:42:19,242 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:19,242 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:19,245 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-15 00:42:19,248 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-15 00:42:19,248 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-15 00:42:19,251 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-15 00:42:19,254 [ scc.git] DEBUG Already up to date.
2025-05-15 00:42:19,254 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-05-15 00:42:19,575 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-15 00:42:19,575 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-05-15 00:42:19,582 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-05-15 00:42:19,874 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-15 00:42:19,874 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-05-15 00:42:19,879 [ scc.git] DEBUG ## Unique users: []
2025-05-15 00:42:19,879 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:19,879 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:19,882 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-05-15 00:42:19,886 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:19,889 [ 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-05-15 00:42:19,901 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-15 00:42:19,906 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-05-15 00:42:19,906 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-05-15 00:42:19,906 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-05-15 00:42:19,906 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-05-15 00:42:19,906 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-05-15 00:42:19,906 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-05-15 00:42:19,906 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-05-15 00:42:19,906 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-05-15 00:42:19,906 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-05-15 00:42:19,906 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-05-15 00:42:19,906 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-05-15 00:42:19,907 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:19,907 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-05-15 00:42:19,907 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-05-15 00:42:19,907 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-05-15 00:42:19,907 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-05-15 00:42:19,907 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-05-15 00:42:19,907 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-05-15 00:42:19,907 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-05-15 00:42:19,908 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-05-15 00:42:19,908 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-05-15 00:42:19,908 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-05-15 00:42:19,908 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-05-15 00:42:19,908 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-05-15 00:42:19,908 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-05-15 00:42:19,908 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-05-15 00:42:19,908 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-05-15 00:42:19,908 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-05-15 00:42:19,908 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-05-15 00:42:19,908 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-05-15 00:42:19,908 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-05-15 00:42:19,908 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-05-15 00:42:19,908 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-05-15 00:42:19,908 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-05-15 00:42:19,908 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-05-15 00:42:19,908 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-05-15 00:42:19,908 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-05-15 00:42:19,908 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-05-15 00:42:19,908 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-05-15 00:42:19,908 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-05-15 00:42:19,908 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-05-15 00:42:19,908 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-05-15 00:42:19,908 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-05-15 00:42:19,908 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-05-15 00:42:19,908 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-05-15 00:42:19,908 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-05-15 00:42:20,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:20,075 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-15 00:42:20,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:20,082 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-15 00:42:20,092 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-15 00:42:20,095 [ scc.git] DEBUG docker | 1 +
2025-05-15 00:42:20,095 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-05-15 00:42:20,326 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:20,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:20,486 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-15 00:42:20,532 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:20,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:20,535 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-15 00:42:20,577 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-15 00:42:20,582 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8c93399110> has no local changes
2025-05-15 00:42:20,582 [ 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#421 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/)'
2025-05-15 00:42:20,588 [ scc.git] DEBUG [detached HEAD 412efb0] merge master -Dorg -Ssuccess-only
2025-05-15 00:42:20,589 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:20,589 [ scc.repo] DEBUG ## PRs found:
2025-05-15 00:42:20,737 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:20,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-05-15 00:42:20,933 [ scc.repo] DEBUG ## Branches found:
2025-05-15 00:42:20,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-15 00:42:20,933 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:20,933 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:20,936 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-15 00:42:20,939 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-15 00:42:20,939 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-15 00:42:20,942 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-15 00:42:20,945 [ scc.git] DEBUG Already up to date.
2025-05-15 00:42:20,945 [ scc.git] DEBUG ## Unique users: []
2025-05-15 00:42:20,945 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:20,945 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:20,947 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-15 00:42:20,992 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:20,992 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:20,994 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-15 00:42:21,039 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-15 00:42:21,044 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8c933b0810> has no local changes
2025-05-15 00:42:21,044 [ 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#421 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/)'
2025-05-15 00:42:21,051 [ scc.git] DEBUG [detached HEAD 5b8b5de] merge master -Dorg -Ssuccess-only
2025-05-15 00:42:21,052 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:21,052 [ scc.repo] DEBUG ## PRs found:
2025-05-15 00:42:21,184 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:21,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-05-15 00:42:21,708 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:21,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-05-15 00:42:22,214 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:22,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-05-15 00:42:22,697 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:22,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-15 00:42:23,239 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:23,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-15 00:42:23,719 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:23,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-15 00:42:24,211 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:24,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-15 00:42:24,738 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:24,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-05-15 00:42:24,925 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-05-15 00:42:24,925 [ scc.repo] DEBUG ## Branches found:
2025-05-15 00:42:24,925 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-15 00:42:24,926 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:24,926 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:24,929 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-15 00:42:24,931 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-15 00:42:24,931 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-15 00:42:24,934 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-15 00:42:24,937 [ scc.git] DEBUG Already up to date.
2025-05-15 00:42:24,937 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-05-15 00:42:25,231 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-05-15 00:42:25,231 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-05-15 00:42:25,235 [ scc.git] DEBUG ## Unique users: []
2025-05-15 00:42:25,236 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:25,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:25,238 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-05-15 00:42:25,241 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:25,243 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-05-15 00:42:25,251 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-15 00:42:25,254 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-05-15 00:42:25,254 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-05-15 00:42:25,254 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-05-15 00:42:25,254 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-05-15 00:42:25,254 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-05-15 00:42:25,255 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:25,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:25,434 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-15 00:42:25,482 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:25,482 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:25,485 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-15 00:42:25,531 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-15 00:42:25,535 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8c93355490> has no local changes
2025-05-15 00:42:25,535 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Generated by OMERO-plugins-push#421 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/)'
2025-05-15 00:42:25,543 [ scc.git] DEBUG [detached HEAD af26172] merge master -Dorg -Ssuccess-only
2025-05-15 00:42:25,543 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:25,543 [ scc.git] INFO Overriding base-branch from master to main
2025-05-15 00:42:25,543 [ scc.repo] DEBUG ## PRs found:
2025-05-15 00:42:25,686 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:25,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-05-15 00:42:26,203 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:26,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-05-15 00:42:26,684 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:26,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-05-15 00:42:27,206 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:27,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-05-15 00:42:27,789 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:28,052 [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-05-15 00:42:28,305 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:28,553 [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-05-15 00:42:28,805 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:29,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-05-15 00:42:29,313 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:29,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-05-15 00:42:29,793 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:30,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-05-15 00:42:30,286 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:30,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-15 00:42:30,818 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:31,028 [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-05-15 00:42:31,280 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:31,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-15 00:42:31,732 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:31,917 [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-05-15 00:42:31,919 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-15 00:42:31,919 [ scc.repo] DEBUG ## Branches found:
2025-05-15 00:42:31,919 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-15 00:42:31,919 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:31,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:31,922 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-05-15 00:42:31,925 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-15 00:42:31,925 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-05-15 00:42:31,928 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-05-15 00:42:31,931 [ scc.git] DEBUG Already up to date.
2025-05-15 00:42:31,931 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-05-15 00:42:32,256 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-05-15 00:42:32,256 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-05-15 00:42:32,261 [ scc.git] DEBUG ## Unique users: []
2025-05-15 00:42:32,261 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:32,261 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:32,263 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-15 00:42:32,267 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:32,269 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-15 00:42:32,277 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-05-15 00:42:32,277 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-05-15 00:42:32,277 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-15 00:42:32,277 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-15 00:42:32,280 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-15 00:42:32,284 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-05-15 00:42:32,286 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:32,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:32,457 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-15 00:42:32,461 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-15 00:42:32,464 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#421](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-05-15 00:42:32,466 [ scc.config] DEBUG Found github.token
2025-05-15 00:42:32,466 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-05-15 00:42:32,466 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-15 00:42:32,508 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:32,508 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:32,511 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-15 00:42:32,551 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-15 00:42:32,556 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8c93346410> has no local changes
2025-05-15 00:42:32,556 [ 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#421 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/)'
2025-05-15 00:42:32,563 [ scc.git] DEBUG [detached HEAD badd830] merge master -Dorg -Ssuccess-only
2025-05-15 00:42:32,564 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:32,564 [ scc.repo] DEBUG ## PRs found:
2025-05-15 00:42:32,708 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:32,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-05-15 00:42:32,892 [ scc.repo] DEBUG ## Branches found:
2025-05-15 00:42:32,892 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-15 00:42:32,892 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:32,892 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:32,895 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-15 00:42:32,897 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-15 00:42:32,897 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-15 00:42:32,900 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-15 00:42:32,904 [ scc.git] DEBUG Already up to date.
2025-05-15 00:42:32,904 [ scc.git] DEBUG ## Unique users: []
2025-05-15 00:42:32,904 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:32,904 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:32,906 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-15 00:42:32,949 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:32,949 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:32,952 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-15 00:42:32,994 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-15 00:42:32,998 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8c9454f6d0> has no local changes
2025-05-15 00:42:32,998 [ 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#421 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/)'
2025-05-15 00:42:33,005 [ scc.git] DEBUG [detached HEAD 9556c57] merge master -Dorg -Ssuccess-only
2025-05-15 00:42:33,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:33,005 [ scc.repo] DEBUG ## PRs found:
2025-05-15 00:42:33,143 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:33,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-05-15 00:42:33,365 [ scc.repo] DEBUG ## Branches found:
2025-05-15 00:42:33,365 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-15 00:42:33,365 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:33,365 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:33,368 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-15 00:42:33,370 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-15 00:42:33,370 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-15 00:42:33,373 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-15 00:42:33,377 [ scc.git] DEBUG Already up to date.
2025-05-15 00:42:33,377 [ scc.git] DEBUG ## Unique users: []
2025-05-15 00:42:33,377 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:33,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:33,379 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-15 00:42:33,421 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:33,421 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:33,424 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-15 00:42:33,464 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-15 00:42:33,468 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8c9334fe90> has no local changes
2025-05-15 00:42:33,468 [ 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#421 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/)'
2025-05-15 00:42:33,475 [ scc.git] DEBUG [detached HEAD 2ea635a] merge master -Dorg -Ssuccess-only
2025-05-15 00:42:33,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:33,476 [ scc.repo] DEBUG ## PRs found:
2025-05-15 00:42:33,616 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:33,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-05-15 00:42:34,196 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:34,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-05-15 00:42:34,722 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:34,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-05-15 00:42:35,174 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:35,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-15 00:42:35,704 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:35,936 [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-05-15 00:42:36,187 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:36,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-15 00:42:36,670 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:36,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-05-15 00:42:36,852 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-05-15 00:42:36,852 [ scc.repo] DEBUG ## Branches found:
2025-05-15 00:42:36,852 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-15 00:42:36,852 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:36,852 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:36,855 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-15 00:42:36,857 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-15 00:42:36,857 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-15 00:42:36,860 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-15 00:42:36,863 [ scc.git] DEBUG Already up to date.
2025-05-15 00:42:36,863 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-05-15 00:42:37,170 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-05-15 00:42:37,170 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-05-15 00:42:37,175 [ scc.git] DEBUG ## Unique users: []
2025-05-15 00:42:37,175 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:37,175 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:37,178 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-15 00:42:37,182 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:37,184 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-15 00:42:37,194 [ scc.git] DEBUG Auto-merging Dockerfile
2025-05-15 00:42:37,194 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-05-15 00:42:37,194 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-15 00:42:37,194 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-15 00:42:37,198 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-15 00:42:37,203 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-05-15 00:42:37,205 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:37,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:37,384 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-15 00:42:37,387 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-15 00:42:37,391 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#421](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-05-15 00:42:37,393 [ scc.config] DEBUG Found github.token
2025-05-15 00:42:37,393 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-05-15 00:42:37,393 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-15 00:42:37,443 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:37,443 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:37,445 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-15 00:42:37,489 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-15 00:42:37,494 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8c93318910> has no local changes
2025-05-15 00:42:37,494 [ 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#421 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/)'
2025-05-15 00:42:37,501 [ scc.git] DEBUG [detached HEAD b3112a6] merge master -Dorg -Ssuccess-only
2025-05-15 00:42:37,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:37,502 [ scc.git] INFO Overriding base-branch from master to develop
2025-05-15 00:42:37,502 [ scc.repo] DEBUG ## PRs found:
2025-05-15 00:42:37,635 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:37,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-05-15 00:42:38,214 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:38,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-05-15 00:42:38,701 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:38,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-05-15 00:42:39,191 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:39,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-15 00:42:39,671 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:39,897 [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-05-15 00:42:40,149 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:40,394 [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-05-15 00:42:40,647 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:40,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-15 00:42:41,101 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:41,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-05-15 00:42:41,301 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-15 00:42:41,552 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:41,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-05-15 00:42:42,076 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:42,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-05-15 00:42:42,572 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:42,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-15 00:42:43,044 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:43,235 [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-05-15 00:42:43,486 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:43,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-15 00:42:44,007 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:44,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-05-15 00:42:44,184 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-15 00:42:44,435 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:44,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-05-15 00:42:44,927 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:45,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-05-15 00:42:45,526 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:45,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-05-15 00:42:46,010 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:46,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-05-15 00:42:46,287 [ scc.repo] DEBUG ## Branches found:
2025-05-15 00:42:46,287 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-15 00:42:46,287 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:46,287 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:46,291 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-05-15 00:42:46,293 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-15 00:42:46,293 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-05-15 00:42:46,297 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-05-15 00:42:46,307 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-05-15 00:42:46,537 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:46,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-05-15 00:42:46,969 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-05-15 00:42:47,277 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-15 00:42:47,277 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-05-15 00:42:47,282 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-05-15 00:42:47,567 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-15 00:42:47,567 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-05-15 00:42:47,573 [ scc.git] DEBUG ## Unique users: []
2025-05-15 00:42:47,573 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:47,573 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:47,575 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-15 00:42:47,582 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:47,584 [ 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-05-15 00:42:47,595 [ 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-05-15 00:42:47,596 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-15 00:42:47,596 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-15 00:42:47,599 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-15 00:42:47,604 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-05-15 00:42:47,606 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:47,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:47,782 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-15 00:42:47,788 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-15 00:42:47,792 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#421](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-05-15 00:42:47,795 [ scc.config] DEBUG Found github.token
2025-05-15 00:42:47,795 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-05-15 00:42:47,795 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-05-15 00:42:47,800 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:47,802 [ 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-05-15 00:42:47,813 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-15 00:42:47,816 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-05-15 00:42:47,817 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-05-15 00:42:48,033 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:48,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:48,193 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-15 00:42:48,236 [ scc.git] DEBUG Get sha1 of %s
2025-05-15 00:42:48,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-15 00:42:48,239 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-15 00:42:48,282 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-15 00:42:48,286 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8c94533b10> has no local changes
2025-05-15 00:42:48,286 [ 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..950b28b
Previously merged:
- 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#421 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/)'
2025-05-15 00:42:48,294 [ scc.git] DEBUG [detached HEAD 277580d] merge master -Dorg -Ssuccess-only
2025-05-15 00:42:48,294 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:48,294 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-15 00:42:48,381 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-05-15 00:42:48,444 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:48,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:48,613 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-05-15 00:42:48,615 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-05-15 00:42:48,858 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:49,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:49,025 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-05-15 00:42:49,027 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-05-15 00:42:49,271 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:49,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:49,439 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-05-15 00:42:49,441 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-05-15 00:42:49,683 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:49,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:49,859 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-05-15 00:42:50,103 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:50,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:50,291 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-05-15 00:42:50,293 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-05-15 00:42:50,537 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:50,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:50,753 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-05-15 00:42:50,755 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-05-15 00:42:50,999 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:51,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:51,173 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-05-15 00:42:51,175 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-05-15 00:42:51,418 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:51,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:51,587 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-05-15 00:42:51,589 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-05-15 00:42:51,833 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:51,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:51,997 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-05-15 00:42:51,999 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-05-15 00:42:52,243 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:52,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:52,422 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-05-15 00:42:52,424 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-05-15 00:42:52,668 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:52,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:52,901 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-05-15 00:42:52,903 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-05-15 00:42:53,147 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:53,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:53,309 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-05-15 00:42:53,311 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-05-15 00:42:53,555 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:53,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:53,722 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-05-15 00:42:53,966 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:54,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:54,132 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-05-15 00:42:54,376 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:54,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:54,550 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-05-15 00:42:54,552 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-05-15 00:42:54,796 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:54,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:55,002 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-05-15 00:42:55,246 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:55,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:55,414 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-05-15 00:42:55,659 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:55,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:55,838 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-05-15 00:42:55,840 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-05-15 00:42:56,084 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:56,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:56,254 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-05-15 00:42:56,256 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-05-15 00:42:56,499 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:56,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:56,685 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-05-15 00:42:56,687 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-05-15 00:42:56,931 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:57,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:57,100 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-05-15 00:42:57,103 [ scc.config] DEBUG Found submodule.scripts.url
2025-05-15 00:42:57,346 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-15 00:42:57,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-15 00:42:57,520 [ scc.config] DEBUG Found submodule.scripts.branch
2025-05-15 00:42:57,520 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-15 00:42:57,616 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8c94954910> has local changes
2025-05-15 00:42:57,616 [ 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 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (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..5b2ca82
Previously merged:
- 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 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 167 dominikl 'Add extinfo command'
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)
Already up to date.
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'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
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
Already up to date.
Merged PRs:
- 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..950b28b
Previously merged:
- 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#421 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/421/)'
2025-05-15 00:42:57,632 [ scc.git] DEBUG [detached HEAD 4148fa4] merge master -Dorg -Ssuccess-only
2025-05-15 00:42:57,632 [ scc.merge] INFO Repository: ome/omero-plugins
2025-05-15 00:42:57,632 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-05-15 00:42:57,632 [ scc.merge] INFO Already up to date.
2025-05-15 00:42:57,633 [ scc.merge] INFO
2025-05-15 00:42:57,633 [ scc.merge] INFO Merged PRs:
2025-05-15 00:42:57,633 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-05-15 00:42:57,633 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-05-15 00:42:57,633 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-05-15 00:42:57,633 [ scc.merge] INFO
2025-05-15 00:42:57,633 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-05-15 00:42:57,633 [ scc.merge] INFO Already up to date.
2025-05-15 00:42:57,633 [ scc.merge] INFO
2025-05-15 00:42:57,633 [ scc.merge] INFO
2025-05-15 00:42:57,633 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-05-15 00:42:57,633 [ scc.merge] INFO Excluded PRs:
2025-05-15 00:42:57,633 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-05-15 00:42:57,633 [ scc.merge] INFO Already up to date.
2025-05-15 00:42:57,633 [ scc.merge] INFO
2025-05-15 00:42:57,633 [ scc.merge] INFO
2025-05-15 00:42:57,633 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-05-15 00:42:57,633 [ scc.merge] INFO Excluded PRs:
2025-05-15 00:42:57,633 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-05-15 00:42:57,633 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-05-15 00:42:57,633 [ scc.merge] INFO Already up to date.
2025-05-15 00:42:57,633 [ scc.merge] INFO
2025-05-15 00:42:57,633 [ scc.merge] INFO Merged PRs:
2025-05-15 00:42:57,633 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-05-15 00:42:57,633 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-05-15 00:42:57,633 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-05-15 00:42:57,633 [ scc.merge] INFO
2025-05-15 00:42:57,633 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-05-15 00:42:57,633 [ scc.merge] INFO Excluded PRs:
2025-05-15 00:42:57,633 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-05-15 00:42:57,633 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-05-15 00:42:57,633 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-05-15 00:42:57,633 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-15 00:42:57,633 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-05-15 00:42:57,633 [ scc.merge] INFO Updating 11d3587..5b2ca82
2025-05-15 00:42:57,633 [ scc.merge] INFO Previously merged:
2025-05-15 00:42:57,634 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-05-15 00:42:57,634 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-15 00:42:57,634 [ scc.merge] INFO
2025-05-15 00:42:57,634 [ scc.merge] INFO Merged PRs:
2025-05-15 00:42:57,634 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-05-15 00:42:57,634 [ scc.merge] INFO
2025-05-15 00:42:57,634 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-15 00:42:57,634 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-05-15 00:42:57,634 [ scc.merge] INFO
2025-05-15 00:42:57,634 [ scc.merge] INFO Repository: ome/omero-figure
2025-05-15 00:42:57,634 [ scc.merge] INFO Excluded PRs:
2025-05-15 00:42:57,634 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-05-15 00:42:57,634 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-05-15 00:42:57,634 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-05-15 00:42:57,634 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-05-15 00:42:57,634 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-05-15 00:42:57,634 [ scc.merge] INFO Previously merged:
2025-05-15 00:42:57,634 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-05-15 00:42:57,634 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-05-15 00:42:57,634 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-05-15 00:42:57,634 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-15 00:42:57,634 [ scc.merge] INFO
2025-05-15 00:42:57,634 [ scc.merge] INFO Merged PRs:
2025-05-15 00:42:57,634 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-05-15 00:42:57,634 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-05-15 00:42:57,634 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-05-15 00:42:57,634 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-05-15 00:42:57,634 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-05-15 00:42:57,634 [ scc.merge] INFO
2025-05-15 00:42:57,634 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-15 00:42:57,634 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-05-15 00:42:57,634 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-05-15 00:42:57,634 [ scc.merge] INFO
2025-05-15 00:42:57,634 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-05-15 00:42:57,634 [ scc.merge] INFO Already up to date.
2025-05-15 00:42:57,634 [ scc.merge] INFO
2025-05-15 00:42:57,634 [ scc.merge] INFO Merged PRs:
2025-05-15 00:42:57,634 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-05-15 00:42:57,634 [ scc.merge] INFO
2025-05-15 00:42:57,634 [ scc.merge] INFO Repository: ome/omero-gallery
2025-05-15 00:42:57,635 [ scc.merge] INFO Already up to date.
2025-05-15 00:42:57,635 [ scc.merge] INFO
2025-05-15 00:42:57,635 [ scc.merge] INFO Merged PRs:
2025-05-15 00:42:57,635 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-05-15 00:42:57,635 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-05-15 00:42:57,635 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-05-15 00:42:57,635 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-05-15 00:42:57,635 [ scc.merge] INFO
2025-05-15 00:42:57,635 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-15 00:42:57,635 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-05-15 00:42:57,635 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-05-15 00:42:57,635 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-05-15 00:42:57,635 [ scc.merge] INFO
2025-05-15 00:42:57,635 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-05-15 00:42:57,635 [ scc.merge] INFO Excluded PRs:
2025-05-15 00:42:57,635 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-05-15 00:42:57,635 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-05-15 00:42:57,635 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-05-15 00:42:57,635 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-05-15 00:42:57,635 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-05-15 00:42:57,635 [ scc.merge] INFO Already up to date.
2025-05-15 00:42:57,635 [ scc.merge] INFO
2025-05-15 00:42:57,635 [ scc.merge] INFO Merged PRs:
2025-05-15 00:42:57,635 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-05-15 00:42:57,635 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-05-15 00:42:57,635 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-05-15 00:42:57,635 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-05-15 00:42:57,635 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-15 00:42:57,635 [ scc.merge] INFO
2025-05-15 00:42:57,635 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-15 00:42:57,635 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-05-15 00:42:57,635 [ scc.merge] INFO
2025-05-15 00:42:57,635 [ scc.merge] INFO Repository: ome/omero-mapr
2025-05-15 00:42:57,635 [ scc.merge] INFO Excluded PRs:
2025-05-15 00:42:57,635 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-05-15 00:42:57,635 [ scc.merge] INFO Already up to date.
2025-05-15 00:42:57,635 [ scc.merge] INFO
2025-05-15 00:42:57,635 [ scc.merge] INFO Merged PRs:
2025-05-15 00:42:57,635 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-05-15 00:42:57,635 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-15 00:42:57,635 [ scc.merge] INFO
2025-05-15 00:42:57,636 [ scc.merge] INFO Repository: ome/omero-metadata
2025-05-15 00:42:57,636 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-05-15 00:42:57,636 [ scc.merge] INFO Previously merged:
2025-05-15 00:42:57,636 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-15 00:42:57,636 [ scc.merge] INFO
2025-05-15 00:42:57,636 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-15 00:42:57,636 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-15 00:42:57,636 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-15 00:42:57,636 [ scc.merge] INFO
2025-05-15 00:42:57,636 [ scc.merge] INFO Repository: ome/omero-parade
2025-05-15 00:42:57,636 [ scc.merge] INFO Excluded PRs:
2025-05-15 00:42:57,636 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-05-15 00:42:57,636 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-05-15 00:42:57,636 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-05-15 00:42:57,636 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-05-15 00:42:57,636 [ scc.merge] INFO Already up to date.
2025-05-15 00:42:57,636 [ scc.merge] INFO
2025-05-15 00:42:57,636 [ scc.merge] INFO Merged PRs:
2025-05-15 00:42:57,636 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-15 00:42:57,636 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-15 00:42:57,636 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-15 00:42:57,636 [ scc.merge] INFO
2025-05-15 00:42:57,636 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-05-15 00:42:57,636 [ scc.merge] INFO Already up to date.
2025-05-15 00:42:57,636 [ scc.merge] INFO
2025-05-15 00:42:57,636 [ scc.merge] INFO
2025-05-15 00:42:57,636 [ scc.merge] INFO Repository: ome/omero-rois
2025-05-15 00:42:57,636 [ scc.merge] INFO Excluded PRs:
2025-05-15 00:42:57,636 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-05-15 00:42:57,636 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-15 00:42:57,636 [ scc.merge] INFO Already up to date.
2025-05-15 00:42:57,636 [ scc.merge] INFO
2025-05-15 00:42:57,636 [ scc.merge] INFO
2025-05-15 00:42:57,636 [ scc.merge] INFO Repository: ome/omero-signup
2025-05-15 00:42:57,636 [ scc.merge] INFO Already up to date.
2025-05-15 00:42:57,636 [ scc.merge] INFO
2025-05-15 00:42:57,636 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-15 00:42:57,636 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-15 00:42:57,636 [ scc.merge] INFO
2025-05-15 00:42:57,636 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-05-15 00:42:57,636 [ scc.merge] INFO Excluded PRs:
2025-05-15 00:42:57,637 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-05-15 00:42:57,637 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-05-15 00:42:57,637 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-05-15 00:42:57,637 [ scc.merge] INFO Already up to date.
2025-05-15 00:42:57,637 [ scc.merge] INFO
2025-05-15 00:42:57,637 [ scc.merge] INFO Merged PRs:
2025-05-15 00:42:57,637 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-15 00:42:57,637 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-05-15 00:42:57,637 [ scc.merge] INFO
2025-05-15 00:42:57,637 [ scc.merge] INFO Repository: ome/omero-upload
2025-05-15 00:42:57,637 [ scc.merge] INFO Already up to date.
2025-05-15 00:42:57,637 [ scc.merge] INFO
2025-05-15 00:42:57,637 [ scc.merge] INFO
2025-05-15 00:42:57,637 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-05-15 00:42:57,637 [ scc.merge] INFO Already up to date.
2025-05-15 00:42:57,637 [ scc.merge] INFO
2025-05-15 00:42:57,637 [ scc.merge] INFO Merged PRs:
2025-05-15 00:42:57,637 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-05-15 00:42:57,637 [ scc.merge] INFO
2025-05-15 00:42:57,637 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-05-15 00:42:57,637 [ scc.merge] INFO Excluded PRs:
2025-05-15 00:42:57,637 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-05-15 00:42:57,637 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-05-15 00:42:57,637 [ scc.merge] INFO Already up to date.
2025-05-15 00:42:57,637 [ scc.merge] INFO
2025-05-15 00:42:57,637 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-15 00:42:57,637 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-15 00:42:57,637 [ scc.merge] INFO
2025-05-15 00:42:57,637 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-05-15 00:42:57,637 [ scc.merge] INFO Already up to date.
2025-05-15 00:42:57,637 [ scc.merge] INFO
2025-05-15 00:42:57,637 [ scc.merge] INFO
2025-05-15 00:42:57,637 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-05-15 00:42:57,637 [ scc.merge] INFO Already up to date.
2025-05-15 00:42:57,637 [ scc.merge] INFO
2025-05-15 00:42:57,637 [ scc.merge] INFO
2025-05-15 00:42:57,637 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-05-15 00:42:57,637 [ scc.merge] INFO Already up to date.
2025-05-15 00:42:57,637 [ scc.merge] INFO
2025-05-15 00:42:57,637 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-15 00:42:57,638 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-05-15 00:42:57,638 [ scc.merge] INFO
2025-05-15 00:42:57,638 [ scc.merge] INFO Repository: ome/scripts
2025-05-15 00:42:57,638 [ scc.merge] INFO Excluded PRs:
2025-05-15 00:42:57,638 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-05-15 00:42:57,638 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-05-15 00:42:57,638 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-05-15 00:42:57,638 [ scc.merge] INFO Previously merged:
2025-05-15 00:42:57,638 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-05-15 00:42:57,638 [ scc.merge] INFO
2025-05-15 00:42:57,638 [ scc.merge] INFO Merged PRs:
2025-05-15 00:42:57,638 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-15 00:42:57,638 [ scc.merge] INFO
2025-05-15 00:42:57,638 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-15 00:42:57,638 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-15 00:42:57,638 [ scc.merge] INFO
2025-05-15 00:42:57,638 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-05-15 00:42:57,638 [ scc.git] DEBUG Calling 'git remote'
2025-05-15 00:42:57,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-05-15 00:42:57,641 [ scc.git] DEBUG Calling 'git remote'
2025-05-15 00:42:57,643 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:57,643 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-05-15 00:42:57,643 [ scc.git] DEBUG Calling 'git remote'
2025-05-15 00:42:57,646 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:57,646 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-05-15 00:42:57,646 [ scc.git] DEBUG Calling 'git remote'
2025-05-15 00:42:57,648 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:57,648 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-05-15 00:42:57,648 [ scc.git] DEBUG Calling 'git remote'
2025-05-15 00:42:57,650 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:57,650 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-05-15 00:42:57,650 [ scc.git] DEBUG Calling 'git remote'
2025-05-15 00:42:57,653 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:57,653 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-05-15 00:42:57,653 [ scc.git] DEBUG Calling 'git remote'
2025-05-15 00:42:57,655 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:57,655 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-05-15 00:42:57,655 [ scc.git] DEBUG Calling 'git remote'
2025-05-15 00:42:57,657 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:57,657 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-05-15 00:42:57,657 [ scc.git] DEBUG Calling 'git remote'
2025-05-15 00:42:57,660 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:57,660 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-15 00:42:57,660 [ scc.git] DEBUG Calling 'git remote'
2025-05-15 00:42:57,662 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:57,662 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-15 00:42:57,662 [ scc.git] DEBUG Calling 'git remote'
2025-05-15 00:42:57,664 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:57,664 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-15 00:42:57,664 [ scc.git] DEBUG Calling 'git remote'
2025-05-15 00:42:57,667 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:57,667 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-15 00:42:57,667 [ scc.git] DEBUG Calling 'git remote'
2025-05-15 00:42:57,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:57,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-15 00:42:57,669 [ scc.git] DEBUG Calling 'git remote'
2025-05-15 00:42:57,672 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:57,672 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-15 00:42:57,672 [ scc.git] DEBUG Calling 'git remote'
2025-05-15 00:42:57,674 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:57,674 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-15 00:42:57,675 [ scc.git] DEBUG Calling 'git remote'
2025-05-15 00:42:57,677 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:57,677 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-15 00:42:57,677 [ scc.git] DEBUG Calling 'git remote'
2025-05-15 00:42:57,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:57,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-15 00:42:57,679 [ scc.git] DEBUG Calling 'git remote'
2025-05-15 00:42:57,682 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:57,682 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-15 00:42:57,682 [ scc.git] DEBUG Calling 'git remote'
2025-05-15 00:42:57,685 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:57,685 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-15 00:42:57,685 [ scc.git] DEBUG Calling 'git remote'
2025-05-15 00:42:57,687 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:57,687 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-15 00:42:57,687 [ scc.git] DEBUG Calling 'git remote'
2025-05-15 00:42:57,690 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:57,690 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-15 00:42:57,690 [ scc.git] DEBUG Calling 'git remote'
2025-05-15 00:42:57,692 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-15 00:42:57,693 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-15 00:42:57,693 [ scc.git] DEBUG Calling 'git remote'
2025-05-15 00:42:57,695 [ 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.3-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 4f3c8b9] 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 e5d7a7e] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-05-15 00:43:46,925 [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-05-15 00:43:56,406 [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-05-15 00:43:58,897 [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-05-15 00:44:03,782 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-05-15 00:44:43,689 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/9161e9ff/images/svgs/logo.svg){kind=logo}
