Skipping 219 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#428 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/)'
2025-05-19 00:56:37,927 [ scc.git] DEBUG [detached HEAD 1b1d29d] merge master -Dorg -Ssuccess-only
2025-05-19 00:56:37,928 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:56:37,928 [ scc.repo] DEBUG ## PRs found:
2025-05-19 00:56:37,965 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:38,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-05-19 00:56:38,544 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:38,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-05-19 00:56:39,039 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:39,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-19 00:56:39,585 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:39,820 [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-19 00:56:40,072 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:40,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-19 00:56:40,621 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:40,799 [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-19 00:56:40,800 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-19 00:56:41,052 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:41,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-05-19 00:56:41,545 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:41,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-05-19 00:56:42,068 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:42,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-19 00:56:42,574 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:42,785 [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-19 00:56:43,037 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:43,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-19 00:56:43,564 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:43,737 [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-19 00:56:43,738 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-05-19 00:56:43,738 [ scc.repo] DEBUG ## Branches found:
2025-05-19 00:56:43,738 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-19 00:56:43,738 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:56:43,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:56:43,741 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-19 00:56:43,744 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 00:56:43,744 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-19 00:56:43,747 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-19 00:56:43,750 [ scc.git] DEBUG Already up to date.
2025-05-19 00:56:43,750 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-05-19 00:56:44,166 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-19 00:56:44,167 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-05-19 00:56:44,172 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-05-19 00:56:44,473 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-19 00:56:44,473 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-05-19 00:56:44,479 [ scc.git] DEBUG ## Unique users: []
2025-05-19 00:56:44,479 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:56:44,479 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:56:44,482 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-19 00:56:44,487 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:56:44,490 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-19 00:56:44,517 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-19 00:56:44,521 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-05-19 00:56:44,522 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-05-19 00:56:44,522 [ scc.git] DEBUG requirements.txt | 2 +-
2025-05-19 00:56:44,522 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-05-19 00:56:44,523 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:44,523 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-05-19 00:56:44,523 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-05-19 00:56:44,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:56:44,688 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-05-19 00:56:44,694 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:56:44,697 [ 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-19 00:56:44,720 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-19 00:56:44,723 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-19 00:56:44,724 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-19 00:56:44,939 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:45,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:56:45,121 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 00:56:45,164 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:56:45,164 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:56:45,167 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 00:56:45,207 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 00:56:45,211 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8936130750> has no local changes
2025-05-19 00:56:45,212 [ 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#428 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/)'
2025-05-19 00:56:45,226 [ scc.git] DEBUG [detached HEAD 72d37af] merge master -Dorg -Ssuccess-only
2025-05-19 00:56:45,226 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:56:45,226 [ scc.repo] DEBUG ## PRs found:
2025-05-19 00:56:45,373 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:45,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-05-19 00:56:45,912 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:46,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-05-19 00:56:46,409 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:46,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-05-19 00:56:46,937 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:47,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-19 00:56:47,478 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:47,705 [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-19 00:56:47,957 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:48,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-19 00:56:48,499 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:48,683 [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-19 00:56:48,683 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-19 00:56:48,934 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:49,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-05-19 00:56:49,420 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:49,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-05-19 00:56:49,887 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:50,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-19 00:56:50,411 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:50,656 [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-19 00:56:50,908 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:51,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-19 00:56:51,463 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:51,666 [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-19 00:56:51,667 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-19 00:56:51,667 [ scc.repo] DEBUG ## Branches found:
2025-05-19 00:56:51,667 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-19 00:56:51,667 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:56:51,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:56:51,670 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-19 00:56:51,673 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 00:56:51,673 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-19 00:56:51,676 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-19 00:56:51,684 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-05-19 00:56:51,918 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:52,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-05-19 00:56:52,321 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-05-19 00:56:52,919 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-19 00:56:52,919 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-05-19 00:56:52,925 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-05-19 00:56:53,466 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-19 00:56:53,466 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-05-19 00:56:53,471 [ scc.git] DEBUG ## Unique users: []
2025-05-19 00:56:53,471 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:56:53,471 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:56:53,474 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-19 00:56:53,479 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:56:53,481 [ 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-19 00:56:53,754 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-05-19 00:56:53,754 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-05-19 00:56:53,754 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-19 00:56:53,754 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-19 00:56:53,754 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-19 00:56:53,755 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-19 00:56:53,758 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-19 00:56:53,763 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-19 00:56:53,764 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:53,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:56:53,923 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-19 00:56:53,928 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-19 00:56:53,995 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#428](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-05-19 00:56:53,998 [ scc.config] DEBUG Found github.token
2025-05-19 00:56:53,998 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-05-19 00:56:53,998 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-19 00:56:54,003 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:56:54,006 [ 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-19 00:56:54,160 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-19 00:56:54,161 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-19 00:56:54,161 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-05-19 00:56:54,161 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-19 00:56:54,161 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-19 00:56:54,165 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-19 00:56:54,170 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-19 00:56:54,174 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:54,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:56:54,343 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-19 00:56:54,348 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-19 00:56:54,352 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#428](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/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-19 00:56:54,354 [ scc.config] DEBUG Found github.token
2025-05-19 00:56:54,354 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-05-19 00:56:54,354 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 00:56:54,400 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:56:54,401 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:56:54,403 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 00:56:54,444 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 00:56:54,449 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f89360d79d0> has no local changes
2025-05-19 00:56:54,449 [ 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#428 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/)'
2025-05-19 00:56:54,457 [ scc.git] DEBUG [detached HEAD b066d5d] merge master -Dorg -Ssuccess-only
2025-05-19 00:56:54,457 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:56:54,457 [ scc.repo] DEBUG ## PRs found:
2025-05-19 00:56:54,594 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:54,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-05-19 00:56:55,157 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:55,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-05-19 00:56:55,643 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:55,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-19 00:56:56,165 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:56,409 [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-19 00:56:56,661 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:56,871 [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-19 00:56:57,123 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:57,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-19 00:56:57,662 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:57,846 [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-19 00:56:57,847 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-19 00:56:58,098 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:58,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-05-19 00:56:58,328 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-19 00:56:58,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:58,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-19 00:56:59,134 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:59,413 [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-19 00:56:59,665 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:56:59,973 [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-19 00:57:00,226 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:00,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-19 00:57:00,695 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:00,888 [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-19 00:57:00,889 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-19 00:57:01,140 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:01,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-05-19 00:57:01,380 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-19 00:57:01,631 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:01,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-19 00:57:02,212 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:02,459 [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-19 00:57:02,711 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:02,986 [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-19 00:57:03,238 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:03,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-19 00:57:03,813 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:04,010 [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-19 00:57:04,011 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-19 00:57:04,263 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:04,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-05-19 00:57:04,755 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:04,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-05-19 00:57:05,246 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:05,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-05-19 00:57:05,730 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:05,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-05-19 00:57:06,211 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:06,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-05-19 00:57:06,689 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:06,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-05-19 00:57:07,157 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:07,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-05-19 00:57:07,454 [ scc.repo] DEBUG ## Branches found:
2025-05-19 00:57:07,454 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-19 00:57:07,454 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:07,454 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:07,457 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-19 00:57:07,460 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 00:57:07,460 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-19 00:57:07,463 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-19 00:57:07,466 [ scc.git] DEBUG Already up to date.
2025-05-19 00:57:07,467 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-05-19 00:57:07,761 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-19 00:57:07,761 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-05-19 00:57:07,766 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-05-19 00:57:08,071 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-19 00:57:08,071 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-05-19 00:57:08,076 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-05-19 00:57:08,431 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-19 00:57:08,432 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-05-19 00:57:08,437 [ scc.git] DEBUG ## Unique users: []
2025-05-19 00:57:08,437 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:08,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:08,440 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-05-19 00:57:08,443 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:08,445 [ 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-19 00:57:08,454 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-19 00:57:08,458 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-05-19 00:57:08,458 [ scc.git] DEBUG package.json | 2 +-
2025-05-19 00:57:08,458 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-05-19 00:57:08,459 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:08,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:57:08,611 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-05-19 00:57:08,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:08,669 [ 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-19 00:57:08,681 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-19 00:57:08,681 [ scc.git] DEBUG Auto-merging package.json
2025-05-19 00:57:08,732 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-19 00:57:08,736 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-05-19 00:57:08,736 [ scc.git] DEBUG package.json | 2 +-
2025-05-19 00:57:08,736 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-05-19 00:57:08,862 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:09,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:57:09,029 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-05-19 00:57:09,033 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:09,035 [ 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-19 00:57:09,096 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-19 00:57:09,099 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-19 00:57:09,099 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-19 00:57:09,280 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:09,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:57:09,451 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 00:57:09,495 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:09,495 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:09,497 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 00:57:09,539 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 00:57:09,544 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8936d0f6d0> has no local changes
2025-05-19 00:57:09,544 [ 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#428 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/)'
2025-05-19 00:57:09,551 [ scc.git] DEBUG [detached HEAD deec385] merge master -Dorg -Ssuccess-only
2025-05-19 00:57:09,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:57:09,551 [ scc.repo] DEBUG ## PRs found:
2025-05-19 00:57:09,702 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:09,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-05-19 00:57:09,885 [ scc.repo] DEBUG ## Branches found:
2025-05-19 00:57:09,885 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-19 00:57:09,885 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:09,886 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:09,889 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-19 00:57:09,891 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 00:57:09,891 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-19 00:57:09,894 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-19 00:57:09,898 [ scc.git] DEBUG Already up to date.
2025-05-19 00:57:09,898 [ scc.git] DEBUG ## Unique users: []
2025-05-19 00:57:09,898 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:09,898 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:09,901 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 00:57:09,940 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:09,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:09,943 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 00:57:09,982 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 00:57:09,986 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f89360d7850> has no local changes
2025-05-19 00:57:09,986 [ 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#428 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/)'
2025-05-19 00:57:09,994 [ scc.git] DEBUG [detached HEAD 1f59969] merge master -Dorg -Ssuccess-only
2025-05-19 00:57:09,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:57:09,994 [ scc.repo] DEBUG ## PRs found:
2025-05-19 00:57:10,137 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:10,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-05-19 00:57:10,682 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:10,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-05-19 00:57:11,217 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:11,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-05-19 00:57:11,698 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:11,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-05-19 00:57:11,939 [ scc.repo] DEBUG ## Branches found:
2025-05-19 00:57:11,939 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-19 00:57:11,939 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:11,939 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:11,942 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-19 00:57:11,944 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 00:57:11,945 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-19 00:57:11,948 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-19 00:57:11,951 [ scc.git] DEBUG Already up to date.
2025-05-19 00:57:11,951 [ scc.git] DEBUG ## Unique users: []
2025-05-19 00:57:11,951 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:11,951 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:11,953 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 00:57:11,993 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:11,994 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:11,996 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 00:57:12,035 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 00:57:12,039 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8927f2b4d0> has no local changes
2025-05-19 00:57:12,039 [ 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#428 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/)'
2025-05-19 00:57:12,095 [ scc.git] DEBUG [detached HEAD 3346cfe] merge master -Dorg -Ssuccess-only
2025-05-19 00:57:12,095 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:57:12,095 [ scc.repo] DEBUG ## PRs found:
2025-05-19 00:57:12,189 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:12,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-05-19 00:57:12,743 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:12,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-05-19 00:57:13,232 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:13,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-05-19 00:57:13,699 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:14,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-19 00:57:14,275 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:14,492 [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-19 00:57:14,744 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:15,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-19 00:57:15,305 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:15,485 [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-19 00:57:15,486 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-19 00:57:15,486 [ scc.repo] DEBUG ## Branches found:
2025-05-19 00:57:15,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-19 00:57:15,486 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:15,486 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:15,489 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-19 00:57:15,491 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 00:57:15,491 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-19 00:57:15,495 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-19 00:57:15,498 [ scc.git] DEBUG Already up to date.
2025-05-19 00:57:15,498 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-05-19 00:57:15,935 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-05-19 00:57:15,935 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-05-19 00:57:15,941 [ scc.git] DEBUG ## Unique users: []
2025-05-19 00:57:15,941 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:15,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:15,943 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-19 00:57:15,947 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:15,949 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-19 00:57:15,995 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-05-19 00:57:15,995 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-05-19 00:57:15,995 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-05-19 00:57:15,995 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-05-19 00:57:15,995 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-05-19 00:57:15,995 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-05-19 00:57:15,995 [ scc.git] DEBUG Auto-merging setup.py
2025-05-19 00:57:15,995 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-05-19 00:57:15,995 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-19 00:57:15,996 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-19 00:57:15,999 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-19 00:57:16,004 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-05-19 00:57:16,005 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:16,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:57:16,176 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-19 00:57:16,180 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-19 00:57:16,200 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#428](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- setup.py
- omero_signup/views.py
- omero_signup/urls.py
--conflicts
2025-05-19 00:57:16,202 [ scc.config] DEBUG Found github.token
2025-05-19 00:57:16,202 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-05-19 00:57:16,202 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 00:57:16,244 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:16,244 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:16,246 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 00:57:16,288 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 00:57:16,292 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8936309e10> has no local changes
2025-05-19 00:57:16,292 [ 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#428 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/)'
2025-05-19 00:57:16,299 [ scc.git] DEBUG [detached HEAD d50e31b] merge master -Dorg -Ssuccess-only
2025-05-19 00:57:16,299 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:57:16,299 [ scc.repo] DEBUG ## PRs found:
2025-05-19 00:57:16,427 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:16,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-05-19 00:57:17,005 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:17,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-05-19 00:57:17,486 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:17,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-19 00:57:18,060 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:18,288 [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-19 00:57:18,540 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:18,911 [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-19 00:57:19,163 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:19,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-19 00:57:19,639 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:19,837 [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-19 00:57:19,838 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-05-19 00:57:20,089 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:20,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-05-19 00:57:20,583 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:20,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-05-19 00:57:21,058 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:21,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-05-19 00:57:21,560 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:21,777 [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-19 00:57:22,029 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:22,285 [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-19 00:57:22,537 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:22,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-05-19 00:57:23,059 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:23,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-05-19 00:57:23,524 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:23,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-05-19 00:57:23,994 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:24,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-05-19 00:57:24,492 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:24,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-19 00:57:24,975 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:25,167 [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-19 00:57:25,419 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:25,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-19 00:57:26,010 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:26,178 [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-19 00:57:26,179 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-19 00:57:26,179 [ scc.repo] DEBUG ## Branches found:
2025-05-19 00:57:26,179 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-19 00:57:26,179 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:26,179 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:26,183 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-19 00:57:26,185 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 00:57:26,185 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-19 00:57:26,188 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-19 00:57:26,191 [ scc.git] DEBUG Already up to date.
2025-05-19 00:57:26,192 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-05-19 00:57:26,594 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-19 00:57:26,594 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-05-19 00:57:26,600 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-05-19 00:57:26,894 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-19 00:57:26,895 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-05-19 00:57:26,900 [ scc.git] DEBUG ## Unique users: []
2025-05-19 00:57:26,900 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:26,900 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:26,902 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-05-19 00:57:26,907 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:26,910 [ 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-19 00:57:26,927 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-19 00:57:26,931 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-05-19 00:57:26,931 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-05-19 00:57:26,931 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-05-19 00:57:26,931 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-05-19 00:57:26,931 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-05-19 00:57:26,931 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-05-19 00:57:26,931 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-05-19 00:57:26,931 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-05-19 00:57:26,931 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-05-19 00:57:26,931 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-05-19 00:57:26,931 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-05-19 00:57:26,931 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-05-19 00:57:26,931 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-05-19 00:57:26,931 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-05-19 00:57:26,931 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-05-19 00:57:26,932 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:26,932 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-05-19 00:57:26,932 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-05-19 00:57:26,932 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-05-19 00:57:26,933 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-05-19 00:57:26,933 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-05-19 00:57:26,933 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-05-19 00:57:26,933 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-05-19 00:57:26,933 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-05-19 00:57:26,933 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-05-19 00:57:26,933 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-05-19 00:57:26,933 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-05-19 00:57:26,933 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-05-19 00:57:26,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-05-19 00:57:26,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-05-19 00:57:26,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-05-19 00:57:26,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-05-19 00:57:26,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-05-19 00:57:26,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-05-19 00:57:26,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-05-19 00:57:26,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-05-19 00:57:26,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-05-19 00:57:26,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-05-19 00:57:26,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-05-19 00:57:26,933 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-05-19 00:57:26,933 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-05-19 00:57:26,933 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-05-19 00:57:26,933 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-05-19 00:57:26,933 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-05-19 00:57:26,933 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-05-19 00:57:26,933 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-05-19 00:57:27,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:57:27,097 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-19 00:57:27,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:27,105 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-19 00:57:27,173 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-19 00:57:27,177 [ scc.git] DEBUG docker | 1 +
2025-05-19 00:57:27,177 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-05-19 00:57:27,348 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:27,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:57:27,516 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 00:57:27,558 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:27,558 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:27,561 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 00:57:27,602 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 00:57:27,607 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f893614ab10> has no local changes
2025-05-19 00:57:27,607 [ 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#428 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/)'
2025-05-19 00:57:27,614 [ scc.git] DEBUG [detached HEAD aadb665] merge master -Dorg -Ssuccess-only
2025-05-19 00:57:27,614 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:57:27,614 [ scc.repo] DEBUG ## PRs found:
2025-05-19 00:57:27,767 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:27,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-05-19 00:57:27,941 [ scc.repo] DEBUG ## Branches found:
2025-05-19 00:57:27,941 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-19 00:57:27,941 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:27,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:27,944 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-19 00:57:27,947 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 00:57:27,947 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-19 00:57:27,950 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-19 00:57:27,953 [ scc.git] DEBUG Already up to date.
2025-05-19 00:57:27,953 [ scc.git] DEBUG ## Unique users: []
2025-05-19 00:57:27,953 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:27,953 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:27,955 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 00:57:27,999 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:27,999 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:28,002 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 00:57:28,045 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 00:57:28,049 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f89361486d0> has no local changes
2025-05-19 00:57:28,049 [ 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#428 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/)'
2025-05-19 00:57:28,056 [ scc.git] DEBUG [detached HEAD 87c9d20] merge master -Dorg -Ssuccess-only
2025-05-19 00:57:28,056 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:57:28,056 [ scc.repo] DEBUG ## PRs found:
2025-05-19 00:57:28,192 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:28,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-05-19 00:57:29,123 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:29,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-05-19 00:57:29,590 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:29,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-05-19 00:57:30,060 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:30,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-19 00:57:30,589 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:30,833 [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-19 00:57:31,085 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:31,334 [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-19 00:57:31,586 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:31,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-19 00:57:32,044 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:32,222 [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-19 00:57:32,223 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-05-19 00:57:32,223 [ scc.repo] DEBUG ## Branches found:
2025-05-19 00:57:32,223 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-19 00:57:32,223 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:32,223 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:32,226 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-19 00:57:32,228 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 00:57:32,229 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-19 00:57:32,231 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-19 00:57:32,234 [ scc.git] DEBUG Already up to date.
2025-05-19 00:57:32,235 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-05-19 00:57:32,748 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-05-19 00:57:32,748 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-05-19 00:57:32,753 [ scc.git] DEBUG ## Unique users: []
2025-05-19 00:57:32,753 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:32,753 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:32,756 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-05-19 00:57:32,759 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:32,762 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-05-19 00:57:32,826 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-19 00:57:32,829 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-05-19 00:57:32,829 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-05-19 00:57:32,829 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-05-19 00:57:32,829 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-05-19 00:57:32,829 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-05-19 00:57:32,830 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:32,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:57:32,991 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 00:57:33,035 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:33,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:33,037 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 00:57:33,080 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 00:57:33,084 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8927f65c50> has no local changes
2025-05-19 00:57:33,084 [ 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#428 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/)'
2025-05-19 00:57:33,091 [ scc.git] DEBUG [detached HEAD 1b77c28] merge master -Dorg -Ssuccess-only
2025-05-19 00:57:33,091 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:57:33,091 [ scc.git] INFO Overriding base-branch from master to main
2025-05-19 00:57:33,091 [ scc.repo] DEBUG ## PRs found:
2025-05-19 00:57:33,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:33,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-05-19 00:57:33,754 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:34,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-05-19 00:57:34,284 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:34,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-05-19 00:57:34,788 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:35,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-05-19 00:57:35,345 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:35,580 [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-19 00:57:35,832 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:36,074 [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-19 00:57:36,325 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:36,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-05-19 00:57:36,813 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:37,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-05-19 00:57:37,285 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:37,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-05-19 00:57:37,764 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:38,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-19 00:57:38,300 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:38,497 [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-19 00:57:38,749 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:38,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-19 00:57:39,234 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:39,423 [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-19 00:57:39,424 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-19 00:57:39,424 [ scc.repo] DEBUG ## Branches found:
2025-05-19 00:57:39,424 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-19 00:57:39,424 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:39,424 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:39,427 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-05-19 00:57:39,430 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 00:57:39,430 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-05-19 00:57:39,433 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-05-19 00:57:39,436 [ scc.git] DEBUG Already up to date.
2025-05-19 00:57:39,436 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-05-19 00:57:39,735 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-05-19 00:57:39,735 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-05-19 00:57:39,740 [ scc.git] DEBUG ## Unique users: []
2025-05-19 00:57:39,740 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:39,740 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:39,743 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-19 00:57:39,746 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:39,749 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-19 00:57:39,895 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-05-19 00:57:39,895 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-05-19 00:57:39,895 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-19 00:57:39,895 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-19 00:57:39,899 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-19 00:57:39,903 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-05-19 00:57:39,905 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:40,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:57:40,069 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-19 00:57:40,073 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-19 00:57:40,076 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#428](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-05-19 00:57:40,079 [ scc.config] DEBUG Found github.token
2025-05-19 00:57:40,079 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-05-19 00:57:40,079 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 00:57:40,121 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:40,121 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:40,123 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 00:57:40,165 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 00:57:40,172 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8927f4cd90> has no local changes
2025-05-19 00:57:40,172 [ 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#428 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/)'
2025-05-19 00:57:40,179 [ scc.git] DEBUG [detached HEAD 853232a] merge master -Dorg -Ssuccess-only
2025-05-19 00:57:40,179 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:57:40,179 [ scc.repo] DEBUG ## PRs found:
2025-05-19 00:57:40,320 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:40,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-05-19 00:57:40,530 [ scc.repo] DEBUG ## Branches found:
2025-05-19 00:57:40,530 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-19 00:57:40,530 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:40,530 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:40,533 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-19 00:57:40,536 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 00:57:40,536 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-19 00:57:40,539 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-19 00:57:40,542 [ scc.git] DEBUG Already up to date.
2025-05-19 00:57:40,542 [ scc.git] DEBUG ## Unique users: []
2025-05-19 00:57:40,542 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:40,542 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:40,545 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 00:57:40,586 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:40,586 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:40,588 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 00:57:40,627 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 00:57:40,630 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f893614b550> has no local changes
2025-05-19 00:57:40,630 [ 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#428 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/)'
2025-05-19 00:57:40,637 [ scc.git] DEBUG [detached HEAD 0aac989] merge master -Dorg -Ssuccess-only
2025-05-19 00:57:40,637 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:57:40,637 [ scc.repo] DEBUG ## PRs found:
2025-05-19 00:57:40,781 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:40,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-05-19 00:57:40,955 [ scc.repo] DEBUG ## Branches found:
2025-05-19 00:57:40,955 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-19 00:57:40,955 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:40,955 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:40,958 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-19 00:57:40,961 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 00:57:40,961 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-19 00:57:40,964 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-19 00:57:40,967 [ scc.git] DEBUG Already up to date.
2025-05-19 00:57:40,967 [ scc.git] DEBUG ## Unique users: []
2025-05-19 00:57:40,967 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:40,967 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:40,969 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 00:57:41,010 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:41,010 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:41,012 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 00:57:41,052 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 00:57:41,056 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8936149b10> has no local changes
2025-05-19 00:57:41,056 [ 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#428 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/)'
2025-05-19 00:57:41,062 [ scc.git] DEBUG [detached HEAD be3e08e] merge master -Dorg -Ssuccess-only
2025-05-19 00:57:41,063 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:57:41,063 [ scc.repo] DEBUG ## PRs found:
2025-05-19 00:57:41,206 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:41,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-05-19 00:57:41,748 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:42,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-05-19 00:57:42,287 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:42,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-05-19 00:57:42,769 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:43,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-19 00:57:43,328 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:43,554 [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-19 00:57:43,806 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:44,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-19 00:57:44,325 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:44,530 [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-19 00:57:44,531 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-05-19 00:57:44,531 [ scc.repo] DEBUG ## Branches found:
2025-05-19 00:57:44,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-19 00:57:44,531 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:44,531 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:44,534 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-19 00:57:44,537 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 00:57:44,537 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-19 00:57:44,540 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-19 00:57:44,543 [ scc.git] DEBUG Already up to date.
2025-05-19 00:57:44,543 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-05-19 00:57:44,842 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-05-19 00:57:44,842 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-05-19 00:57:44,847 [ scc.git] DEBUG ## Unique users: []
2025-05-19 00:57:44,847 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:44,847 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:44,850 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-19 00:57:44,853 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:44,855 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-19 00:57:45,060 [ scc.git] DEBUG Auto-merging Dockerfile
2025-05-19 00:57:45,060 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-05-19 00:57:45,060 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-19 00:57:45,061 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-19 00:57:45,064 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-19 00:57:45,069 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-05-19 00:57:45,071 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:45,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:57:45,240 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-19 00:57:45,244 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-19 00:57:45,247 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#428](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-05-19 00:57:45,249 [ scc.config] DEBUG Found github.token
2025-05-19 00:57:45,249 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-05-19 00:57:45,249 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 00:57:45,290 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:45,290 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:45,292 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 00:57:45,333 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 00:57:45,337 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8927f98090> has no local changes
2025-05-19 00:57:45,337 [ 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#428 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/)'
2025-05-19 00:57:45,344 [ scc.git] DEBUG [detached HEAD a4ff185] merge master -Dorg -Ssuccess-only
2025-05-19 00:57:45,345 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:57:45,345 [ scc.git] INFO Overriding base-branch from master to develop
2025-05-19 00:57:45,345 [ scc.repo] DEBUG ## PRs found:
2025-05-19 00:57:45,491 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:45,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-05-19 00:57:46,056 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:46,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-05-19 00:57:46,543 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:46,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-05-19 00:57:47,003 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:47,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-19 00:57:47,474 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:47,692 [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-19 00:57:47,944 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:48,183 [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-19 00:57:48,435 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:48,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-19 00:57:48,881 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:49,071 [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-19 00:57:49,072 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-19 00:57:49,324 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:49,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-05-19 00:57:49,812 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:50,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-05-19 00:57:50,264 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:50,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-19 00:57:50,807 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:51,003 [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-19 00:57:51,255 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:51,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-19 00:57:51,717 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:51,907 [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-19 00:57:51,908 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-19 00:57:52,159 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:52,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-05-19 00:57:52,674 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:52,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-05-19 00:57:53,228 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:53,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-05-19 00:57:53,725 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:54,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-05-19 00:57:54,024 [ scc.repo] DEBUG ## Branches found:
2025-05-19 00:57:54,025 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-19 00:57:54,025 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:54,025 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:54,028 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-05-19 00:57:54,030 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 00:57:54,030 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-05-19 00:57:54,033 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-05-19 00:57:54,041 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-05-19 00:57:54,275 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:54,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-05-19 00:57:54,663 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-05-19 00:57:55,036 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-19 00:57:55,036 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-05-19 00:57:55,040 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-05-19 00:57:55,350 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-19 00:57:55,350 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-05-19 00:57:55,354 [ scc.git] DEBUG ## Unique users: []
2025-05-19 00:57:55,354 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:55,354 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:55,357 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-19 00:57:55,363 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:55,366 [ 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-19 00:57:55,518 [ 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-19 00:57:55,518 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-19 00:57:55,519 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-19 00:57:55,522 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-19 00:57:55,526 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-05-19 00:57:55,528 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:55,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:57:55,698 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-19 00:57:55,704 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-19 00:57:55,708 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#428](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-05-19 00:57:55,711 [ scc.config] DEBUG Found github.token
2025-05-19 00:57:55,711 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-05-19 00:57:55,711 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-05-19 00:57:55,716 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:55,718 [ 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-19 00:57:55,730 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-19 00:57:55,733 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-05-19 00:57:55,733 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-05-19 00:57:55,949 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:56,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:57:56,109 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 00:57:56,154 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 00:57:56,154 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 00:57:56,156 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 00:57:56,199 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 00:57:56,203 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8936130950> has no local changes
2025-05-19 00:57:56,204 [ 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#428 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/)'
2025-05-19 00:57:56,211 [ scc.git] DEBUG [detached HEAD 10396a1] merge master -Dorg -Ssuccess-only
2025-05-19 00:57:56,211 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:57:56,211 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 00:57:56,295 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-05-19 00:57:56,360 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:56,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:57:56,563 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-05-19 00:57:56,565 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-05-19 00:57:56,809 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:56,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:57:56,978 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-05-19 00:57:56,980 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-05-19 00:57:57,224 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:57,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:57:57,419 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-05-19 00:57:57,421 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-05-19 00:57:57,664 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:57,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:57:57,839 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-05-19 00:57:58,083 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:58,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:57:58,250 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-05-19 00:57:58,252 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-05-19 00:57:58,496 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:58,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:57:58,658 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-05-19 00:57:58,660 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-05-19 00:57:58,903 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:59,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:57:59,076 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-05-19 00:57:59,079 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-05-19 00:57:59,321 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:59,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:57:59,488 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-05-19 00:57:59,490 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-05-19 00:57:59,733 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:57:59,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:57:59,909 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-05-19 00:57:59,911 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-05-19 00:58:00,155 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:58:00,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:58:00,324 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-05-19 00:58:00,326 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-05-19 00:58:00,569 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:58:00,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:58:00,733 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-05-19 00:58:00,735 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-05-19 00:58:00,978 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:58:01,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:58:01,150 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-05-19 00:58:01,153 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-05-19 00:58:01,396 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:58:01,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:58:01,563 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-05-19 00:58:01,807 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:58:01,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:58:01,985 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-05-19 00:58:02,229 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:58:02,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:58:02,400 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-05-19 00:58:02,402 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-05-19 00:58:02,646 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:58:02,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:58:02,821 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-05-19 00:58:03,064 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:58:03,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:58:03,234 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-05-19 00:58:03,477 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:58:03,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:58:03,641 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-05-19 00:58:03,644 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-05-19 00:58:03,887 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:58:04,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:58:04,059 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-05-19 00:58:04,061 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-05-19 00:58:04,305 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:58:04,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:58:04,493 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-05-19 00:58:04,495 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-05-19 00:58:04,738 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:58:04,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:58:04,927 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-05-19 00:58:04,929 [ scc.config] DEBUG Found submodule.scripts.url
2025-05-19 00:58:05,173 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 00:58:05,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 00:58:05,379 [ scc.config] DEBUG Found submodule.scripts.branch
2025-05-19 00:58:05,379 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 00:58:05,476 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f893615c1d0> has local changes
2025-05-19 00:58:05,476 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
- PR 71 dominikl 'Escape slash character in image names'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 167 dominikl 'Add extinfo command' (status: failure)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
Updating 11d3587..5b2ca82
Previously merged:
- PR 171 will-moore 'Initial addition of integration tests'
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 147 will-moore 'Name option'
Repository: ome/omero-figure
Excluded PRs:
- PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
- PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..3e8fa730
Previously merged:
- PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
- PR 635 dependabot[bot] 'Bump esbuild and vite'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
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#428 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/428/)'
2025-05-19 00:58:05,515 [ scc.git] DEBUG [detached HEAD 0898fec] merge master -Dorg -Ssuccess-only
2025-05-19 00:58:05,515 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-05-19 00:58:05,516 [ scc.merge] INFO Repository: ome/omero-plugins
2025-05-19 00:58:05,516 [ scc.merge] INFO Already up to date.
2025-05-19 00:58:05,516 [ scc.merge] INFO
2025-05-19 00:58:05,516 [ scc.merge] INFO Merged PRs:
2025-05-19 00:58:05,516 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-05-19 00:58:05,516 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-05-19 00:58:05,516 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-05-19 00:58:05,516 [ scc.merge] INFO
2025-05-19 00:58:05,516 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-05-19 00:58:05,516 [ scc.merge] INFO Already up to date.
2025-05-19 00:58:05,516 [ scc.merge] INFO
2025-05-19 00:58:05,516 [ scc.merge] INFO
2025-05-19 00:58:05,516 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-05-19 00:58:05,516 [ scc.merge] INFO Excluded PRs:
2025-05-19 00:58:05,516 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-05-19 00:58:05,516 [ scc.merge] INFO Already up to date.
2025-05-19 00:58:05,516 [ scc.merge] INFO
2025-05-19 00:58:05,516 [ scc.merge] INFO
2025-05-19 00:58:05,516 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-05-19 00:58:05,516 [ scc.merge] INFO Excluded PRs:
2025-05-19 00:58:05,516 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-05-19 00:58:05,516 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-05-19 00:58:05,516 [ scc.merge] INFO Already up to date.
2025-05-19 00:58:05,516 [ scc.merge] INFO
2025-05-19 00:58:05,516 [ scc.merge] INFO Merged PRs:
2025-05-19 00:58:05,516 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-05-19 00:58:05,516 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-05-19 00:58:05,516 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-05-19 00:58:05,517 [ scc.merge] INFO
2025-05-19 00:58:05,517 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-05-19 00:58:05,517 [ scc.merge] INFO Excluded PRs:
2025-05-19 00:58:05,517 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-05-19 00:58:05,517 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-05-19 00:58:05,517 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (status: failure)
2025-05-19 00:58:05,517 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-05-19 00:58:05,517 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-19 00:58:05,517 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-05-19 00:58:05,517 [ scc.merge] INFO Updating 11d3587..5b2ca82
2025-05-19 00:58:05,517 [ scc.merge] INFO Previously merged:
2025-05-19 00:58:05,517 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-05-19 00:58:05,517 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-19 00:58:05,517 [ scc.merge] INFO
2025-05-19 00:58:05,517 [ scc.merge] INFO Merged PRs:
2025-05-19 00:58:05,517 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-05-19 00:58:05,517 [ scc.merge] INFO
2025-05-19 00:58:05,517 [ scc.merge] INFO Repository: ome/omero-figure
2025-05-19 00:58:05,517 [ scc.merge] INFO Excluded PRs:
2025-05-19 00:58:05,517 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-05-19 00:58:05,517 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-05-19 00:58:05,517 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-05-19 00:58:05,517 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-05-19 00:58:05,517 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-05-19 00:58:05,517 [ scc.merge] INFO Previously merged:
2025-05-19 00:58:05,517 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-05-19 00:58:05,517 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-05-19 00:58:05,517 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-05-19 00:58:05,517 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-19 00:58:05,517 [ scc.merge] INFO
2025-05-19 00:58:05,517 [ scc.merge] INFO Merged PRs:
2025-05-19 00:58:05,517 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-05-19 00:58:05,517 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-05-19 00:58:05,517 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-05-19 00:58:05,517 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-05-19 00:58:05,517 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-05-19 00:58:05,517 [ scc.merge] INFO
2025-05-19 00:58:05,517 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-19 00:58:05,517 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-05-19 00:58:05,517 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-05-19 00:58:05,518 [ scc.merge] INFO
2025-05-19 00:58:05,518 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-05-19 00:58:05,518 [ scc.merge] INFO Already up to date.
2025-05-19 00:58:05,518 [ scc.merge] INFO
2025-05-19 00:58:05,518 [ scc.merge] INFO Merged PRs:
2025-05-19 00:58:05,518 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-05-19 00:58:05,518 [ scc.merge] INFO
2025-05-19 00:58:05,518 [ scc.merge] INFO Repository: ome/omero-gallery
2025-05-19 00:58:05,518 [ scc.merge] INFO Already up to date.
2025-05-19 00:58:05,518 [ scc.merge] INFO
2025-05-19 00:58:05,518 [ scc.merge] INFO Merged PRs:
2025-05-19 00:58:05,518 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-05-19 00:58:05,518 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-05-19 00:58:05,518 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-05-19 00:58:05,518 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-05-19 00:58:05,518 [ scc.merge] INFO
2025-05-19 00:58:05,518 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-19 00:58:05,518 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-05-19 00:58:05,518 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-05-19 00:58:05,518 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-05-19 00:58:05,518 [ scc.merge] INFO
2025-05-19 00:58:05,518 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-05-19 00:58:05,518 [ scc.merge] INFO Excluded PRs:
2025-05-19 00:58:05,518 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-05-19 00:58:05,518 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-05-19 00:58:05,518 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-05-19 00:58:05,518 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-05-19 00:58:05,518 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-05-19 00:58:05,518 [ scc.merge] INFO Already up to date.
2025-05-19 00:58:05,518 [ scc.merge] INFO
2025-05-19 00:58:05,518 [ scc.merge] INFO Merged PRs:
2025-05-19 00:58:05,518 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-05-19 00:58:05,518 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-05-19 00:58:05,518 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-05-19 00:58:05,518 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-05-19 00:58:05,518 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-19 00:58:05,518 [ scc.merge] INFO
2025-05-19 00:58:05,518 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-19 00:58:05,518 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-05-19 00:58:05,518 [ scc.merge] INFO
2025-05-19 00:58:05,518 [ scc.merge] INFO Repository: ome/omero-mapr
2025-05-19 00:58:05,519 [ scc.merge] INFO Excluded PRs:
2025-05-19 00:58:05,519 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-05-19 00:58:05,519 [ scc.merge] INFO Already up to date.
2025-05-19 00:58:05,519 [ scc.merge] INFO
2025-05-19 00:58:05,519 [ scc.merge] INFO Merged PRs:
2025-05-19 00:58:05,519 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-05-19 00:58:05,519 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-19 00:58:05,519 [ scc.merge] INFO
2025-05-19 00:58:05,519 [ scc.merge] INFO Repository: ome/omero-metadata
2025-05-19 00:58:05,519 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-05-19 00:58:05,519 [ scc.merge] INFO Previously merged:
2025-05-19 00:58:05,519 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-19 00:58:05,519 [ scc.merge] INFO
2025-05-19 00:58:05,519 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-19 00:58:05,519 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-19 00:58:05,519 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-19 00:58:05,519 [ scc.merge] INFO
2025-05-19 00:58:05,519 [ scc.merge] INFO Repository: ome/omero-parade
2025-05-19 00:58:05,519 [ scc.merge] INFO Excluded PRs:
2025-05-19 00:58:05,519 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-05-19 00:58:05,519 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-05-19 00:58:05,519 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-05-19 00:58:05,519 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-05-19 00:58:05,519 [ scc.merge] INFO Already up to date.
2025-05-19 00:58:05,519 [ scc.merge] INFO
2025-05-19 00:58:05,519 [ scc.merge] INFO Merged PRs:
2025-05-19 00:58:05,519 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-19 00:58:05,519 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-19 00:58:05,519 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-19 00:58:05,519 [ scc.merge] INFO
2025-05-19 00:58:05,519 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-05-19 00:58:05,519 [ scc.merge] INFO Already up to date.
2025-05-19 00:58:05,519 [ scc.merge] INFO
2025-05-19 00:58:05,519 [ scc.merge] INFO
2025-05-19 00:58:05,519 [ scc.merge] INFO Repository: ome/omero-rois
2025-05-19 00:58:05,519 [ scc.merge] INFO Excluded PRs:
2025-05-19 00:58:05,519 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-05-19 00:58:05,519 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-19 00:58:05,519 [ scc.merge] INFO Already up to date.
2025-05-19 00:58:05,519 [ scc.merge] INFO
2025-05-19 00:58:05,520 [ scc.merge] INFO
2025-05-19 00:58:05,520 [ scc.merge] INFO Repository: ome/omero-signup
2025-05-19 00:58:05,520 [ scc.merge] INFO Already up to date.
2025-05-19 00:58:05,520 [ scc.merge] INFO
2025-05-19 00:58:05,520 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-19 00:58:05,520 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-19 00:58:05,520 [ scc.merge] INFO
2025-05-19 00:58:05,520 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-05-19 00:58:05,520 [ scc.merge] INFO Excluded PRs:
2025-05-19 00:58:05,520 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-05-19 00:58:05,520 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-05-19 00:58:05,520 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-05-19 00:58:05,520 [ scc.merge] INFO Already up to date.
2025-05-19 00:58:05,520 [ scc.merge] INFO
2025-05-19 00:58:05,520 [ scc.merge] INFO Merged PRs:
2025-05-19 00:58:05,520 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-19 00:58:05,520 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-05-19 00:58:05,520 [ scc.merge] INFO
2025-05-19 00:58:05,520 [ scc.merge] INFO Repository: ome/omero-upload
2025-05-19 00:58:05,520 [ scc.merge] INFO Already up to date.
2025-05-19 00:58:05,520 [ scc.merge] INFO
2025-05-19 00:58:05,520 [ scc.merge] INFO
2025-05-19 00:58:05,520 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-05-19 00:58:05,520 [ scc.merge] INFO Already up to date.
2025-05-19 00:58:05,520 [ scc.merge] INFO
2025-05-19 00:58:05,520 [ scc.merge] INFO Merged PRs:
2025-05-19 00:58:05,520 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-05-19 00:58:05,520 [ scc.merge] INFO
2025-05-19 00:58:05,520 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-05-19 00:58:05,520 [ scc.merge] INFO Excluded PRs:
2025-05-19 00:58:05,520 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-05-19 00:58:05,520 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-05-19 00:58:05,520 [ scc.merge] INFO Already up to date.
2025-05-19 00:58:05,520 [ scc.merge] INFO
2025-05-19 00:58:05,520 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-19 00:58:05,520 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-19 00:58:05,520 [ scc.merge] INFO
2025-05-19 00:58:05,520 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-05-19 00:58:05,520 [ scc.merge] INFO Already up to date.
2025-05-19 00:58:05,520 [ scc.merge] INFO
2025-05-19 00:58:05,520 [ scc.merge] INFO
2025-05-19 00:58:05,521 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-05-19 00:58:05,521 [ scc.merge] INFO Already up to date.
2025-05-19 00:58:05,521 [ scc.merge] INFO
2025-05-19 00:58:05,521 [ scc.merge] INFO
2025-05-19 00:58:05,521 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-05-19 00:58:05,521 [ scc.merge] INFO Already up to date.
2025-05-19 00:58:05,521 [ scc.merge] INFO
2025-05-19 00:58:05,521 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-19 00:58:05,521 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-05-19 00:58:05,521 [ scc.merge] INFO
2025-05-19 00:58:05,521 [ scc.merge] INFO Repository: ome/scripts
2025-05-19 00:58:05,521 [ scc.merge] INFO Excluded PRs:
2025-05-19 00:58:05,521 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-05-19 00:58:05,521 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-05-19 00:58:05,521 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-05-19 00:58:05,521 [ scc.merge] INFO Previously merged:
2025-05-19 00:58:05,521 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-05-19 00:58:05,521 [ scc.merge] INFO
2025-05-19 00:58:05,521 [ scc.merge] INFO Merged PRs:
2025-05-19 00:58:05,521 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-19 00:58:05,521 [ scc.merge] INFO
2025-05-19 00:58:05,521 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-19 00:58:05,521 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-19 00:58:05,521 [ scc.merge] INFO
2025-05-19 00:58:05,521 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-05-19 00:58:05,521 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 00:58:05,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-05-19 00:58:05,524 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 00:58:05,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:58:05,526 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-05-19 00:58:05,526 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 00:58:05,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:58:05,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-05-19 00:58:05,529 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 00:58:05,532 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:58:05,532 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-05-19 00:58:05,532 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 00:58:05,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:58:05,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-05-19 00:58:05,534 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 00:58:05,537 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:58:05,537 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-05-19 00:58:05,537 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 00:58:05,539 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:58:05,539 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-05-19 00:58:05,539 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 00:58:05,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:58:05,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-05-19 00:58:05,542 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 00:58:05,544 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:58:05,544 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-19 00:58:05,544 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 00:58:05,546 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:58:05,546 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-19 00:58:05,546 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 00:58:05,549 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:58:05,549 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-19 00:58:05,549 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 00:58:05,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:58:05,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-19 00:58:05,551 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 00:58:05,554 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:58:05,554 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-19 00:58:05,554 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 00:58:05,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:58:05,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-19 00:58:05,556 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 00:58:05,559 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:58:05,559 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-19 00:58:05,559 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 00:58:05,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:58:05,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-19 00:58:05,561 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 00:58:05,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:58:05,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-19 00:58:05,563 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 00:58:05,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:58:05,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-19 00:58:05,566 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 00:58:05,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:58:05,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-19 00:58:05,569 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 00:58:05,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:58:05,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-19 00:58:05,571 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 00:58:05,573 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:58:05,573 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-19 00:58:05,574 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 00:58:05,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 00:58:05,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-19 00:58:05,576 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 00:58:05,578 [ 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 70f9e2b] 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 bb3b3e9] 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-19 00:58:56,438 [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-19 00:59:05,895 [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-19 00:59:08,621 [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-19 00:59:13,454 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-05-19 00:59:57,934 [ 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/daea91b1/images/svgs/logo.svg){kind=logo}
