Skipping 213 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-05-27 01:02:12,643 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-05-27 01:02:12,860 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:13,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:02:13,034 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-05-27 01:02:13,041 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:13,043 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-05-27 01:02:13,078 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-27 01:02:13,078 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-05-27 01:02:13,078 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-27 01:02:13,079 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-27 01:02:13,082 [ scc.git] DEBUG Calling 'git reset --hard e02a675ddb5dd0e28e881c1a10625d143c301e2a'
2025-05-27 01:02:13,089 [ scc.git] DEBUG HEAD is now at e02a675 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-05-27 01:02:13,285 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:13,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:02:13,467 [ scc.git] DEBUG Calling 'git merge-base bb94cf8da960e3283090038b04432f301560f5e4 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-05-27 01:02:13,470 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..bb94cf8da960e3283090038b04432f301560f5e4'
2025-05-27 01:02:13,473 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#435](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-05-27 01:02:13,475 [ scc.config] DEBUG Found github.token
2025-05-27 01:02:13,475 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-05-27 01:02:13,475 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-27 01:02:13,514 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:02:13,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:13,516 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-27 01:02:13,553 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-27 01:02:13,560 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f31d621c710> has no local changes
2025-05-27 01:02:13,560 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Updating 7a798ce..bb94cf8
Previously merged:
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#435 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/)'
2025-05-27 01:02:13,569 [ scc.git] DEBUG [detached HEAD d34b487] merge master -Dorg -Ssuccess-only
2025-05-27 01:02:13,569 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:02:13,570 [ scc.repo] DEBUG ## PRs found:
2025-05-27 01:02:13,718 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:14,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-05-27 01:02:14,283 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:14,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-05-27 01:02:14,754 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:15,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-27 01:02:15,258 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:15,483 [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-27 01:02:15,735 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:15,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-27 01:02:16,234 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:16,466 [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-27 01:02:16,466 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-27 01:02:16,717 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:16,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-05-27 01:02:17,230 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:17,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-05-27 01:02:17,740 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:18,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-27 01:02:18,276 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:18,521 [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-27 01:02:18,773 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:19,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-27 01:02:19,334 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:19,538 [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-27 01:02:19,538 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-05-27 01:02:19,539 [ scc.repo] DEBUG ## Branches found:
2025-05-27 01:02:19,539 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-27 01:02:19,539 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:02:19,539 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:19,541 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-27 01:02:19,544 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-27 01:02:19,544 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-27 01:02:19,547 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-27 01:02:19,549 [ scc.git] DEBUG Already up to date.
2025-05-27 01:02:19,550 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-05-27 01:02:19,845 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-27 01:02:19,846 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-05-27 01:02:19,850 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-05-27 01:02:20,139 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-27 01:02:20,140 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-05-27 01:02:20,143 [ scc.git] DEBUG ## Unique users: []
2025-05-27 01:02:20,143 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:02:20,143 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:20,146 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-27 01:02:20,150 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:20,152 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-27 01:02:20,161 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-27 01:02:20,164 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-05-27 01:02:20,164 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-05-27 01:02:20,164 [ scc.git] DEBUG requirements.txt | 2 +-
2025-05-27 01:02:20,164 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-05-27 01:02:20,164 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-05-27 01:02:20,164 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-05-27 01:02:20,165 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:20,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:02:20,361 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-05-27 01:02:20,365 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:20,367 [ 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-27 01:02:20,376 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-27 01:02:20,380 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-27 01:02:20,380 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-27 01:02:20,612 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:20,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:02:20,795 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-27 01:02:20,834 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:02:20,834 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:20,836 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-27 01:02:20,874 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-27 01:02:20,878 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f31d61c4950> has no local changes
2025-05-27 01:02:20,878 [ 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#435 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/)'
2025-05-27 01:02:20,884 [ scc.git] DEBUG [detached HEAD e5ddf0d] merge master -Dorg -Ssuccess-only
2025-05-27 01:02:20,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:02:20,885 [ scc.repo] DEBUG ## PRs found:
2025-05-27 01:02:21,046 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:21,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-05-27 01:02:21,611 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:21,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-05-27 01:02:22,122 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:22,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-05-27 01:02:22,713 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:22,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-27 01:02:23,245 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:23,465 [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-27 01:02:23,716 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:23,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-27 01:02:24,218 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:24,428 [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-27 01:02:24,429 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-27 01:02:24,680 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:24,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-05-27 01:02:25,167 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:25,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-05-27 01:02:25,672 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:26,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-27 01:02:26,254 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:26,470 [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-27 01:02:26,721 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:27,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-27 01:02:27,290 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:27,476 [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-27 01:02:27,477 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-27 01:02:27,477 [ scc.repo] DEBUG ## Branches found:
2025-05-27 01:02:27,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-27 01:02:27,477 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:02:27,477 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:27,480 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-27 01:02:27,482 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-27 01:02:27,482 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-27 01:02:27,485 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-27 01:02:27,493 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-05-27 01:02:27,728 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:28,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-05-27 01:02:28,197 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-05-27 01:02:28,485 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-27 01:02:28,485 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-05-27 01:02:28,489 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-05-27 01:02:28,809 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-27 01:02:28,809 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-05-27 01:02:28,813 [ scc.git] DEBUG ## Unique users: []
2025-05-27 01:02:28,813 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:02:28,814 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:28,816 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-27 01:02:28,820 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:28,822 [ 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-27 01:02:28,835 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-05-27 01:02:28,835 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-05-27 01:02:28,836 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-27 01:02:28,836 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-27 01:02:28,836 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-27 01:02:28,836 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-27 01:02:28,839 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-27 01:02:28,843 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-27 01:02:28,845 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:29,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:02:29,007 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-27 01:02:29,011 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-27 01:02:29,015 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#435](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-05-27 01:02:29,017 [ scc.config] DEBUG Found github.token
2025-05-27 01:02:29,017 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-05-27 01:02:29,017 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-27 01:02:29,021 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:29,023 [ 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-27 01:02:29,038 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-27 01:02:29,038 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-27 01:02:29,038 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-05-27 01:02:29,039 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-27 01:02:29,039 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-27 01:02:29,042 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-27 01:02:29,046 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-27 01:02:29,258 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:29,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:02:29,440 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-27 01:02:29,444 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-27 01:02:29,447 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#435](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/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-27 01:02:29,449 [ scc.config] DEBUG Found github.token
2025-05-27 01:02:29,449 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-05-27 01:02:29,449 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-27 01:02:29,488 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:02:29,488 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:29,490 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-27 01:02:29,527 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-27 01:02:29,531 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f31d617a490> has no local changes
2025-05-27 01:02:29,531 [ 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#435 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/)'
2025-05-27 01:02:29,538 [ scc.git] DEBUG [detached HEAD 26feacd] merge master -Dorg -Ssuccess-only
2025-05-27 01:02:29,538 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:02:29,538 [ scc.repo] DEBUG ## PRs found:
2025-05-27 01:02:29,691 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:30,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-05-27 01:02:30,267 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:30,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-05-27 01:02:30,752 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:31,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-27 01:02:31,274 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:31,590 [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-27 01:02:31,841 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:32,108 [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-27 01:02:32,360 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:32,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-27 01:02:32,884 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:33,079 [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-27 01:02:33,079 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-27 01:02:33,330 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:33,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-05-27 01:02:33,573 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-27 01:02:33,824 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:34,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-27 01:02:34,503 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:34,748 [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-27 01:02:34,999 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:35,251 [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-27 01:02:35,503 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:35,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-27 01:02:36,115 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:36,317 [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-27 01:02:36,317 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-27 01:02:36,568 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:36,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-05-27 01:02:36,818 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-27 01:02:37,069 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:37,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-27 01:02:37,637 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:37,899 [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-27 01:02:38,151 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:38,500 [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-27 01:02:38,752 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:38,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-27 01:02:39,212 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:39,423 [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-27 01:02:39,423 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-27 01:02:39,674 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:39,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-05-27 01:02:40,151 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:40,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-05-27 01:02:40,658 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:41,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-05-27 01:02:41,268 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:41,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-05-27 01:02:41,757 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:42,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-05-27 01:02:42,292 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:42,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-05-27 01:02:42,767 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:43,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-05-27 01:02:43,200 [ scc.repo] DEBUG ## Branches found:
2025-05-27 01:02:43,200 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-27 01:02:43,200 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:02:43,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:43,203 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-27 01:02:43,206 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-27 01:02:43,206 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-27 01:02:43,209 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-27 01:02:43,212 [ scc.git] DEBUG Already up to date.
2025-05-27 01:02:43,212 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-05-27 01:02:43,514 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-27 01:02:43,515 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-05-27 01:02:43,519 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-05-27 01:02:43,863 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-27 01:02:43,863 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-05-27 01:02:43,867 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-05-27 01:02:44,137 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-27 01:02:44,137 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-05-27 01:02:44,141 [ scc.git] DEBUG ## Unique users: []
2025-05-27 01:02:44,141 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:02:44,141 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:44,144 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-05-27 01:02:44,146 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:44,148 [ 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-27 01:02:44,156 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-27 01:02:44,160 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-05-27 01:02:44,160 [ scc.git] DEBUG package.json | 2 +-
2025-05-27 01:02:44,160 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-05-27 01:02:44,161 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:44,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:02:44,333 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-05-27 01:02:44,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:44,339 [ 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-27 01:02:44,348 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-27 01:02:44,348 [ scc.git] DEBUG Auto-merging package.json
2025-05-27 01:02:44,349 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-27 01:02:44,353 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-05-27 01:02:44,353 [ scc.git] DEBUG package.json | 2 +-
2025-05-27 01:02:44,353 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-05-27 01:02:44,584 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:44,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:02:44,758 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-05-27 01:02:44,761 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:44,763 [ 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-27 01:02:44,771 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-27 01:02:44,774 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-27 01:02:44,774 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-27 01:02:45,009 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:45,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:02:45,173 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-27 01:02:45,213 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:02:45,213 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:45,215 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-27 01:02:45,253 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-27 01:02:45,257 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f31d619fd10> has no local changes
2025-05-27 01:02:45,257 [ 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#435 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/)'
2025-05-27 01:02:45,263 [ scc.git] DEBUG [detached HEAD 99c3817] merge master -Dorg -Ssuccess-only
2025-05-27 01:02:45,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:02:45,264 [ scc.repo] DEBUG ## PRs found:
2025-05-27 01:02:45,424 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:45,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-05-27 01:02:45,644 [ scc.repo] DEBUG ## Branches found:
2025-05-27 01:02:45,644 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-27 01:02:45,644 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:02:45,644 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:45,646 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-27 01:02:45,648 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-27 01:02:45,649 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-27 01:02:45,651 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-27 01:02:45,654 [ scc.git] DEBUG Already up to date.
2025-05-27 01:02:45,655 [ scc.git] DEBUG ## Unique users: []
2025-05-27 01:02:45,655 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:02:45,655 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:45,657 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-27 01:02:45,696 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:02:45,696 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:45,698 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-27 01:02:45,736 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-27 01:02:45,739 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f31c6f25550> has no local changes
2025-05-27 01:02:45,739 [ 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#435 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/)'
2025-05-27 01:02:45,745 [ scc.git] DEBUG [detached HEAD c7bd7ab] merge master -Dorg -Ssuccess-only
2025-05-27 01:02:45,746 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:02:45,746 [ scc.repo] DEBUG ## PRs found:
2025-05-27 01:02:45,895 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:46,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-05-27 01:02:46,421 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:46,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-05-27 01:02:46,923 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:47,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-05-27 01:02:47,407 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:47,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-05-27 01:02:47,621 [ scc.repo] DEBUG ## Branches found:
2025-05-27 01:02:47,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-27 01:02:47,621 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:02:47,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:47,623 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-27 01:02:47,625 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-27 01:02:47,626 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-27 01:02:47,628 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-27 01:02:47,631 [ scc.git] DEBUG Already up to date.
2025-05-27 01:02:47,632 [ scc.git] DEBUG ## Unique users: []
2025-05-27 01:02:47,632 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:02:47,632 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:47,634 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-27 01:02:47,671 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:02:47,671 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:47,674 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-27 01:02:47,712 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-27 01:02:47,715 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f31d61a8750> has no local changes
2025-05-27 01:02:47,715 [ 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#435 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/)'
2025-05-27 01:02:47,721 [ scc.git] DEBUG [detached HEAD b9fa1e2] merge master -Dorg -Ssuccess-only
2025-05-27 01:02:47,721 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:02:47,722 [ scc.repo] DEBUG ## PRs found:
2025-05-27 01:02:47,872 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:48,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-05-27 01:02:48,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:48,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-05-27 01:02:48,909 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:49,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-05-27 01:02:49,382 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:49,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-27 01:02:50,034 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:50,286 [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-27 01:02:50,537 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:50,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-27 01:02:51,124 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:51,314 [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-27 01:02:51,314 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-27 01:02:51,314 [ scc.repo] DEBUG ## Branches found:
2025-05-27 01:02:51,314 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-27 01:02:51,314 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:02:51,314 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:51,317 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-27 01:02:51,319 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-27 01:02:51,319 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-27 01:02:51,322 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-27 01:02:51,325 [ scc.git] DEBUG Already up to date.
2025-05-27 01:02:51,325 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-05-27 01:02:51,622 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-05-27 01:02:51,622 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-05-27 01:02:51,626 [ scc.git] DEBUG ## Unique users: []
2025-05-27 01:02:51,626 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:02:51,627 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:51,629 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-27 01:02:51,632 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:51,634 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-27 01:02:51,643 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-05-27 01:02:51,643 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-05-27 01:02:51,643 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-05-27 01:02:51,643 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-05-27 01:02:51,643 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-05-27 01:02:51,643 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-05-27 01:02:51,643 [ scc.git] DEBUG Auto-merging setup.py
2025-05-27 01:02:51,643 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-05-27 01:02:51,643 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-27 01:02:51,644 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-27 01:02:51,646 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-27 01:02:51,650 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-05-27 01:02:51,652 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:51,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:02:51,868 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-27 01:02:51,871 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-27 01:02:51,875 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#435](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
- setup.py
--conflicts
2025-05-27 01:02:51,877 [ scc.config] DEBUG Found github.token
2025-05-27 01:02:51,877 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-05-27 01:02:51,877 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-27 01:02:51,915 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:02:51,915 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:02:51,917 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-27 01:02:51,954 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-27 01:02:51,958 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f31d620c810> has no local changes
2025-05-27 01:02:51,958 [ 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#435 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/)'
2025-05-27 01:02:51,964 [ scc.git] DEBUG [detached HEAD 9b2863e] merge master -Dorg -Ssuccess-only
2025-05-27 01:02:51,964 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:02:51,964 [ scc.repo] DEBUG ## PRs found:
2025-05-27 01:02:52,119 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:52,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-05-27 01:02:52,705 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:52,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-05-27 01:02:53,211 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:53,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-27 01:02:53,752 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:54,059 [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-27 01:02:54,311 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:54,542 [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-27 01:02:54,793 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:55,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-27 01:02:55,359 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:55,545 [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-27 01:02:55,546 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-05-27 01:02:55,796 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:56,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-05-27 01:02:56,284 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:56,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-05-27 01:02:56,765 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:57,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-05-27 01:02:57,347 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:57,685 [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-27 01:02:57,936 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:58,194 [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-27 01:02:58,446 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:58,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-05-27 01:02:58,937 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:59,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-05-27 01:02:59,444 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:02:59,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-05-27 01:02:59,923 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:00,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-05-27 01:03:00,395 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:00,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-27 01:03:00,908 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:01,136 [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-27 01:03:01,387 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:01,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-27 01:03:01,934 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:02,183 [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-27 01:03:02,184 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-27 01:03:02,184 [ scc.repo] DEBUG ## Branches found:
2025-05-27 01:03:02,184 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-27 01:03:02,184 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:03:02,184 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:02,187 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-27 01:03:02,189 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-27 01:03:02,189 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-27 01:03:02,192 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-27 01:03:02,195 [ scc.git] DEBUG Already up to date.
2025-05-27 01:03:02,195 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-05-27 01:03:02,521 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-27 01:03:02,521 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-05-27 01:03:02,525 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-05-27 01:03:02,811 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-27 01:03:02,811 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-05-27 01:03:02,815 [ scc.git] DEBUG ## Unique users: []
2025-05-27 01:03:02,815 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:03:02,816 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:02,818 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-05-27 01:03:02,822 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:02,824 [ 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-27 01:03:02,836 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-27 01:03:02,840 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-05-27 01:03:02,840 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-05-27 01:03:02,840 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-05-27 01:03:02,840 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-05-27 01:03:02,840 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-05-27 01:03:02,840 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-05-27 01:03:02,840 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-05-27 01:03:02,840 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-05-27 01:03:02,841 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-05-27 01:03:02,842 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:02,842 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-05-27 01:03:02,842 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-05-27 01:03:02,842 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-05-27 01:03:02,842 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-05-27 01:03:02,842 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-05-27 01:03:02,842 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-05-27 01:03:02,842 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-05-27 01:03:02,842 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-05-27 01:03:02,842 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-05-27 01:03:02,842 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-05-27 01:03:02,842 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-05-27 01:03:02,842 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-05-27 01:03:02,842 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-05-27 01:03:02,842 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-05-27 01:03:02,842 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-05-27 01:03:02,842 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-05-27 01:03:02,842 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-05-27 01:03:02,842 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-05-27 01:03:02,842 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-05-27 01:03:02,842 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-05-27 01:03:02,842 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-05-27 01:03:02,842 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-05-27 01:03:02,842 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-05-27 01:03:02,842 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-05-27 01:03:02,842 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-05-27 01:03:02,842 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-05-27 01:03:02,842 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-05-27 01:03:02,842 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-05-27 01:03:02,842 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-05-27 01:03:02,842 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-05-27 01:03:02,843 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-05-27 01:03:02,843 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-05-27 01:03:02,843 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-05-27 01:03:02,843 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-05-27 01:03:02,843 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-05-27 01:03:02,843 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-05-27 01:03:03,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:03,027 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-27 01:03:03,031 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:03,034 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-27 01:03:03,043 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-27 01:03:03,046 [ scc.git] DEBUG docker | 1 +
2025-05-27 01:03:03,046 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-05-27 01:03:03,278 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:03,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:03,457 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-27 01:03:03,497 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:03:03,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:03,499 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-27 01:03:03,537 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-27 01:03:03,541 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f31c6f6d550> has no local changes
2025-05-27 01:03:03,541 [ 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#435 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/)'
2025-05-27 01:03:03,548 [ scc.git] DEBUG [detached HEAD 620128d] merge master -Dorg -Ssuccess-only
2025-05-27 01:03:03,548 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:03,548 [ scc.repo] DEBUG ## PRs found:
2025-05-27 01:03:03,708 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:03,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-05-27 01:03:03,900 [ scc.repo] DEBUG ## Branches found:
2025-05-27 01:03:03,900 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-27 01:03:03,900 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:03:03,900 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:03,902 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-27 01:03:03,904 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-27 01:03:03,904 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-27 01:03:03,907 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-27 01:03:03,910 [ scc.git] DEBUG Already up to date.
2025-05-27 01:03:03,910 [ scc.git] DEBUG ## Unique users: []
2025-05-27 01:03:03,910 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:03:03,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:03,913 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-27 01:03:03,952 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:03:03,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:03,954 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-27 01:03:03,992 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-27 01:03:03,995 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f31d61d79d0> has no local changes
2025-05-27 01:03:03,995 [ 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#435 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/)'
2025-05-27 01:03:04,002 [ scc.git] DEBUG [detached HEAD af1ba28] merge master -Dorg -Ssuccess-only
2025-05-27 01:03:04,002 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:04,002 [ scc.repo] DEBUG ## PRs found:
2025-05-27 01:03:04,151 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:04,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2025-05-27 01:03:04,377 [ scc.repo] DEBUG ## Branches found:
2025-05-27 01:03:04,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-27 01:03:04,377 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:03:04,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:04,380 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-27 01:03:04,382 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-27 01:03:04,382 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-27 01:03:04,385 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-27 01:03:04,394 [ scc.git] DEBUG Updating deab817..160d894
2025-05-27 01:03:04,628 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:05,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls/20 HTTP/1.1" 200 None
2025-05-27 01:03:05,147 [ scc.git] DEBUG ## Unique users: []
2025-05-27 01:03:05,147 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:03:05,147 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:05,149 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-27 01:03:05,187 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:03:05,187 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:05,190 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-27 01:03:05,227 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-27 01:03:05,231 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f31d621c810> has no local changes
2025-05-27 01:03:05,231 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-virtual-microscope
Updating deab817..160d894
Previously merged:
- PR 20 jburel 'Build'
Generated by OMERO-plugins-push#435 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/)'
2025-05-27 01:03:05,237 [ scc.git] DEBUG [detached HEAD 45d312a] merge master -Dorg -Ssuccess-only
2025-05-27 01:03:05,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:05,238 [ scc.git] INFO Overriding base-branch from master to main
2025-05-27 01:03:05,238 [ scc.repo] DEBUG ## PRs found:
2025-05-27 01:03:05,398 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:05,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-05-27 01:03:05,950 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:06,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-05-27 01:03:06,439 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:06,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-05-27 01:03:06,952 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:07,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-05-27 01:03:07,503 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:07,754 [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-27 01:03:08,005 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:08,275 [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-27 01:03:08,526 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:08,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-05-27 01:03:09,020 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:09,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-05-27 01:03:09,493 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:09,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-05-27 01:03:09,992 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:10,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-27 01:03:10,527 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:10,779 [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-27 01:03:11,031 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:11,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-27 01:03:11,489 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:11,692 [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-27 01:03:11,692 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-27 01:03:11,692 [ scc.repo] DEBUG ## Branches found:
2025-05-27 01:03:11,693 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-27 01:03:11,693 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:03:11,693 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:11,695 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-05-27 01:03:11,698 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-27 01:03:11,698 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-05-27 01:03:11,701 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-05-27 01:03:11,704 [ scc.git] DEBUG Already up to date.
2025-05-27 01:03:11,704 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-05-27 01:03:12,073 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-05-27 01:03:12,073 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-05-27 01:03:12,077 [ scc.git] DEBUG ## Unique users: []
2025-05-27 01:03:12,077 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:03:12,077 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:12,079 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-27 01:03:12,083 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:12,085 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-27 01:03:12,093 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-05-27 01:03:12,093 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-05-27 01:03:12,093 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-27 01:03:12,093 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-27 01:03:12,096 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-27 01:03:12,101 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-05-27 01:03:12,102 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:12,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:12,348 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-27 01:03:12,351 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-27 01:03:12,354 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#435](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-05-27 01:03:12,356 [ scc.config] DEBUG Found github.token
2025-05-27 01:03:12,356 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-05-27 01:03:12,356 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-27 01:03:12,395 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:03:12,395 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:12,397 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-27 01:03:12,436 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-27 01:03:12,440 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f31c6f34890> has no local changes
2025-05-27 01:03:12,440 [ 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#435 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/)'
2025-05-27 01:03:12,446 [ scc.git] DEBUG [detached HEAD 3e9ab2a] merge master -Dorg -Ssuccess-only
2025-05-27 01:03:12,446 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:12,447 [ scc.repo] DEBUG ## PRs found:
2025-05-27 01:03:12,599 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:12,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-05-27 01:03:12,833 [ scc.repo] DEBUG ## Branches found:
2025-05-27 01:03:12,833 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-27 01:03:12,833 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:03:12,833 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:12,836 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-27 01:03:12,838 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-27 01:03:12,838 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-27 01:03:12,841 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-27 01:03:12,844 [ scc.git] DEBUG Already up to date.
2025-05-27 01:03:12,844 [ scc.git] DEBUG ## Unique users: []
2025-05-27 01:03:12,844 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:03:12,844 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:12,846 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-27 01:03:12,885 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:03:12,885 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:12,888 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-27 01:03:12,925 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-27 01:03:12,928 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f31c6f8c110> has no local changes
2025-05-27 01:03:12,928 [ 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#435 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/)'
2025-05-27 01:03:12,934 [ scc.git] DEBUG [detached HEAD 75b02ef] merge master -Dorg -Ssuccess-only
2025-05-27 01:03:12,935 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:12,935 [ scc.repo] DEBUG ## PRs found:
2025-05-27 01:03:13,084 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:13,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-05-27 01:03:13,308 [ scc.repo] DEBUG ## Branches found:
2025-05-27 01:03:13,308 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-27 01:03:13,308 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:03:13,308 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:13,311 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-27 01:03:13,313 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-27 01:03:13,313 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-27 01:03:13,316 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-27 01:03:13,319 [ scc.git] DEBUG Already up to date.
2025-05-27 01:03:13,319 [ scc.git] DEBUG ## Unique users: []
2025-05-27 01:03:13,319 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:03:13,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:13,321 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-27 01:03:13,359 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:03:13,359 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:13,361 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-27 01:03:13,399 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-27 01:03:13,403 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f31d7eb3210> has no local changes
2025-05-27 01:03:13,403 [ 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#435 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/)'
2025-05-27 01:03:13,409 [ scc.git] DEBUG [detached HEAD f86d729] merge master -Dorg -Ssuccess-only
2025-05-27 01:03:13,409 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:13,409 [ scc.repo] DEBUG ## PRs found:
2025-05-27 01:03:13,559 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:13,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-05-27 01:03:14,068 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:14,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-05-27 01:03:14,541 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:14,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-05-27 01:03:15,011 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:15,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-27 01:03:15,554 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:15,776 [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-27 01:03:16,027 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:16,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-27 01:03:16,544 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:16,716 [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-27 01:03:16,716 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-05-27 01:03:16,716 [ scc.repo] DEBUG ## Branches found:
2025-05-27 01:03:16,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-27 01:03:16,716 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:03:16,717 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:16,719 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-27 01:03:16,721 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-27 01:03:16,721 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-27 01:03:16,724 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-27 01:03:16,727 [ scc.git] DEBUG Already up to date.
2025-05-27 01:03:16,727 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-05-27 01:03:17,012 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-05-27 01:03:17,013 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-05-27 01:03:17,017 [ scc.git] DEBUG ## Unique users: []
2025-05-27 01:03:17,017 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:03:17,017 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:17,019 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-27 01:03:17,022 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:17,024 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-27 01:03:17,033 [ scc.git] DEBUG Auto-merging Dockerfile
2025-05-27 01:03:17,033 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-05-27 01:03:17,033 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-27 01:03:17,033 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-27 01:03:17,036 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-27 01:03:17,041 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-05-27 01:03:17,042 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:17,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:17,243 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-27 01:03:17,246 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-27 01:03:17,248 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#435](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-05-27 01:03:17,250 [ scc.config] DEBUG Found github.token
2025-05-27 01:03:17,250 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-05-27 01:03:17,250 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-27 01:03:17,289 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:03:17,290 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:17,292 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-27 01:03:17,330 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-27 01:03:17,333 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f31c6f732d0> has no local changes
2025-05-27 01:03:17,334 [ 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#435 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/)'
2025-05-27 01:03:17,340 [ scc.git] DEBUG [detached HEAD aae1183] merge master -Dorg -Ssuccess-only
2025-05-27 01:03:17,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:17,340 [ scc.git] INFO Overriding base-branch from master to develop
2025-05-27 01:03:17,340 [ scc.repo] DEBUG ## PRs found:
2025-05-27 01:03:17,494 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:17,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-05-27 01:03:18,067 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:18,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-05-27 01:03:18,626 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:18,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-05-27 01:03:19,093 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:19,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-27 01:03:19,571 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:19,830 [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-27 01:03:20,082 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:20,417 [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-27 01:03:20,669 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:20,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-27 01:03:21,146 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:21,367 [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-27 01:03:21,368 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-27 01:03:21,619 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:21,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-05-27 01:03:22,111 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:22,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-05-27 01:03:22,581 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:22,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-27 01:03:23,101 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:23,321 [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-27 01:03:23,572 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:23,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-27 01:03:24,034 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:24,215 [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-27 01:03:24,215 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-27 01:03:24,466 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:24,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-05-27 01:03:24,962 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:25,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-05-27 01:03:25,476 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:25,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-05-27 01:03:25,977 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:26,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-05-27 01:03:26,297 [ scc.repo] DEBUG ## Branches found:
2025-05-27 01:03:26,297 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-27 01:03:26,297 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:03:26,297 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:26,300 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-05-27 01:03:26,302 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-27 01:03:26,302 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-05-27 01:03:26,305 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-05-27 01:03:26,313 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-05-27 01:03:26,547 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:26,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-05-27 01:03:26,928 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-05-27 01:03:27,260 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-27 01:03:27,261 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-05-27 01:03:27,265 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-05-27 01:03:27,540 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-27 01:03:27,540 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-05-27 01:03:27,544 [ scc.git] DEBUG ## Unique users: []
2025-05-27 01:03:27,544 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:03:27,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:27,546 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-27 01:03:27,552 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:27,554 [ 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-27 01:03:27,565 [ 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-27 01:03:27,565 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-27 01:03:27,565 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-27 01:03:27,568 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-27 01:03:27,571 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-05-27 01:03:27,573 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:27,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:27,730 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-27 01:03:27,736 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-27 01:03:27,739 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#435](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-05-27 01:03:27,741 [ scc.config] DEBUG Found github.token
2025-05-27 01:03:27,741 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-05-27 01:03:27,741 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-05-27 01:03:27,746 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:27,748 [ 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-27 01:03:27,758 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-27 01:03:27,761 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-05-27 01:03:27,761 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-05-27 01:03:27,981 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:28,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:28,152 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-27 01:03:28,190 [ scc.git] DEBUG Get sha1 of %s
2025-05-27 01:03:28,190 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-27 01:03:28,192 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-27 01:03:28,231 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-27 01:03:28,235 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f31c6fc9d10> has no local changes
2025-05-27 01:03:28,235 [ 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#435 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/)'
2025-05-27 01:03:28,242 [ scc.git] DEBUG [detached HEAD 1b2e405] merge master -Dorg -Ssuccess-only
2025-05-27 01:03:28,242 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:28,243 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-27 01:03:28,320 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-05-27 01:03:28,403 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:28,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:28,581 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-05-27 01:03:28,583 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-05-27 01:03:28,827 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:28,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:28,996 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-05-27 01:03:28,998 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-05-27 01:03:29,243 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:29,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:29,430 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-05-27 01:03:29,431 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-05-27 01:03:29,676 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:29,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:29,851 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-05-27 01:03:30,096 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:30,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:30,306 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-05-27 01:03:30,308 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-05-27 01:03:30,553 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:30,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:30,728 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-05-27 01:03:30,730 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-05-27 01:03:30,974 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:31,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:31,138 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-05-27 01:03:31,140 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-05-27 01:03:31,384 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:31,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:31,562 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-05-27 01:03:31,564 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-05-27 01:03:31,809 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:31,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:31,991 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-05-27 01:03:31,993 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-05-27 01:03:32,238 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:32,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:32,411 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-05-27 01:03:32,413 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-05-27 01:03:32,657 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:32,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:32,831 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-05-27 01:03:32,833 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-05-27 01:03:33,078 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:33,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:33,246 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-05-27 01:03:33,248 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-05-27 01:03:33,493 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:33,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:33,679 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-05-27 01:03:33,923 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:34,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:34,103 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-05-27 01:03:34,347 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:34,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:34,519 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-05-27 01:03:34,521 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-05-27 01:03:34,765 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:34,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:34,937 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-05-27 01:03:35,182 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:35,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:35,372 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-05-27 01:03:35,617 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:35,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:35,787 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-05-27 01:03:35,789 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-05-27 01:03:36,034 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:36,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:36,210 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-05-27 01:03:36,212 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-05-27 01:03:36,457 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:36,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:36,622 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-05-27 01:03:36,623 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-05-27 01:03:36,868 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:37,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:37,031 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-05-27 01:03:37,033 [ scc.config] DEBUG Found submodule.scripts.url
2025-05-27 01:03:37,278 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-27 01:03:37,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-27 01:03:37,445 [ scc.config] DEBUG Found submodule.scripts.branch
2025-05-27 01:03:37,445 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-27 01:03:37,534 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f31d6e932d0> has local changes
2025-05-27 01:03:37,534 [ 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 167 dominikl 'Add extinfo command' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
Updating 11d3587..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'
Repository: ome/omero-figure
Excluded PRs:
- PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
- PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..3e8fa730
Previously merged:
- PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
- PR 635 dependabot[bot] 'Bump esbuild and vite'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Updating 7a798ce..bb94cf8
Previously merged:
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
- PR 76 will-moore 'Run cli deps'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Updating deab817..160d894
Previously merged:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..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#435 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/435/)'
2025-05-27 01:03:37,547 [ scc.git] DEBUG [detached HEAD b7ff5eb] merge master -Dorg -Ssuccess-only
2025-05-27 01:03:37,548 [ scc.merge] INFO Repository: ome/omero-plugins
2025-05-27 01:03:37,548 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-05-27 01:03:37,548 [ scc.merge] INFO Already up to date.
2025-05-27 01:03:37,548 [ scc.merge] INFO
2025-05-27 01:03:37,548 [ scc.merge] INFO Merged PRs:
2025-05-27 01:03:37,548 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-05-27 01:03:37,548 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-05-27 01:03:37,548 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-05-27 01:03:37,548 [ scc.merge] INFO
2025-05-27 01:03:37,548 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-05-27 01:03:37,548 [ scc.merge] INFO Already up to date.
2025-05-27 01:03:37,548 [ scc.merge] INFO
2025-05-27 01:03:37,548 [ scc.merge] INFO
2025-05-27 01:03:37,548 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-05-27 01:03:37,548 [ scc.merge] INFO Excluded PRs:
2025-05-27 01:03:37,548 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-05-27 01:03:37,548 [ scc.merge] INFO Already up to date.
2025-05-27 01:03:37,548 [ scc.merge] INFO
2025-05-27 01:03:37,548 [ scc.merge] INFO
2025-05-27 01:03:37,548 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-05-27 01:03:37,548 [ scc.merge] INFO Excluded PRs:
2025-05-27 01:03:37,548 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-05-27 01:03:37,548 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-05-27 01:03:37,548 [ scc.merge] INFO Already up to date.
2025-05-27 01:03:37,549 [ scc.merge] INFO
2025-05-27 01:03:37,549 [ scc.merge] INFO Merged PRs:
2025-05-27 01:03:37,549 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-05-27 01:03:37,549 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-05-27 01:03:37,549 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-05-27 01:03:37,549 [ scc.merge] INFO
2025-05-27 01:03:37,549 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-05-27 01:03:37,549 [ scc.merge] INFO Excluded PRs:
2025-05-27 01:03:37,549 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-05-27 01:03:37,549 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-05-27 01:03:37,549 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-05-27 01:03:37,549 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-05-27 01:03:37,549 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-27 01:03:37,549 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-05-27 01:03:37,549 [ scc.merge] INFO Updating 11d3587..5b2ca82
2025-05-27 01:03:37,549 [ scc.merge] INFO Previously merged:
2025-05-27 01:03:37,549 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-05-27 01:03:37,549 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-27 01:03:37,549 [ scc.merge] INFO
2025-05-27 01:03:37,549 [ scc.merge] INFO Merged PRs:
2025-05-27 01:03:37,549 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-05-27 01:03:37,549 [ scc.merge] INFO
2025-05-27 01:03:37,549 [ scc.merge] INFO Repository: ome/omero-figure
2025-05-27 01:03:37,549 [ scc.merge] INFO Excluded PRs:
2025-05-27 01:03:37,549 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-05-27 01:03:37,549 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-05-27 01:03:37,549 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-05-27 01:03:37,549 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-05-27 01:03:37,549 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-05-27 01:03:37,549 [ scc.merge] INFO Previously merged:
2025-05-27 01:03:37,549 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-05-27 01:03:37,549 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-05-27 01:03:37,549 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-05-27 01:03:37,549 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-27 01:03:37,549 [ scc.merge] INFO
2025-05-27 01:03:37,549 [ scc.merge] INFO Merged PRs:
2025-05-27 01:03:37,549 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-05-27 01:03:37,549 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-05-27 01:03:37,550 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-05-27 01:03:37,550 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-05-27 01:03:37,550 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-05-27 01:03:37,550 [ scc.merge] INFO
2025-05-27 01:03:37,550 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-27 01:03:37,550 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-05-27 01:03:37,550 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-05-27 01:03:37,550 [ scc.merge] INFO
2025-05-27 01:03:37,550 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-05-27 01:03:37,550 [ scc.merge] INFO Already up to date.
2025-05-27 01:03:37,550 [ scc.merge] INFO
2025-05-27 01:03:37,550 [ scc.merge] INFO Merged PRs:
2025-05-27 01:03:37,550 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-05-27 01:03:37,550 [ scc.merge] INFO
2025-05-27 01:03:37,550 [ scc.merge] INFO Repository: ome/omero-gallery
2025-05-27 01:03:37,550 [ scc.merge] INFO Already up to date.
2025-05-27 01:03:37,550 [ scc.merge] INFO
2025-05-27 01:03:37,550 [ scc.merge] INFO Merged PRs:
2025-05-27 01:03:37,550 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-05-27 01:03:37,550 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-05-27 01:03:37,550 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-05-27 01:03:37,550 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-05-27 01:03:37,550 [ scc.merge] INFO
2025-05-27 01:03:37,550 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-27 01:03:37,550 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-05-27 01:03:37,550 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-05-27 01:03:37,550 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-05-27 01:03:37,550 [ scc.merge] INFO
2025-05-27 01:03:37,550 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-05-27 01:03:37,550 [ scc.merge] INFO Excluded PRs:
2025-05-27 01:03:37,550 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-05-27 01:03:37,550 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-05-27 01:03:37,550 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-05-27 01:03:37,550 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-05-27 01:03:37,550 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-05-27 01:03:37,550 [ scc.merge] INFO Updating 7a798ce..bb94cf8
2025-05-27 01:03:37,550 [ scc.merge] INFO Previously merged:
2025-05-27 01:03:37,550 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-27 01:03:37,550 [ scc.merge] INFO
2025-05-27 01:03:37,550 [ scc.merge] INFO Merged PRs:
2025-05-27 01:03:37,551 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-05-27 01:03:37,551 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-05-27 01:03:37,551 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-05-27 01:03:37,551 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-05-27 01:03:37,551 [ scc.merge] INFO
2025-05-27 01:03:37,551 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-27 01:03:37,551 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-05-27 01:03:37,551 [ scc.merge] INFO
2025-05-27 01:03:37,551 [ scc.merge] INFO Repository: ome/omero-mapr
2025-05-27 01:03:37,551 [ scc.merge] INFO Excluded PRs:
2025-05-27 01:03:37,551 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-05-27 01:03:37,551 [ scc.merge] INFO Already up to date.
2025-05-27 01:03:37,551 [ scc.merge] INFO
2025-05-27 01:03:37,551 [ scc.merge] INFO Merged PRs:
2025-05-27 01:03:37,551 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-05-27 01:03:37,551 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-27 01:03:37,551 [ scc.merge] INFO
2025-05-27 01:03:37,551 [ scc.merge] INFO Repository: ome/omero-metadata
2025-05-27 01:03:37,551 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-05-27 01:03:37,551 [ scc.merge] INFO Previously merged:
2025-05-27 01:03:37,551 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-27 01:03:37,551 [ scc.merge] INFO
2025-05-27 01:03:37,551 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-27 01:03:37,551 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-27 01:03:37,551 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-27 01:03:37,551 [ scc.merge] INFO
2025-05-27 01:03:37,551 [ scc.merge] INFO Repository: ome/omero-parade
2025-05-27 01:03:37,551 [ scc.merge] INFO Excluded PRs:
2025-05-27 01:03:37,551 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-05-27 01:03:37,551 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-05-27 01:03:37,551 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-05-27 01:03:37,551 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-05-27 01:03:37,551 [ scc.merge] INFO Already up to date.
2025-05-27 01:03:37,551 [ scc.merge] INFO
2025-05-27 01:03:37,551 [ scc.merge] INFO Merged PRs:
2025-05-27 01:03:37,551 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-27 01:03:37,551 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-27 01:03:37,551 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-27 01:03:37,551 [ scc.merge] INFO
2025-05-27 01:03:37,552 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-05-27 01:03:37,552 [ scc.merge] INFO Already up to date.
2025-05-27 01:03:37,552 [ scc.merge] INFO
2025-05-27 01:03:37,552 [ scc.merge] INFO
2025-05-27 01:03:37,552 [ scc.merge] INFO Repository: ome/omero-rois
2025-05-27 01:03:37,552 [ scc.merge] INFO Excluded PRs:
2025-05-27 01:03:37,552 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-05-27 01:03:37,552 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-27 01:03:37,552 [ scc.merge] INFO Already up to date.
2025-05-27 01:03:37,552 [ scc.merge] INFO
2025-05-27 01:03:37,552 [ scc.merge] INFO
2025-05-27 01:03:37,552 [ scc.merge] INFO Repository: ome/omero-signup
2025-05-27 01:03:37,552 [ scc.merge] INFO Already up to date.
2025-05-27 01:03:37,552 [ scc.merge] INFO
2025-05-27 01:03:37,552 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-27 01:03:37,552 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-27 01:03:37,552 [ scc.merge] INFO
2025-05-27 01:03:37,552 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-05-27 01:03:37,552 [ scc.merge] INFO Excluded PRs:
2025-05-27 01:03:37,552 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-05-27 01:03:37,552 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-05-27 01:03:37,552 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-05-27 01:03:37,552 [ scc.merge] INFO Already up to date.
2025-05-27 01:03:37,552 [ scc.merge] INFO
2025-05-27 01:03:37,552 [ scc.merge] INFO Merged PRs:
2025-05-27 01:03:37,552 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-27 01:03:37,552 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-05-27 01:03:37,552 [ scc.merge] INFO
2025-05-27 01:03:37,552 [ scc.merge] INFO Repository: ome/omero-upload
2025-05-27 01:03:37,552 [ scc.merge] INFO Already up to date.
2025-05-27 01:03:37,552 [ scc.merge] INFO
2025-05-27 01:03:37,552 [ scc.merge] INFO
2025-05-27 01:03:37,552 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-05-27 01:03:37,552 [ scc.merge] INFO Updating deab817..160d894
2025-05-27 01:03:37,552 [ scc.merge] INFO Previously merged:
2025-05-27 01:03:37,552 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-05-27 01:03:37,552 [ scc.merge] INFO
2025-05-27 01:03:37,552 [ scc.merge] INFO
2025-05-27 01:03:37,552 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-05-27 01:03:37,553 [ scc.merge] INFO Excluded PRs:
2025-05-27 01:03:37,553 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-05-27 01:03:37,553 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-05-27 01:03:37,553 [ scc.merge] INFO Already up to date.
2025-05-27 01:03:37,553 [ scc.merge] INFO
2025-05-27 01:03:37,553 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-27 01:03:37,553 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-27 01:03:37,553 [ scc.merge] INFO
2025-05-27 01:03:37,553 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-05-27 01:03:37,553 [ scc.merge] INFO Already up to date.
2025-05-27 01:03:37,553 [ scc.merge] INFO
2025-05-27 01:03:37,553 [ scc.merge] INFO
2025-05-27 01:03:37,553 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-05-27 01:03:37,553 [ scc.merge] INFO Already up to date.
2025-05-27 01:03:37,553 [ scc.merge] INFO
2025-05-27 01:03:37,553 [ scc.merge] INFO
2025-05-27 01:03:37,553 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-05-27 01:03:37,553 [ scc.merge] INFO Already up to date.
2025-05-27 01:03:37,553 [ scc.merge] INFO
2025-05-27 01:03:37,553 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-27 01:03:37,553 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-05-27 01:03:37,553 [ scc.merge] INFO
2025-05-27 01:03:37,553 [ scc.merge] INFO Repository: ome/scripts
2025-05-27 01:03:37,553 [ scc.merge] INFO Excluded PRs:
2025-05-27 01:03:37,553 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-05-27 01:03:37,553 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-05-27 01:03:37,553 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-05-27 01:03:37,553 [ scc.merge] INFO Previously merged:
2025-05-27 01:03:37,553 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-05-27 01:03:37,553 [ scc.merge] INFO
2025-05-27 01:03:37,553 [ scc.merge] INFO Merged PRs:
2025-05-27 01:03:37,553 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-27 01:03:37,553 [ scc.merge] INFO
2025-05-27 01:03:37,553 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-27 01:03:37,553 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-27 01:03:37,553 [ scc.merge] INFO
2025-05-27 01:03:37,553 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-05-27 01:03:37,554 [ scc.git] DEBUG Calling 'git remote'
2025-05-27 01:03:37,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-05-27 01:03:37,556 [ scc.git] DEBUG Calling 'git remote'
2025-05-27 01:03:37,558 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:37,558 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-05-27 01:03:37,558 [ scc.git] DEBUG Calling 'git remote'
2025-05-27 01:03:37,560 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:37,560 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-05-27 01:03:37,560 [ scc.git] DEBUG Calling 'git remote'
2025-05-27 01:03:37,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:37,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-05-27 01:03:37,563 [ scc.git] DEBUG Calling 'git remote'
2025-05-27 01:03:37,565 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:37,565 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-05-27 01:03:37,565 [ scc.git] DEBUG Calling 'git remote'
2025-05-27 01:03:37,567 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:37,567 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-05-27 01:03:37,567 [ scc.git] DEBUG Calling 'git remote'
2025-05-27 01:03:37,569 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:37,569 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-05-27 01:03:37,570 [ scc.git] DEBUG Calling 'git remote'
2025-05-27 01:03:37,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:37,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-05-27 01:03:37,572 [ scc.git] DEBUG Calling 'git remote'
2025-05-27 01:03:37,574 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:37,574 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-27 01:03:37,574 [ scc.git] DEBUG Calling 'git remote'
2025-05-27 01:03:37,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:37,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-27 01:03:37,576 [ scc.git] DEBUG Calling 'git remote'
2025-05-27 01:03:37,578 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:37,578 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-27 01:03:37,578 [ scc.git] DEBUG Calling 'git remote'
2025-05-27 01:03:37,580 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:37,580 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-27 01:03:37,580 [ scc.git] DEBUG Calling 'git remote'
2025-05-27 01:03:37,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:37,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-27 01:03:37,582 [ scc.git] DEBUG Calling 'git remote'
2025-05-27 01:03:37,584 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:37,585 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-27 01:03:37,585 [ scc.git] DEBUG Calling 'git remote'
2025-05-27 01:03:37,587 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:37,587 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-27 01:03:37,587 [ scc.git] DEBUG Calling 'git remote'
2025-05-27 01:03:37,589 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:37,589 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-27 01:03:37,589 [ scc.git] DEBUG Calling 'git remote'
2025-05-27 01:03:37,591 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:37,591 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-27 01:03:37,591 [ scc.git] DEBUG Calling 'git remote'
2025-05-27 01:03:37,593 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:37,593 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-27 01:03:37,593 [ scc.git] DEBUG Calling 'git remote'
2025-05-27 01:03:37,595 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:37,595 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-27 01:03:37,595 [ scc.git] DEBUG Calling 'git remote'
2025-05-27 01:03:37,597 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:37,597 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-27 01:03:37,597 [ scc.git] DEBUG Calling 'git remote'
2025-05-27 01:03:37,599 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:37,600 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-27 01:03:37,600 [ scc.git] DEBUG Calling 'git remote'
2025-05-27 01:03:37,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-27 01:03:37,602 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-27 01:03:37,602 [ scc.git] DEBUG Calling 'git remote'
2025-05-27 01:03:37,604 [ 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 b4397a6] 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 dd1ca28] 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-27 01:04:25,620 [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-27 01:04:35,088 [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-27 01:04:37,614 [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-27 01:04:42,517 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-05-27 01:05:23,167 [ 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/aacddba8/images/svgs/logo.svg){kind=logo}
