Skipping 223 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#423 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/)'
2025-05-16 09:00:20,671 [ scc.git] DEBUG [detached HEAD fcb0789] merge master -Dorg -Ssuccess-only
2025-05-16 09:00:20,671 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:00:20,671 [ scc.repo] DEBUG ## PRs found:
2025-05-16 09:00:20,825 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:21,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-05-16 09:00:21,526 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:21,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-05-16 09:00:22,038 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:22,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-16 09:00:22,598 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:22,811 [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-16 09:00:23,063 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:23,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-16 09:00:23,525 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:23,735 [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-16 09:00:23,736 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-16 09:00:23,987 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:24,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-05-16 09:00:24,512 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:24,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-05-16 09:00:25,032 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:25,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-16 09:00:25,558 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:25,791 [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-16 09:00:26,043 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:26,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-16 09:00:26,609 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:26,796 [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-16 09:00:26,797 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-05-16 09:00:26,797 [ scc.repo] DEBUG ## Branches found:
2025-05-16 09:00:26,797 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-16 09:00:26,797 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:00:26,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:00:26,801 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-16 09:00:26,803 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-16 09:00:26,803 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-16 09:00:26,806 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-16 09:00:26,809 [ scc.git] DEBUG Already up to date.
2025-05-16 09:00:26,810 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-05-16 09:00:27,433 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-16 09:00:27,433 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-05-16 09:00:27,438 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-05-16 09:00:27,761 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-16 09:00:27,762 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-05-16 09:00:27,767 [ scc.git] DEBUG ## Unique users: []
2025-05-16 09:00:27,767 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:00:27,767 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:00:27,769 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-16 09:00:27,774 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:00:27,776 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-16 09:00:27,804 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 09:00:27,809 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-05-16 09:00:27,809 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-05-16 09:00:27,809 [ scc.git] DEBUG requirements.txt | 2 +-
2025-05-16 09:00:27,809 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-05-16 09:00:27,810 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:27,810 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-05-16 09:00:27,811 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-05-16 09:00:27,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:00:27,978 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-05-16 09:00:27,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:00:27,985 [ 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-16 09:00:27,997 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 09:00:28,000 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-16 09:00:28,000 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-16 09:00:28,229 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:28,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:00:28,408 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-16 09:00:28,448 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:00:28,448 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:00:28,451 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-16 09:00:28,490 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-16 09:00:28,494 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f34e5fea190> has no local changes
2025-05-16 09:00:28,494 [ 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#423 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/)'
2025-05-16 09:00:28,501 [ scc.git] DEBUG [detached HEAD 1d7331e] merge master -Dorg -Ssuccess-only
2025-05-16 09:00:28,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:00:28,501 [ scc.repo] DEBUG ## PRs found:
2025-05-16 09:00:28,659 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:28,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-05-16 09:00:29,240 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:29,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-05-16 09:00:29,743 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:30,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-05-16 09:00:30,304 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:30,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-16 09:00:30,882 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:31,219 [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-16 09:00:31,471 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:31,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-16 09:00:32,019 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:32,222 [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-16 09:00:32,222 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-16 09:00:32,474 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:32,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-05-16 09:00:32,981 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:33,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-05-16 09:00:33,522 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:33,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-16 09:00:34,054 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:34,418 [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-16 09:00:34,670 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:34,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-16 09:00:35,217 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:35,422 [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-16 09:00:35,422 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-16 09:00:35,422 [ scc.repo] DEBUG ## Branches found:
2025-05-16 09:00:35,423 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-16 09:00:35,423 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:00:35,423 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:00:35,426 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-16 09:00:35,428 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-16 09:00:35,429 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-16 09:00:35,432 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-16 09:00:35,439 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-05-16 09:00:35,674 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:36,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-05-16 09:00:36,108 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-05-16 09:00:36,426 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-16 09:00:36,427 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-05-16 09:00:36,431 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-05-16 09:00:36,721 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-16 09:00:36,721 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-05-16 09:00:36,726 [ scc.git] DEBUG ## Unique users: []
2025-05-16 09:00:36,726 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:00:36,726 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:00:36,729 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-16 09:00:36,733 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:00:36,736 [ 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-16 09:00:37,117 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-05-16 09:00:37,117 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-05-16 09:00:37,117 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-16 09:00:37,117 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-16 09:00:37,117 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-16 09:00:37,118 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-16 09:00:37,121 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-16 09:00:37,126 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-16 09:00:37,127 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:37,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:00:37,302 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-16 09:00:37,307 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-16 09:00:37,334 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#423](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-05-16 09:00:37,336 [ scc.config] DEBUG Found github.token
2025-05-16 09:00:37,336 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-05-16 09:00:37,336 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-16 09:00:37,341 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:00:37,343 [ 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-16 09:00:37,818 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-16 09:00:37,818 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-16 09:00:37,818 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-05-16 09:00:37,819 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-16 09:00:37,819 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-16 09:00:37,822 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-16 09:00:37,828 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-16 09:00:37,829 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:38,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:00:38,004 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-16 09:00:38,008 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-16 09:00:38,012 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#423](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/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-16 09:00:38,014 [ scc.config] DEBUG Found github.token
2025-05-16 09:00:38,014 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-05-16 09:00:38,014 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-16 09:00:38,054 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:00:38,054 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:00:38,056 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-16 09:00:38,094 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-16 09:00:38,099 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f34e5ef04d0> has no local changes
2025-05-16 09:00:38,099 [ 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#423 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/)'
2025-05-16 09:00:38,106 [ scc.git] DEBUG [detached HEAD 0272c8c] merge master -Dorg -Ssuccess-only
2025-05-16 09:00:38,106 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:00:38,106 [ scc.repo] DEBUG ## PRs found:
2025-05-16 09:00:38,255 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:38,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-05-16 09:00:38,851 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:39,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-05-16 09:00:39,322 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:39,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-16 09:00:39,850 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:40,128 [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-16 09:00:40,380 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:40,667 [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-16 09:00:40,919 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:41,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-16 09:00:41,502 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:41,707 [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-16 09:00:41,708 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-16 09:00:41,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:42,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-05-16 09:00:42,279 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-16 09:00:42,531 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:42,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-16 09:00:43,163 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:43,448 [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-16 09:00:43,700 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:43,976 [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-16 09:00:44,229 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:44,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-16 09:00:44,702 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:44,871 [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-16 09:00:44,872 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-16 09:00:45,123 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:45,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-05-16 09:00:45,381 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-16 09:00:45,632 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:45,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-16 09:00:46,191 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:46,444 [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-16 09:00:46,696 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:47,001 [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-16 09:00:47,253 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:47,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-16 09:00:47,805 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:47,997 [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-16 09:00:47,998 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-16 09:00:48,249 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:48,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-05-16 09:00:48,765 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:49,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-05-16 09:00:49,256 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:49,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-05-16 09:00:49,766 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:50,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-05-16 09:00:50,254 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:50,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-05-16 09:00:50,774 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:51,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-05-16 09:00:51,277 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:51,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-05-16 09:00:51,611 [ scc.repo] DEBUG ## Branches found:
2025-05-16 09:00:51,611 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-16 09:00:51,611 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:00:51,611 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:00:51,615 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-16 09:00:51,617 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-16 09:00:51,617 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-16 09:00:51,620 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-16 09:00:51,624 [ scc.git] DEBUG Already up to date.
2025-05-16 09:00:51,624 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-05-16 09:00:51,967 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-16 09:00:51,967 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-05-16 09:00:51,972 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-05-16 09:00:52,283 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-16 09:00:52,283 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-05-16 09:00:52,288 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-05-16 09:00:52,783 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-16 09:00:52,783 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-05-16 09:00:52,788 [ scc.git] DEBUG ## Unique users: []
2025-05-16 09:00:52,788 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:00:52,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:00:52,790 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-05-16 09:00:52,846 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:00:52,848 [ 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-16 09:00:52,912 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 09:00:52,958 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-05-16 09:00:52,958 [ scc.git] DEBUG package.json | 2 +-
2025-05-16 09:00:52,958 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-05-16 09:00:52,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:53,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:00:53,127 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-05-16 09:00:53,143 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:00:53,146 [ 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-16 09:00:53,480 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-16 09:00:53,480 [ scc.git] DEBUG Auto-merging package.json
2025-05-16 09:00:53,481 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 09:00:53,485 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-05-16 09:00:53,485 [ scc.git] DEBUG package.json | 2 +-
2025-05-16 09:00:53,485 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-05-16 09:00:53,487 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:53,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:00:53,656 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-05-16 09:00:53,660 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:00:53,662 [ 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-16 09:00:53,758 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 09:00:53,813 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-16 09:00:53,813 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-16 09:00:53,907 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:54,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:00:54,080 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-16 09:00:54,121 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:00:54,122 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:00:54,124 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-16 09:00:54,163 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-16 09:00:54,167 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f34e5fcf0d0> has no local changes
2025-05-16 09:00:54,167 [ 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#423 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/)'
2025-05-16 09:00:54,174 [ scc.git] DEBUG [detached HEAD 27f8b19] merge master -Dorg -Ssuccess-only
2025-05-16 09:00:54,174 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:00:54,174 [ scc.repo] DEBUG ## PRs found:
2025-05-16 09:00:54,331 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:54,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-05-16 09:00:54,516 [ scc.repo] DEBUG ## Branches found:
2025-05-16 09:00:54,516 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-16 09:00:54,516 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:00:54,516 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:00:54,569 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-16 09:00:54,572 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-16 09:00:54,572 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-16 09:00:54,574 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-16 09:00:54,578 [ scc.git] DEBUG Already up to date.
2025-05-16 09:00:54,578 [ scc.git] DEBUG ## Unique users: []
2025-05-16 09:00:54,578 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:00:54,578 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:00:54,580 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-16 09:00:54,622 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:00:54,622 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:00:54,624 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-16 09:00:54,662 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-16 09:00:54,665 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f34e45f9b10> has no local changes
2025-05-16 09:00:54,665 [ 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#423 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/)'
2025-05-16 09:00:54,672 [ scc.git] DEBUG [detached HEAD 918468d] merge master -Dorg -Ssuccess-only
2025-05-16 09:00:54,672 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:00:54,672 [ scc.repo] DEBUG ## PRs found:
2025-05-16 09:00:54,767 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:55,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-05-16 09:00:55,325 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:55,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-05-16 09:00:55,950 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:56,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-05-16 09:00:56,443 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:56,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-05-16 09:00:56,670 [ scc.repo] DEBUG ## Branches found:
2025-05-16 09:00:56,670 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-16 09:00:56,670 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:00:56,670 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:00:56,721 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-16 09:00:56,723 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-16 09:00:56,724 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-16 09:00:56,727 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-16 09:00:56,730 [ scc.git] DEBUG Already up to date.
2025-05-16 09:00:56,730 [ scc.git] DEBUG ## Unique users: []
2025-05-16 09:00:56,730 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:00:56,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:00:56,732 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-16 09:00:56,772 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:00:56,772 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:00:56,775 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-16 09:00:56,814 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-16 09:00:56,818 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f34e60a9c90> has no local changes
2025-05-16 09:00:56,818 [ 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#423 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/)'
2025-05-16 09:00:56,824 [ scc.git] DEBUG [detached HEAD 032a280] merge master -Dorg -Ssuccess-only
2025-05-16 09:00:56,825 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:00:56,825 [ scc.repo] DEBUG ## PRs found:
2025-05-16 09:00:56,921 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:57,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-05-16 09:00:57,482 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:57,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-05-16 09:00:58,116 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:58,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-05-16 09:00:58,577 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:58,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-16 09:00:59,152 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:59,390 [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-16 09:00:59,642 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:00:59,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-16 09:01:00,203 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:00,400 [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-16 09:01:00,401 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-16 09:01:00,401 [ scc.repo] DEBUG ## Branches found:
2025-05-16 09:01:00,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-16 09:01:00,401 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:00,401 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:00,404 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-16 09:01:00,406 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-16 09:01:00,406 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-16 09:01:00,409 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-16 09:01:00,412 [ scc.git] DEBUG Already up to date.
2025-05-16 09:01:00,412 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-05-16 09:01:00,903 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-05-16 09:01:00,903 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-05-16 09:01:00,909 [ scc.git] DEBUG ## Unique users: []
2025-05-16 09:01:00,909 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:00,909 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:00,912 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-16 09:01:00,916 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:00,918 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-16 09:01:01,105 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-05-16 09:01:01,105 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-05-16 09:01:01,105 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-05-16 09:01:01,105 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-05-16 09:01:01,105 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-05-16 09:01:01,105 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-05-16 09:01:01,105 [ scc.git] DEBUG Auto-merging setup.py
2025-05-16 09:01:01,105 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-05-16 09:01:01,105 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-16 09:01:01,105 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-16 09:01:01,109 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-16 09:01:01,113 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-05-16 09:01:01,115 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:01,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:01,297 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-16 09:01:01,301 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-16 09:01:01,368 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#423](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- setup.py
- omero_signup/urls.py
- omero_signup/signup_settings.py
--conflicts
2025-05-16 09:01:01,370 [ scc.config] DEBUG Found github.token
2025-05-16 09:01:01,370 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-05-16 09:01:01,370 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-16 09:01:01,410 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:01,410 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:01,413 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-16 09:01:01,451 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-16 09:01:01,455 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f34e61d3010> has no local changes
2025-05-16 09:01:01,455 [ 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#423 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/)'
2025-05-16 09:01:01,462 [ scc.git] DEBUG [detached HEAD 749a97a] merge master -Dorg -Ssuccess-only
2025-05-16 09:01:01,462 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:01,462 [ scc.repo] DEBUG ## PRs found:
2025-05-16 09:01:01,548 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:01,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-05-16 09:01:02,173 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:02,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-05-16 09:01:02,769 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:03,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-16 09:01:03,366 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:03,653 [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-16 09:01:03,905 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:04,125 [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-16 09:01:04,377 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:04,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-16 09:01:04,841 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:05,020 [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-16 09:01:05,020 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-05-16 09:01:05,271 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:05,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-05-16 09:01:05,800 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:06,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-05-16 09:01:06,290 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:06,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-05-16 09:01:06,898 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:07,135 [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-16 09:01:07,387 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:07,622 [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-16 09:01:07,874 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:08,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-05-16 09:01:08,393 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:08,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-05-16 09:01:08,875 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:09,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-05-16 09:01:09,403 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:09,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-05-16 09:01:09,947 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:10,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-16 09:01:10,480 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:10,706 [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-16 09:01:10,958 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:11,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-16 09:01:11,487 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:11,665 [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-16 09:01:11,665 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-16 09:01:11,666 [ scc.repo] DEBUG ## Branches found:
2025-05-16 09:01:11,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-16 09:01:11,666 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:11,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:11,700 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-16 09:01:11,703 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-16 09:01:11,703 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-16 09:01:11,705 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-16 09:01:11,709 [ scc.git] DEBUG Already up to date.
2025-05-16 09:01:11,709 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-05-16 09:01:12,104 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-16 09:01:12,104 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-05-16 09:01:12,109 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-05-16 09:01:12,380 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-16 09:01:12,380 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-05-16 09:01:12,385 [ scc.git] DEBUG ## Unique users: []
2025-05-16 09:01:12,385 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:12,385 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:12,388 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-05-16 09:01:12,392 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:12,395 [ 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-16 09:01:12,507 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 09:01:12,511 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-05-16 09:01:12,511 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-05-16 09:01:12,511 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-05-16 09:01:12,511 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-05-16 09:01:12,511 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-05-16 09:01:12,512 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-05-16 09:01:12,512 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-05-16 09:01:12,512 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-05-16 09:01:12,512 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-05-16 09:01:12,513 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:12,513 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-05-16 09:01:12,513 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-05-16 09:01:12,513 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-05-16 09:01:12,513 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-05-16 09:01:12,513 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-05-16 09:01:12,513 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-05-16 09:01:12,513 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-05-16 09:01:12,513 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-05-16 09:01:12,513 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-05-16 09:01:12,513 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-05-16 09:01:12,513 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-05-16 09:01:12,513 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-05-16 09:01:12,513 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-05-16 09:01:12,513 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-05-16 09:01:12,513 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-05-16 09:01:12,513 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-05-16 09:01:12,513 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-05-16 09:01:12,513 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-05-16 09:01:12,513 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-05-16 09:01:12,513 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-05-16 09:01:12,514 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-05-16 09:01:12,514 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-05-16 09:01:12,514 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-05-16 09:01:12,514 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-05-16 09:01:12,514 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-05-16 09:01:12,514 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-05-16 09:01:12,514 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-05-16 09:01:12,514 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-05-16 09:01:12,514 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-05-16 09:01:12,514 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-05-16 09:01:12,514 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-05-16 09:01:12,514 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-05-16 09:01:12,514 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-05-16 09:01:12,514 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-05-16 09:01:12,514 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-05-16 09:01:12,514 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-05-16 09:01:12,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:12,686 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-16 09:01:12,691 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:12,693 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-16 09:01:12,736 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 09:01:12,738 [ scc.git] DEBUG docker | 1 +
2025-05-16 09:01:12,738 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-05-16 09:01:12,937 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:13,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:13,110 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-16 09:01:13,153 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:13,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:13,156 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-16 09:01:13,195 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-16 09:01:13,200 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f34e5f74690> has no local changes
2025-05-16 09:01:13,200 [ 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#423 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/)'
2025-05-16 09:01:13,207 [ scc.git] DEBUG [detached HEAD a6e5076] merge master -Dorg -Ssuccess-only
2025-05-16 09:01:13,207 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:13,208 [ scc.repo] DEBUG ## PRs found:
2025-05-16 09:01:13,361 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:13,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-05-16 09:01:13,579 [ scc.repo] DEBUG ## Branches found:
2025-05-16 09:01:13,579 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-16 09:01:13,579 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:13,579 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:13,583 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-16 09:01:13,585 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-16 09:01:13,585 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-16 09:01:13,588 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-16 09:01:13,592 [ scc.git] DEBUG Already up to date.
2025-05-16 09:01:13,592 [ scc.git] DEBUG ## Unique users: []
2025-05-16 09:01:13,592 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:13,592 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:13,594 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-16 09:01:13,635 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:13,635 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:13,637 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-16 09:01:13,676 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-16 09:01:13,681 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f34e4613a90> has no local changes
2025-05-16 09:01:13,681 [ 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#423 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/)'
2025-05-16 09:01:13,688 [ scc.git] DEBUG [detached HEAD 687e433] merge master -Dorg -Ssuccess-only
2025-05-16 09:01:13,688 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:13,688 [ scc.repo] DEBUG ## PRs found:
2025-05-16 09:01:13,830 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:14,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-05-16 09:01:14,367 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:14,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-05-16 09:01:14,877 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:15,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-05-16 09:01:15,357 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:15,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-16 09:01:15,951 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:16,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 09:01:16,450 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:16,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-16 09:01:17,023 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:17,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-16 09:01:17,472 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:17,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-05-16 09:01:17,681 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-05-16 09:01:17,682 [ scc.repo] DEBUG ## Branches found:
2025-05-16 09:01:17,682 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-16 09:01:17,682 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:17,682 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:17,685 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-16 09:01:17,688 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-16 09:01:17,688 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-16 09:01:17,690 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-16 09:01:17,693 [ scc.git] DEBUG Already up to date.
2025-05-16 09:01:17,693 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-05-16 09:01:18,595 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-05-16 09:01:18,596 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-05-16 09:01:18,601 [ scc.git] DEBUG ## Unique users: []
2025-05-16 09:01:18,601 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:18,601 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:18,604 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-05-16 09:01:18,607 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:18,609 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-05-16 09:01:18,672 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 09:01:18,675 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-05-16 09:01:18,675 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-05-16 09:01:18,675 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-05-16 09:01:18,675 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-05-16 09:01:18,675 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-05-16 09:01:18,676 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:18,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:18,838 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-16 09:01:18,878 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:18,878 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:18,880 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-16 09:01:18,920 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-16 09:01:18,924 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f34e464b350> has no local changes
2025-05-16 09:01:18,924 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Generated by OMERO-plugins-push#423 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/)'
2025-05-16 09:01:18,949 [ scc.git] DEBUG [detached HEAD c0ba5f1] merge master -Dorg -Ssuccess-only
2025-05-16 09:01:18,950 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:18,950 [ scc.git] INFO Overriding base-branch from master to main
2025-05-16 09:01:18,950 [ scc.repo] DEBUG ## PRs found:
2025-05-16 09:01:19,089 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:19,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-05-16 09:01:19,637 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:19,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-05-16 09:01:20,143 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:20,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-05-16 09:01:20,684 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:20,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-05-16 09:01:21,247 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:21,540 [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-16 09:01:21,792 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:22,069 [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-16 09:01:22,320 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:22,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-05-16 09:01:22,825 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:23,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-05-16 09:01:23,293 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:23,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-05-16 09:01:23,761 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:24,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-16 09:01:24,323 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:24,553 [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-16 09:01:24,806 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:25,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-16 09:01:25,322 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:25,515 [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-16 09:01:25,515 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-16 09:01:25,516 [ scc.repo] DEBUG ## Branches found:
2025-05-16 09:01:25,516 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-16 09:01:25,516 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:25,516 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:25,519 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-05-16 09:01:25,521 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-16 09:01:25,521 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-05-16 09:01:25,524 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-05-16 09:01:25,527 [ scc.git] DEBUG Already up to date.
2025-05-16 09:01:25,527 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-05-16 09:01:25,983 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-05-16 09:01:25,983 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-05-16 09:01:25,988 [ scc.git] DEBUG ## Unique users: []
2025-05-16 09:01:25,988 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:25,988 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:25,990 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-16 09:01:25,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:25,996 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-16 09:01:26,092 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-05-16 09:01:26,092 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-05-16 09:01:26,092 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-16 09:01:26,092 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-16 09:01:26,096 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-16 09:01:26,100 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-05-16 09:01:26,101 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:26,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:26,270 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-16 09:01:26,273 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-16 09:01:26,276 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#423](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-05-16 09:01:26,278 [ scc.config] DEBUG Found github.token
2025-05-16 09:01:26,278 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-05-16 09:01:26,278 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-16 09:01:26,319 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:26,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:26,322 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-16 09:01:26,360 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-16 09:01:26,364 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f34e45dbb10> has no local changes
2025-05-16 09:01:26,364 [ 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#423 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/)'
2025-05-16 09:01:26,371 [ scc.git] DEBUG [detached HEAD 4de8abe] merge master -Dorg -Ssuccess-only
2025-05-16 09:01:26,372 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:26,372 [ scc.repo] DEBUG ## PRs found:
2025-05-16 09:01:26,521 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:26,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-05-16 09:01:26,708 [ scc.repo] DEBUG ## Branches found:
2025-05-16 09:01:26,708 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-16 09:01:26,708 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:26,708 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:26,711 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-16 09:01:26,714 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-16 09:01:26,714 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-16 09:01:26,717 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-16 09:01:26,720 [ scc.git] DEBUG Already up to date.
2025-05-16 09:01:26,720 [ scc.git] DEBUG ## Unique users: []
2025-05-16 09:01:26,720 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:26,720 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:26,722 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-16 09:01:26,763 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:26,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:26,766 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-16 09:01:26,807 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-16 09:01:26,811 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f34e45f7510> has no local changes
2025-05-16 09:01:26,811 [ 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#423 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/)'
2025-05-16 09:01:26,818 [ scc.git] DEBUG [detached HEAD 2d759c3] merge master -Dorg -Ssuccess-only
2025-05-16 09:01:26,818 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:26,818 [ scc.repo] DEBUG ## PRs found:
2025-05-16 09:01:26,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:27,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-05-16 09:01:27,184 [ scc.repo] DEBUG ## Branches found:
2025-05-16 09:01:27,184 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-16 09:01:27,184 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:27,184 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:27,188 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-16 09:01:27,190 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-16 09:01:27,190 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-16 09:01:27,193 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-16 09:01:27,196 [ scc.git] DEBUG Already up to date.
2025-05-16 09:01:27,196 [ scc.git] DEBUG ## Unique users: []
2025-05-16 09:01:27,196 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:27,196 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:27,198 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-16 09:01:27,240 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:27,240 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:27,242 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-16 09:01:27,281 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-16 09:01:27,286 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f34e45e28d0> has no local changes
2025-05-16 09:01:27,286 [ 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#423 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/)'
2025-05-16 09:01:27,293 [ scc.git] DEBUG [detached HEAD eb12f44] merge master -Dorg -Ssuccess-only
2025-05-16 09:01:27,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:27,293 [ scc.repo] DEBUG ## PRs found:
2025-05-16 09:01:27,436 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:27,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-05-16 09:01:28,005 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:28,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-05-16 09:01:28,476 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:28,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-05-16 09:01:28,936 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:29,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-16 09:01:29,481 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:29,727 [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-16 09:01:29,979 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:30,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-16 09:01:30,577 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:30,762 [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-16 09:01:30,762 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-05-16 09:01:30,762 [ scc.repo] DEBUG ## Branches found:
2025-05-16 09:01:30,762 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-16 09:01:30,763 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:30,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:30,766 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-16 09:01:30,769 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-16 09:01:30,769 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-16 09:01:30,772 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-16 09:01:30,775 [ scc.git] DEBUG Already up to date.
2025-05-16 09:01:30,775 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-05-16 09:01:31,138 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-05-16 09:01:31,138 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-05-16 09:01:31,143 [ scc.git] DEBUG ## Unique users: []
2025-05-16 09:01:31,143 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:31,143 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:31,145 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-16 09:01:31,149 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:31,151 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-16 09:01:31,178 [ scc.git] DEBUG Auto-merging Dockerfile
2025-05-16 09:01:31,178 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-05-16 09:01:31,178 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-16 09:01:31,179 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-16 09:01:31,182 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-16 09:01:31,187 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-05-16 09:01:31,188 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:31,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:31,385 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-16 09:01:31,388 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-16 09:01:31,391 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#423](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-05-16 09:01:31,393 [ scc.config] DEBUG Found github.token
2025-05-16 09:01:31,393 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-05-16 09:01:31,393 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-16 09:01:31,433 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:31,433 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:31,435 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-16 09:01:31,473 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-16 09:01:31,478 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f34e468ef90> has no local changes
2025-05-16 09:01:31,478 [ 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#423 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/)'
2025-05-16 09:01:31,484 [ scc.git] DEBUG [detached HEAD 60bedb1] merge master -Dorg -Ssuccess-only
2025-05-16 09:01:31,485 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:31,485 [ scc.git] INFO Overriding base-branch from master to develop
2025-05-16 09:01:31,485 [ scc.repo] DEBUG ## PRs found:
2025-05-16 09:01:31,636 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:31,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-05-16 09:01:32,251 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:32,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-05-16 09:01:32,768 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:33,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-05-16 09:01:33,258 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:33,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-16 09:01:33,800 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:34,057 [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-16 09:01:34,308 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:34,569 [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-16 09:01:34,821 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:35,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-16 09:01:35,282 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:35,505 [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-16 09:01:35,505 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-16 09:01:35,756 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:35,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-05-16 09:01:36,235 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:36,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-05-16 09:01:36,783 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:37,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-16 09:01:37,338 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:37,572 [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-16 09:01:37,823 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:38,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-16 09:01:38,350 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:38,546 [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-16 09:01:38,547 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-16 09:01:38,798 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:39,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-05-16 09:01:39,325 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:39,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-05-16 09:01:39,894 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:40,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-05-16 09:01:40,389 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:40,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-05-16 09:01:40,659 [ scc.repo] DEBUG ## Branches found:
2025-05-16 09:01:40,659 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-16 09:01:40,659 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:40,659 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:40,662 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-05-16 09:01:40,665 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-16 09:01:40,665 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-05-16 09:01:40,668 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-05-16 09:01:40,726 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-05-16 09:01:40,909 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:41,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-05-16 09:01:41,303 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-05-16 09:01:42,022 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-16 09:01:42,022 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-05-16 09:01:42,027 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-05-16 09:01:42,476 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-16 09:01:42,476 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-05-16 09:01:42,481 [ scc.git] DEBUG ## Unique users: []
2025-05-16 09:01:42,481 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:42,481 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:42,484 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-16 09:01:42,490 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:42,492 [ 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-16 09:01:42,636 [ 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-16 09:01:42,637 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-16 09:01:42,637 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-16 09:01:42,640 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-16 09:01:42,644 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-05-16 09:01:42,645 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:42,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:42,843 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-16 09:01:42,849 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-16 09:01:42,853 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#423](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-05-16 09:01:42,856 [ scc.config] DEBUG Found github.token
2025-05-16 09:01:42,856 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-05-16 09:01:42,856 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-05-16 09:01:42,861 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:42,863 [ 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-16 09:01:42,946 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 09:01:42,949 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-05-16 09:01:42,949 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-05-16 09:01:43,094 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:43,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:43,271 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-16 09:01:43,312 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 09:01:43,312 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 09:01:43,314 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-16 09:01:43,352 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-16 09:01:43,357 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f34e5f02890> has no local changes
2025-05-16 09:01:43,357 [ 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#423 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/)'
2025-05-16 09:01:43,363 [ scc.git] DEBUG [detached HEAD 1a032a3] merge master -Dorg -Ssuccess-only
2025-05-16 09:01:43,364 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:43,364 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-16 09:01:43,444 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-05-16 09:01:43,522 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:43,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:43,714 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-05-16 09:01:43,716 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-05-16 09:01:43,960 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:44,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:44,135 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-05-16 09:01:44,137 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-05-16 09:01:44,381 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:44,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:44,555 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-05-16 09:01:44,557 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-05-16 09:01:44,801 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:44,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:44,971 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-05-16 09:01:45,215 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:45,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:45,385 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-05-16 09:01:45,387 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-05-16 09:01:45,631 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:45,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:45,816 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-05-16 09:01:45,818 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-05-16 09:01:46,063 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:46,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:46,257 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-05-16 09:01:46,260 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-05-16 09:01:46,504 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:46,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:46,674 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-05-16 09:01:46,676 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-05-16 09:01:46,920 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:47,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:47,115 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-05-16 09:01:47,117 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-05-16 09:01:47,361 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:47,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:47,530 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-05-16 09:01:47,533 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-05-16 09:01:47,777 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:47,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:47,943 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-05-16 09:01:47,946 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-05-16 09:01:48,190 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:48,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:48,354 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-05-16 09:01:48,356 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-05-16 09:01:48,600 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:48,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:48,768 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-05-16 09:01:49,012 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:49,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:49,198 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-05-16 09:01:49,442 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:49,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:49,616 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-05-16 09:01:49,618 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-05-16 09:01:49,863 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:50,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:50,035 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-05-16 09:01:50,279 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:50,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:50,447 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-05-16 09:01:50,691 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:50,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:50,874 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-05-16 09:01:50,876 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-05-16 09:01:51,120 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:51,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:51,283 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-05-16 09:01:51,285 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-05-16 09:01:51,529 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:51,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:51,726 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-05-16 09:01:51,728 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-05-16 09:01:51,972 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:52,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:52,149 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-05-16 09:01:52,151 [ scc.config] DEBUG Found submodule.scripts.url
2025-05-16 09:01:52,395 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 09:01:52,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 09:01:52,580 [ scc.config] DEBUG Found submodule.scripts.branch
2025-05-16 09:01:52,580 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-16 09:01:52,677 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f34e60b0bd0> has local changes
2025-05-16 09:01:52,677 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
- PR 71 dominikl 'Escape slash character in image names'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
Updating 11d3587..5b2ca82
Previously merged:
- PR 171 will-moore 'Initial addition of integration tests'
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 167 dominikl 'Add extinfo command'
Repository: ome/omero-figure
Excluded PRs:
- PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
- PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..3e8fa730
Previously merged:
- PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
- PR 635 dependabot[bot] 'Bump esbuild and vite'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
- PR 76 will-moore 'Run cli deps'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#423 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/423/)'
2025-05-16 09:01:52,691 [ scc.git] DEBUG [detached HEAD 2d55d5c] merge master -Dorg -Ssuccess-only
2025-05-16 09:01:52,691 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-05-16 09:01:52,691 [ scc.merge] INFO Repository: ome/omero-plugins
2025-05-16 09:01:52,691 [ scc.merge] INFO Already up to date.
2025-05-16 09:01:52,691 [ scc.merge] INFO
2025-05-16 09:01:52,691 [ scc.merge] INFO Merged PRs:
2025-05-16 09:01:52,691 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-05-16 09:01:52,691 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-05-16 09:01:52,691 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-05-16 09:01:52,691 [ scc.merge] INFO
2025-05-16 09:01:52,691 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-05-16 09:01:52,691 [ scc.merge] INFO Already up to date.
2025-05-16 09:01:52,691 [ scc.merge] INFO
2025-05-16 09:01:52,691 [ scc.merge] INFO
2025-05-16 09:01:52,691 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-05-16 09:01:52,691 [ scc.merge] INFO Excluded PRs:
2025-05-16 09:01:52,691 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-05-16 09:01:52,691 [ scc.merge] INFO Already up to date.
2025-05-16 09:01:52,691 [ scc.merge] INFO
2025-05-16 09:01:52,691 [ scc.merge] INFO
2025-05-16 09:01:52,691 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-05-16 09:01:52,691 [ scc.merge] INFO Excluded PRs:
2025-05-16 09:01:52,691 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-05-16 09:01:52,691 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-05-16 09:01:52,692 [ scc.merge] INFO Already up to date.
2025-05-16 09:01:52,692 [ scc.merge] INFO
2025-05-16 09:01:52,692 [ scc.merge] INFO Merged PRs:
2025-05-16 09:01:52,692 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-05-16 09:01:52,692 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-05-16 09:01:52,692 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-05-16 09:01:52,692 [ scc.merge] INFO
2025-05-16 09:01:52,692 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-05-16 09:01:52,692 [ scc.merge] INFO Excluded PRs:
2025-05-16 09:01:52,692 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-05-16 09:01:52,692 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-05-16 09:01:52,692 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-05-16 09:01:52,692 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-16 09:01:52,692 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-05-16 09:01:52,692 [ scc.merge] INFO Updating 11d3587..5b2ca82
2025-05-16 09:01:52,692 [ scc.merge] INFO Previously merged:
2025-05-16 09:01:52,692 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-05-16 09:01:52,692 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-16 09:01:52,692 [ scc.merge] INFO
2025-05-16 09:01:52,692 [ scc.merge] INFO Merged PRs:
2025-05-16 09:01:52,692 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-05-16 09:01:52,692 [ scc.merge] INFO
2025-05-16 09:01:52,692 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-16 09:01:52,692 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-05-16 09:01:52,692 [ scc.merge] INFO
2025-05-16 09:01:52,692 [ scc.merge] INFO Repository: ome/omero-figure
2025-05-16 09:01:52,692 [ scc.merge] INFO Excluded PRs:
2025-05-16 09:01:52,692 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-05-16 09:01:52,692 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-05-16 09:01:52,692 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-05-16 09:01:52,692 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-05-16 09:01:52,692 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-05-16 09:01:52,692 [ scc.merge] INFO Previously merged:
2025-05-16 09:01:52,692 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-05-16 09:01:52,692 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-05-16 09:01:52,692 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-05-16 09:01:52,692 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-16 09:01:52,692 [ scc.merge] INFO
2025-05-16 09:01:52,693 [ scc.merge] INFO Merged PRs:
2025-05-16 09:01:52,693 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-05-16 09:01:52,693 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-05-16 09:01:52,693 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-05-16 09:01:52,693 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-05-16 09:01:52,693 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-05-16 09:01:52,693 [ scc.merge] INFO
2025-05-16 09:01:52,693 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-16 09:01:52,693 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-05-16 09:01:52,693 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-05-16 09:01:52,693 [ scc.merge] INFO
2025-05-16 09:01:52,693 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-05-16 09:01:52,693 [ scc.merge] INFO Already up to date.
2025-05-16 09:01:52,693 [ scc.merge] INFO
2025-05-16 09:01:52,693 [ scc.merge] INFO Merged PRs:
2025-05-16 09:01:52,693 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-05-16 09:01:52,693 [ scc.merge] INFO
2025-05-16 09:01:52,693 [ scc.merge] INFO Repository: ome/omero-gallery
2025-05-16 09:01:52,693 [ scc.merge] INFO Already up to date.
2025-05-16 09:01:52,693 [ scc.merge] INFO
2025-05-16 09:01:52,693 [ scc.merge] INFO Merged PRs:
2025-05-16 09:01:52,693 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-05-16 09:01:52,693 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-05-16 09:01:52,693 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-05-16 09:01:52,693 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-05-16 09:01:52,693 [ scc.merge] INFO
2025-05-16 09:01:52,693 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-16 09:01:52,693 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-05-16 09:01:52,693 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-05-16 09:01:52,693 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-05-16 09:01:52,693 [ scc.merge] INFO
2025-05-16 09:01:52,693 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-05-16 09:01:52,693 [ scc.merge] INFO Excluded PRs:
2025-05-16 09:01:52,693 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-05-16 09:01:52,693 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-05-16 09:01:52,693 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-05-16 09:01:52,693 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-05-16 09:01:52,693 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-05-16 09:01:52,694 [ scc.merge] INFO Already up to date.
2025-05-16 09:01:52,694 [ scc.merge] INFO
2025-05-16 09:01:52,694 [ scc.merge] INFO Merged PRs:
2025-05-16 09:01:52,694 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-05-16 09:01:52,694 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-05-16 09:01:52,694 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-05-16 09:01:52,694 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-05-16 09:01:52,694 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-16 09:01:52,694 [ scc.merge] INFO
2025-05-16 09:01:52,694 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-16 09:01:52,694 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-05-16 09:01:52,694 [ scc.merge] INFO
2025-05-16 09:01:52,694 [ scc.merge] INFO Repository: ome/omero-mapr
2025-05-16 09:01:52,694 [ scc.merge] INFO Excluded PRs:
2025-05-16 09:01:52,694 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-05-16 09:01:52,694 [ scc.merge] INFO Already up to date.
2025-05-16 09:01:52,694 [ scc.merge] INFO
2025-05-16 09:01:52,694 [ scc.merge] INFO Merged PRs:
2025-05-16 09:01:52,694 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-05-16 09:01:52,694 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-16 09:01:52,694 [ scc.merge] INFO
2025-05-16 09:01:52,694 [ scc.merge] INFO Repository: ome/omero-metadata
2025-05-16 09:01:52,694 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-05-16 09:01:52,694 [ scc.merge] INFO Previously merged:
2025-05-16 09:01:52,694 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-16 09:01:52,695 [ scc.merge] INFO
2025-05-16 09:01:52,695 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-16 09:01:52,695 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-16 09:01:52,695 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-16 09:01:52,695 [ scc.merge] INFO
2025-05-16 09:01:52,695 [ scc.merge] INFO Repository: ome/omero-parade
2025-05-16 09:01:52,695 [ scc.merge] INFO Excluded PRs:
2025-05-16 09:01:52,695 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-05-16 09:01:52,695 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-05-16 09:01:52,695 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-05-16 09:01:52,695 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-05-16 09:01:52,695 [ scc.merge] INFO Already up to date.
2025-05-16 09:01:52,695 [ scc.merge] INFO
2025-05-16 09:01:52,695 [ scc.merge] INFO Merged PRs:
2025-05-16 09:01:52,695 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-16 09:01:52,695 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-16 09:01:52,695 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-16 09:01:52,695 [ scc.merge] INFO
2025-05-16 09:01:52,695 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-05-16 09:01:52,695 [ scc.merge] INFO Already up to date.
2025-05-16 09:01:52,695 [ scc.merge] INFO
2025-05-16 09:01:52,695 [ scc.merge] INFO
2025-05-16 09:01:52,695 [ scc.merge] INFO Repository: ome/omero-rois
2025-05-16 09:01:52,695 [ scc.merge] INFO Excluded PRs:
2025-05-16 09:01:52,695 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-05-16 09:01:52,695 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-16 09:01:52,695 [ scc.merge] INFO Already up to date.
2025-05-16 09:01:52,695 [ scc.merge] INFO
2025-05-16 09:01:52,695 [ scc.merge] INFO
2025-05-16 09:01:52,695 [ scc.merge] INFO Repository: ome/omero-signup
2025-05-16 09:01:52,695 [ scc.merge] INFO Already up to date.
2025-05-16 09:01:52,695 [ scc.merge] INFO
2025-05-16 09:01:52,695 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-16 09:01:52,695 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-16 09:01:52,695 [ scc.merge] INFO
2025-05-16 09:01:52,695 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-05-16 09:01:52,695 [ scc.merge] INFO Excluded PRs:
2025-05-16 09:01:52,696 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-05-16 09:01:52,696 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-05-16 09:01:52,696 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-05-16 09:01:52,696 [ scc.merge] INFO Already up to date.
2025-05-16 09:01:52,696 [ scc.merge] INFO
2025-05-16 09:01:52,696 [ scc.merge] INFO Merged PRs:
2025-05-16 09:01:52,696 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-16 09:01:52,696 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-05-16 09:01:52,696 [ scc.merge] INFO
2025-05-16 09:01:52,696 [ scc.merge] INFO Repository: ome/omero-upload
2025-05-16 09:01:52,696 [ scc.merge] INFO Already up to date.
2025-05-16 09:01:52,696 [ scc.merge] INFO
2025-05-16 09:01:52,696 [ scc.merge] INFO
2025-05-16 09:01:52,696 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-05-16 09:01:52,696 [ scc.merge] INFO Already up to date.
2025-05-16 09:01:52,696 [ scc.merge] INFO
2025-05-16 09:01:52,696 [ scc.merge] INFO Merged PRs:
2025-05-16 09:01:52,696 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-05-16 09:01:52,696 [ scc.merge] INFO
2025-05-16 09:01:52,696 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-05-16 09:01:52,696 [ scc.merge] INFO Excluded PRs:
2025-05-16 09:01:52,696 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-05-16 09:01:52,696 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-05-16 09:01:52,696 [ scc.merge] INFO Already up to date.
2025-05-16 09:01:52,696 [ scc.merge] INFO
2025-05-16 09:01:52,696 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-16 09:01:52,696 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-16 09:01:52,696 [ scc.merge] INFO
2025-05-16 09:01:52,696 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-05-16 09:01:52,696 [ scc.merge] INFO Already up to date.
2025-05-16 09:01:52,696 [ scc.merge] INFO
2025-05-16 09:01:52,696 [ scc.merge] INFO
2025-05-16 09:01:52,696 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-05-16 09:01:52,696 [ scc.merge] INFO Already up to date.
2025-05-16 09:01:52,696 [ scc.merge] INFO
2025-05-16 09:01:52,696 [ scc.merge] INFO
2025-05-16 09:01:52,696 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-05-16 09:01:52,696 [ scc.merge] INFO Already up to date.
2025-05-16 09:01:52,696 [ scc.merge] INFO
2025-05-16 09:01:52,697 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-16 09:01:52,697 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-05-16 09:01:52,697 [ scc.merge] INFO
2025-05-16 09:01:52,697 [ scc.merge] INFO Repository: ome/scripts
2025-05-16 09:01:52,697 [ scc.merge] INFO Excluded PRs:
2025-05-16 09:01:52,697 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-05-16 09:01:52,697 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-05-16 09:01:52,697 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-05-16 09:01:52,697 [ scc.merge] INFO Previously merged:
2025-05-16 09:01:52,697 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-05-16 09:01:52,697 [ scc.merge] INFO
2025-05-16 09:01:52,697 [ scc.merge] INFO Merged PRs:
2025-05-16 09:01:52,697 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-16 09:01:52,697 [ scc.merge] INFO
2025-05-16 09:01:52,697 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-16 09:01:52,697 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-16 09:01:52,697 [ scc.merge] INFO
2025-05-16 09:01:52,697 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-05-16 09:01:52,697 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 09:01:52,699 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-05-16 09:01:52,699 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 09:01:52,702 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:52,702 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-05-16 09:01:52,702 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 09:01:52,704 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:52,704 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-05-16 09:01:52,704 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 09:01:52,706 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:52,706 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-05-16 09:01:52,706 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 09:01:52,708 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:52,709 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-05-16 09:01:52,709 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 09:01:52,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:52,711 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-05-16 09:01:52,711 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 09:01:52,713 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:52,713 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-05-16 09:01:52,713 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 09:01:52,715 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:52,715 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-05-16 09:01:52,715 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 09:01:52,718 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:52,718 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-16 09:01:52,718 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 09:01:52,720 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:52,720 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-16 09:01:52,720 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 09:01:52,722 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:52,722 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-16 09:01:52,722 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 09:01:52,725 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:52,725 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-16 09:01:52,725 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 09:01:52,727 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:52,727 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-16 09:01:52,727 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 09:01:52,730 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:52,730 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-16 09:01:52,730 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 09:01:52,732 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:52,732 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-16 09:01:52,732 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 09:01:52,734 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:52,734 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-16 09:01:52,734 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 09:01:52,736 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:52,737 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-16 09:01:52,737 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 09:01:52,739 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:52,739 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-16 09:01:52,739 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 09:01:52,741 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:52,741 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-16 09:01:52,741 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 09:01:52,743 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:52,743 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-16 09:01:52,743 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 09:01:52,745 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:52,745 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-16 09:01:52,746 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 09:01:52,748 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 09:01:52,748 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-16 09:01:52,748 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 09:01:52,750 [ 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 0d278ff] 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 30e9ca9] 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-16 09:02:43,475 [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-16 09:02:56,533 [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-16 09:02:59,074 [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-16 09:03:03,900 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-05-16 09:03:59,022 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/9161e9ff/images/svgs/logo.svg){kind=logo}
