Console Output
Skipping 199 KB..
Full Log25-05-17 15:03:41,459 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:03:41,462 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 506 (Use the release/v1 branch for the PyPA action publishing to PyPI) 7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-05-17 15:03:41,480 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-17 15:03:41,483 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-17 15:03:41,483 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-17 15:03:41,695 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:41,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:03:41,866 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 15:03:41,908 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:03:41,908 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:03:41,910 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 15:03:41,949 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 15:03:41,956 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08ce2f3d10> has no local changes
2025-05-17 15:03:41,956 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
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#426 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/)'
2025-05-17 15:03:41,966 [ scc.git] DEBUG [detached HEAD 8d7c5cd] merge master -Dorg -Ssuccess-only
2025-05-17 15:03:41,967 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:03:41,967 [ scc.repo] DEBUG ## PRs found:
2025-05-17 15:03:42,117 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:42,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-05-17 15:03:42,649 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:42,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-05-17 15:03:43,140 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:43,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-17 15:03:43,665 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:43,849 [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-17 15:03:44,101 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:44,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-17 15:03:44,667 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:44,859 [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-17 15:03:44,859 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-17 15:03:45,110 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:45,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-05-17 15:03:45,608 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:45,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-05-17 15:03:46,156 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:46,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-17 15:03:46,711 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:46,923 [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-17 15:03:47,175 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:47,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-17 15:03:47,686 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:47,937 [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-17 15:03:47,938 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-05-17 15:03:47,938 [ scc.repo] DEBUG ## Branches found:
2025-05-17 15:03:47,938 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-17 15:03:47,938 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:03:47,938 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:03:47,941 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-17 15:03:47,944 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 15:03:47,944 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-17 15:03:47,947 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-17 15:03:47,951 [ scc.git] DEBUG Already up to date.
2025-05-17 15:03:47,951 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-05-17 15:03:48,254 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-17 15:03:48,254 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-05-17 15:03:48,259 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-05-17 15:03:48,539 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-17 15:03:48,539 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-05-17 15:03:48,544 [ scc.git] DEBUG ## Unique users: []
2025-05-17 15:03:48,544 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:03:48,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:03:48,547 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-17 15:03:48,551 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:03:48,553 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-17 15:03:48,563 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-17 15:03:48,566 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-05-17 15:03:48,566 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-05-17 15:03:48,566 [ scc.git] DEBUG requirements.txt | 2 +-
2025-05-17 15:03:48,566 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-05-17 15:03:48,566 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-05-17 15:03:48,566 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-05-17 15:03:48,568 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:48,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:03:48,748 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-05-17 15:03:48,753 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:03:48,755 [ 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-17 15:03:48,765 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-17 15:03:48,768 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-17 15:03:48,768 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-17 15:03:48,999 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:49,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:03:49,171 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 15:03:49,211 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:03:49,211 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:03:49,214 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 15:03:49,256 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 15:03:49,260 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08ce3b2a10> has no local changes
2025-05-17 15:03:49,260 [ 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#426 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/)'
2025-05-17 15:03:49,267 [ scc.git] DEBUG [detached HEAD 82b2f81] merge master -Dorg -Ssuccess-only
2025-05-17 15:03:49,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:03:49,267 [ scc.repo] DEBUG ## PRs found:
2025-05-17 15:03:49,422 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:49,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-05-17 15:03:49,979 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:50,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-05-17 15:03:50,455 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:50,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-05-17 15:03:51,028 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:51,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-17 15:03:51,546 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:51,768 [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-17 15:03:52,020 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:52,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-17 15:03:52,557 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:52,731 [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-17 15:03:52,731 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-17 15:03:52,982 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:53,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-05-17 15:03:53,505 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:53,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-05-17 15:03:53,975 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:54,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-17 15:03:54,507 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:54,713 [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-17 15:03:54,965 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:55,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-17 15:03:55,420 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:55,604 [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-17 15:03:55,605 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-17 15:03:55,605 [ scc.repo] DEBUG ## Branches found:
2025-05-17 15:03:55,605 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-17 15:03:55,605 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:03:55,605 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:03:55,608 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-17 15:03:55,610 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 15:03:55,610 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-17 15:03:55,614 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-17 15:03:55,622 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-05-17 15:03:55,856 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:56,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-05-17 15:03:56,235 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-05-17 15:03:56,539 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-17 15:03:56,539 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-05-17 15:03:56,543 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-05-17 15:03:56,835 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-17 15:03:56,835 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-05-17 15:03:56,840 [ scc.git] DEBUG ## Unique users: []
2025-05-17 15:03:56,840 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:03:56,840 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:03:56,843 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-17 15:03:56,848 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:03:56,850 [ 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-17 15:03:56,864 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-05-17 15:03:56,864 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-05-17 15:03:56,864 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-17 15:03:56,864 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-17 15:03:56,865 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-17 15:03:56,865 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-17 15:03:56,868 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-17 15:03:56,873 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-17 15:03:56,874 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:57,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:03:57,038 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-17 15:03:57,042 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-17 15:03:57,046 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#426](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-05-17 15:03:57,048 [ scc.config] DEBUG Found github.token
2025-05-17 15:03:57,048 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-05-17 15:03:57,048 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-17 15:03:57,053 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:03:57,055 [ 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-17 15:03:57,070 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-17 15:03:57,070 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-17 15:03:57,070 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-05-17 15:03:57,070 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-17 15:03:57,070 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-17 15:03:57,073 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-17 15:03:57,078 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-17 15:03:57,289 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:57,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:03:57,443 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-17 15:03:57,449 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-17 15:03:57,452 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#426](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/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-17 15:03:57,454 [ scc.config] DEBUG Found github.token
2025-05-17 15:03:57,454 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-05-17 15:03:57,454 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 15:03:57,495 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:03:57,495 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:03:57,497 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 15:03:57,536 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 15:03:57,541 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08ce5d0890> has no local changes
2025-05-17 15:03:57,541 [ 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#426 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/)'
2025-05-17 15:03:57,549 [ scc.git] DEBUG [detached HEAD 0558855] merge master -Dorg -Ssuccess-only
2025-05-17 15:03:57,549 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:03:57,549 [ scc.repo] DEBUG ## PRs found:
2025-05-17 15:03:57,694 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:58,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-05-17 15:03:58,303 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:58,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-05-17 15:03:58,812 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:59,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-17 15:03:59,307 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:03:59,571 [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-17 15:03:59,822 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:00,069 [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-17 15:04:00,321 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:00,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-17 15:04:00,824 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:01,005 [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-17 15:04:01,005 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-17 15:04:01,257 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:01,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-05-17 15:04:01,475 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-17 15:04:01,726 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:02,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-17 15:04:02,297 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:02,568 [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-17 15:04:02,819 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:03,068 [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-17 15:04:03,320 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:03,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-17 15:04:03,848 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:04,041 [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-17 15:04:04,042 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-17 15:04:04,293 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:04,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-05-17 15:04:04,543 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-17 15:04:04,794 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:05,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-17 15:04:05,351 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:05,644 [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-17 15:04:05,896 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:06,173 [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-17 15:04:06,424 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:06,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-17 15:04:06,972 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:07,157 [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-17 15:04:07,158 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-17 15:04:07,409 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:07,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-05-17 15:04:07,920 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:08,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-05-17 15:04:08,419 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:08,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-05-17 15:04:08,927 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:09,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-05-17 15:04:09,393 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:09,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-05-17 15:04:09,901 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:10,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-05-17 15:04:10,381 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:10,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-05-17 15:04:10,692 [ scc.repo] DEBUG ## Branches found:
2025-05-17 15:04:10,692 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-17 15:04:10,692 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:10,692 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:10,694 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-17 15:04:10,697 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 15:04:10,697 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-17 15:04:10,700 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-17 15:04:10,703 [ scc.git] DEBUG Already up to date.
2025-05-17 15:04:10,703 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-05-17 15:04:10,994 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-17 15:04:10,994 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-05-17 15:04:10,999 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-05-17 15:04:11,288 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-17 15:04:11,288 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-05-17 15:04:11,293 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-05-17 15:04:11,565 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-17 15:04:11,565 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-05-17 15:04:11,570 [ scc.git] DEBUG ## Unique users: []
2025-05-17 15:04:11,570 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:11,570 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:11,573 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-05-17 15:04:11,576 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:11,578 [ 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-17 15:04:11,587 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-17 15:04:11,590 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-05-17 15:04:11,591 [ scc.git] DEBUG package.json | 2 +-
2025-05-17 15:04:11,591 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-05-17 15:04:11,592 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:11,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:04:11,759 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-05-17 15:04:11,762 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:11,764 [ 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-17 15:04:11,774 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-17 15:04:11,774 [ scc.git] DEBUG Auto-merging package.json
2025-05-17 15:04:11,775 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-17 15:04:11,779 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-05-17 15:04:11,779 [ scc.git] DEBUG package.json | 2 +-
2025-05-17 15:04:11,779 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-05-17 15:04:12,009 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:12,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:04:12,195 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-05-17 15:04:12,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:12,200 [ 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-17 15:04:12,209 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-17 15:04:12,212 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-17 15:04:12,212 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-17 15:04:12,446 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:12,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:04:12,602 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 15:04:12,644 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:12,644 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:12,647 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 15:04:12,687 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 15:04:12,691 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08ce4c2850> has no local changes
2025-05-17 15:04:12,691 [ 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#426 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/)'
2025-05-17 15:04:12,698 [ scc.git] DEBUG [detached HEAD 2be821f] merge master -Dorg -Ssuccess-only
2025-05-17 15:04:12,698 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:04:12,698 [ scc.repo] DEBUG ## PRs found:
2025-05-17 15:04:12,853 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:13,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-05-17 15:04:13,063 [ scc.repo] DEBUG ## Branches found:
2025-05-17 15:04:13,063 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-17 15:04:13,063 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:13,063 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:13,065 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-17 15:04:13,067 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 15:04:13,068 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-17 15:04:13,071 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-17 15:04:13,074 [ scc.git] DEBUG Already up to date.
2025-05-17 15:04:13,074 [ scc.git] DEBUG ## Unique users: []
2025-05-17 15:04:13,074 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:13,074 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:13,076 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 15:04:13,116 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:13,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:13,118 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 15:04:13,157 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 15:04:13,161 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08ce3deb90> has no local changes
2025-05-17 15:04:13,161 [ 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#426 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/)'
2025-05-17 15:04:13,168 [ scc.git] DEBUG [detached HEAD fac67c1] merge master -Dorg -Ssuccess-only
2025-05-17 15:04:13,168 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:04:13,168 [ scc.repo] DEBUG ## PRs found:
2025-05-17 15:04:13,314 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:13,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-05-17 15:04:13,855 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:14,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-05-17 15:04:14,381 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:14,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-05-17 15:04:14,939 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:15,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-05-17 15:04:15,172 [ scc.repo] DEBUG ## Branches found:
2025-05-17 15:04:15,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-17 15:04:15,172 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:15,172 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:15,175 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-17 15:04:15,177 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 15:04:15,178 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-17 15:04:15,181 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-17 15:04:15,184 [ scc.git] DEBUG Already up to date.
2025-05-17 15:04:15,184 [ scc.git] DEBUG ## Unique users: []
2025-05-17 15:04:15,184 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:15,184 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:15,186 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 15:04:15,228 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:15,228 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:15,230 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 15:04:15,269 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 15:04:15,273 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08cc1d3bd0> has no local changes
2025-05-17 15:04:15,273 [ 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#426 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/)'
2025-05-17 15:04:15,279 [ scc.git] DEBUG [detached HEAD 3d4afa9] merge master -Dorg -Ssuccess-only
2025-05-17 15:04:15,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:04:15,280 [ scc.repo] DEBUG ## PRs found:
2025-05-17 15:04:15,423 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:15,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-05-17 15:04:15,965 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:16,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-05-17 15:04:16,429 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:16,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-05-17 15:04:16,887 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:17,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-17 15:04:17,444 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:17,665 [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-17 15:04:17,917 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:18,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-17 15:04:18,459 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:18,668 [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-17 15:04:18,669 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-17 15:04:18,669 [ scc.repo] DEBUG ## Branches found:
2025-05-17 15:04:18,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-17 15:04:18,669 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:18,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:18,672 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-17 15:04:18,674 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 15:04:18,674 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-17 15:04:18,677 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-17 15:04:18,680 [ scc.git] DEBUG Already up to date.
2025-05-17 15:04:18,680 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-05-17 15:04:18,972 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-05-17 15:04:18,972 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-05-17 15:04:18,976 [ scc.git] DEBUG ## Unique users: []
2025-05-17 15:04:18,976 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:18,976 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:18,979 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-17 15:04:18,982 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:18,984 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-17 15:04:18,993 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-05-17 15:04:18,993 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-05-17 15:04:18,993 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-05-17 15:04:18,993 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-05-17 15:04:18,993 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-05-17 15:04:18,993 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-05-17 15:04:18,993 [ scc.git] DEBUG Auto-merging setup.py
2025-05-17 15:04:18,993 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-05-17 15:04:18,994 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-17 15:04:18,994 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-17 15:04:18,996 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-17 15:04:19,001 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-05-17 15:04:19,002 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:19,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:04:19,167 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-17 15:04:19,170 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-17 15:04:19,173 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#426](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/urls.py
- setup.py
- omero_signup/views.py
--conflicts
2025-05-17 15:04:19,176 [ scc.config] DEBUG Found github.token
2025-05-17 15:04:19,176 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-05-17 15:04:19,176 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 15:04:19,216 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:19,216 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:19,218 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 15:04:19,258 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 15:04:19,261 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08cc202bd0> has no local changes
2025-05-17 15:04:19,261 [ 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#426 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/)'
2025-05-17 15:04:19,268 [ scc.git] DEBUG [detached HEAD 16f565b] merge master -Dorg -Ssuccess-only
2025-05-17 15:04:19,269 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:04:19,269 [ scc.repo] DEBUG ## PRs found:
2025-05-17 15:04:19,418 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:19,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-05-17 15:04:19,971 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:20,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-05-17 15:04:20,458 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:20,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-17 15:04:21,046 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:21,272 [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-17 15:04:21,524 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:21,792 [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-17 15:04:22,044 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:22,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-17 15:04:22,626 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:22,819 [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-17 15:04:22,820 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-05-17 15:04:23,071 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:23,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-05-17 15:04:23,584 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:23,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-05-17 15:04:24,117 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:24,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-05-17 15:04:24,653 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:24,907 [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-17 15:04:25,160 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:25,385 [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-17 15:04:25,637 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:25,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-05-17 15:04:26,149 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:26,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-05-17 15:04:26,607 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:26,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-05-17 15:04:27,082 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:27,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-05-17 15:04:27,563 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:27,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-17 15:04:28,077 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:28,309 [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-17 15:04:28,560 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:28,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-17 15:04:29,008 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:29,184 [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-17 15:04:29,185 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-17 15:04:29,185 [ scc.repo] DEBUG ## Branches found:
2025-05-17 15:04:29,185 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-17 15:04:29,185 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:29,185 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:29,188 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-17 15:04:29,190 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 15:04:29,191 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-17 15:04:29,194 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-17 15:04:29,197 [ scc.git] DEBUG Already up to date.
2025-05-17 15:04:29,197 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-05-17 15:04:29,510 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-17 15:04:29,510 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-05-17 15:04:29,516 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-05-17 15:04:29,782 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-17 15:04:29,782 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-05-17 15:04:29,787 [ scc.git] DEBUG ## Unique users: []
2025-05-17 15:04:29,787 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:29,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:29,790 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-05-17 15:04:29,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:29,796 [ 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-17 15:04:29,810 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-17 15:04:29,814 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-05-17 15:04:29,814 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-05-17 15:04:29,814 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-05-17 15:04:29,814 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-05-17 15:04:29,814 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-05-17 15:04:29,814 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-05-17 15:04:29,814 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-05-17 15:04:29,814 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-05-17 15:04:29,814 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-05-17 15:04:29,814 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-05-17 15:04:29,814 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-05-17 15:04:29,815 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:29,815 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-05-17 15:04:29,815 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-05-17 15:04:29,815 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-05-17 15:04:29,815 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-05-17 15:04:29,815 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-05-17 15:04:29,815 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-05-17 15:04:29,815 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-05-17 15:04:29,815 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-05-17 15:04:29,815 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-05-17 15:04:29,815 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-05-17 15:04:29,816 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-05-17 15:04:29,816 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-05-17 15:04:29,816 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-05-17 15:04:29,816 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-05-17 15:04:29,816 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-05-17 15:04:29,816 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-05-17 15:04:29,816 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-05-17 15:04:29,816 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-05-17 15:04:29,816 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-05-17 15:04:29,816 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-05-17 15:04:29,816 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-05-17 15:04:29,816 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-05-17 15:04:29,816 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-05-17 15:04:29,816 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-05-17 15:04:29,816 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-05-17 15:04:29,816 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-05-17 15:04:29,816 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-05-17 15:04:29,816 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-05-17 15:04:29,816 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-05-17 15:04:29,816 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-05-17 15:04:29,816 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-05-17 15:04:29,816 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-05-17 15:04:29,816 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-05-17 15:04:29,816 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-05-17 15:04:29,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:04:29,980 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-17 15:04:29,985 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:29,987 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-17 15:04:29,999 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-17 15:04:30,002 [ scc.git] DEBUG docker | 1 +
2025-05-17 15:04:30,002 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-05-17 15:04:30,231 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:30,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:04:30,394 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 15:04:30,436 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:30,436 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:30,438 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 15:04:30,477 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 15:04:30,481 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08cc23f5d0> has no local changes
2025-05-17 15:04:30,481 [ 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#426 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/)'
2025-05-17 15:04:30,488 [ scc.git] DEBUG [detached HEAD d00023e] merge master -Dorg -Ssuccess-only
2025-05-17 15:04:30,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:04:30,488 [ scc.repo] DEBUG ## PRs found:
2025-05-17 15:04:30,645 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:30,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-05-17 15:04:30,840 [ scc.repo] DEBUG ## Branches found:
2025-05-17 15:04:30,840 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-17 15:04:30,840 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:30,840 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:30,843 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-17 15:04:30,845 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 15:04:30,845 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-17 15:04:30,848 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-17 15:04:30,852 [ scc.git] DEBUG Already up to date.
2025-05-17 15:04:30,852 [ scc.git] DEBUG ## Unique users: []
2025-05-17 15:04:30,852 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:30,852 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:30,854 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 15:04:30,895 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:30,895 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:30,897 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 15:04:30,937 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 15:04:30,940 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08cc2135d0> has no local changes
2025-05-17 15:04:30,940 [ 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#426 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/)'
2025-05-17 15:04:30,947 [ scc.git] DEBUG [detached HEAD 926325a] merge master -Dorg -Ssuccess-only
2025-05-17 15:04:30,947 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:04:30,948 [ scc.repo] DEBUG ## PRs found:
2025-05-17 15:04:31,091 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:31,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-05-17 15:04:31,611 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:31,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-05-17 15:04:32,097 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:32,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-05-17 15:04:32,566 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:32,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-17 15:04:33,088 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:33,326 [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-17 15:04:33,578 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:33,817 [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-17 15:04:34,069 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:34,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-17 15:04:34,572 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:34,762 [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-17 15:04:34,762 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-05-17 15:04:34,762 [ scc.repo] DEBUG ## Branches found:
2025-05-17 15:04:34,762 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-17 15:04:34,762 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:34,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:34,766 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-17 15:04:34,768 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 15:04:34,768 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-17 15:04:34,771 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-17 15:04:34,774 [ scc.git] DEBUG Already up to date.
2025-05-17 15:04:34,774 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-05-17 15:04:35,076 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-05-17 15:04:35,076 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-05-17 15:04:35,081 [ scc.git] DEBUG ## Unique users: []
2025-05-17 15:04:35,081 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:35,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:35,083 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-05-17 15:04:35,087 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:35,089 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-05-17 15:04:35,098 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-17 15:04:35,101 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-05-17 15:04:35,101 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-05-17 15:04:35,101 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-05-17 15:04:35,101 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-05-17 15:04:35,101 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-05-17 15:04:35,103 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:35,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:04:35,294 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 15:04:35,335 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:35,335 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:35,337 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 15:04:35,377 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 15:04:35,380 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08cc223850> has no local changes
2025-05-17 15:04:35,380 [ 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#426 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/)'
2025-05-17 15:04:35,388 [ scc.git] DEBUG [detached HEAD e4af997] merge master -Dorg -Ssuccess-only
2025-05-17 15:04:35,388 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:04:35,388 [ scc.git] INFO Overriding base-branch from master to main
2025-05-17 15:04:35,388 [ scc.repo] DEBUG ## PRs found:
2025-05-17 15:04:35,545 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:35,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-05-17 15:04:36,084 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:36,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-05-17 15:04:36,558 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:36,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-05-17 15:04:37,039 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:37,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-05-17 15:04:37,605 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:37,841 [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-17 15:04:38,093 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:38,312 [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-17 15:04:38,563 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:38,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-05-17 15:04:39,090 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:39,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-05-17 15:04:39,572 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:39,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-05-17 15:04:40,042 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:40,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-17 15:04:40,553 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:40,783 [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-17 15:04:41,035 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:41,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-17 15:04:41,495 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:41,688 [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-17 15:04:41,689 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-17 15:04:41,689 [ scc.repo] DEBUG ## Branches found:
2025-05-17 15:04:41,689 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-17 15:04:41,689 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:41,689 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:41,692 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-05-17 15:04:41,695 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 15:04:41,695 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-05-17 15:04:41,698 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-05-17 15:04:41,701 [ scc.git] DEBUG Already up to date.
2025-05-17 15:04:41,701 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-05-17 15:04:42,042 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-05-17 15:04:42,042 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-05-17 15:04:42,047 [ scc.git] DEBUG ## Unique users: []
2025-05-17 15:04:42,047 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:42,048 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:42,050 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-17 15:04:42,053 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:42,056 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-17 15:04:42,063 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-05-17 15:04:42,063 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-05-17 15:04:42,064 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-17 15:04:42,064 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-17 15:04:42,067 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-17 15:04:42,071 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-05-17 15:04:42,072 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:42,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:04:42,242 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-17 15:04:42,245 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-17 15:04:42,248 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#426](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-05-17 15:04:42,250 [ scc.config] DEBUG Found github.token
2025-05-17 15:04:42,250 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-05-17 15:04:42,250 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 15:04:42,290 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:42,290 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:42,292 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 15:04:42,331 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 15:04:42,335 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08cc222e50> has no local changes
2025-05-17 15:04:42,335 [ 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#426 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/)'
2025-05-17 15:04:42,342 [ scc.git] DEBUG [detached HEAD d9e5d77] merge master -Dorg -Ssuccess-only
2025-05-17 15:04:42,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:04:42,342 [ scc.repo] DEBUG ## PRs found:
2025-05-17 15:04:42,493 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:42,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-05-17 15:04:42,696 [ scc.repo] DEBUG ## Branches found:
2025-05-17 15:04:42,696 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-17 15:04:42,696 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:42,696 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:42,699 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-17 15:04:42,701 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 15:04:42,701 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-17 15:04:42,704 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-17 15:04:42,708 [ scc.git] DEBUG Already up to date.
2025-05-17 15:04:42,708 [ scc.git] DEBUG ## Unique users: []
2025-05-17 15:04:42,708 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:42,708 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:42,710 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 15:04:42,753 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:42,753 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:42,755 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 15:04:42,795 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 15:04:42,799 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08cc218950> has no local changes
2025-05-17 15:04:42,799 [ 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#426 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/)'
2025-05-17 15:04:42,806 [ scc.git] DEBUG [detached HEAD 0254b42] merge master -Dorg -Ssuccess-only
2025-05-17 15:04:42,806 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:04:42,806 [ scc.repo] DEBUG ## PRs found:
2025-05-17 15:04:42,947 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:43,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-05-17 15:04:43,150 [ scc.repo] DEBUG ## Branches found:
2025-05-17 15:04:43,150 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-17 15:04:43,150 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:43,150 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:43,152 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-17 15:04:43,155 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 15:04:43,155 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-17 15:04:43,158 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-17 15:04:43,161 [ scc.git] DEBUG Already up to date.
2025-05-17 15:04:43,161 [ scc.git] DEBUG ## Unique users: []
2025-05-17 15:04:43,161 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:43,161 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:43,163 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 15:04:43,205 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:43,205 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:43,207 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 15:04:43,247 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 15:04:43,251 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08cc1ebb50> has no local changes
2025-05-17 15:04:43,251 [ 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#426 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/)'
2025-05-17 15:04:43,257 [ scc.git] DEBUG [detached HEAD 4dbf6e4] merge master -Dorg -Ssuccess-only
2025-05-17 15:04:43,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:04:43,257 [ scc.repo] DEBUG ## PRs found:
2025-05-17 15:04:43,401 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:43,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-05-17 15:04:43,904 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:44,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-05-17 15:04:44,413 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:44,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-05-17 15:04:44,943 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:45,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-17 15:04:45,493 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:45,728 [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-17 15:04:45,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:46,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-17 15:04:46,434 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:46,616 [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-17 15:04:46,616 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-05-17 15:04:46,616 [ scc.repo] DEBUG ## Branches found:
2025-05-17 15:04:46,616 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-17 15:04:46,617 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:46,617 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:46,620 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-17 15:04:46,622 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 15:04:46,622 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-17 15:04:46,625 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-17 15:04:46,628 [ scc.git] DEBUG Already up to date.
2025-05-17 15:04:46,628 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-05-17 15:04:46,915 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-05-17 15:04:46,915 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-05-17 15:04:46,920 [ scc.git] DEBUG ## Unique users: []
2025-05-17 15:04:46,920 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:46,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:46,923 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-17 15:04:46,926 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:46,928 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-17 15:04:46,937 [ scc.git] DEBUG Auto-merging Dockerfile
2025-05-17 15:04:46,937 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-05-17 15:04:46,937 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-17 15:04:46,938 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-17 15:04:46,941 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-17 15:04:46,946 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-05-17 15:04:46,947 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:47,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:04:47,117 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-17 15:04:47,120 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-17 15:04:47,123 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#426](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-05-17 15:04:47,125 [ scc.config] DEBUG Found github.token
2025-05-17 15:04:47,125 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-05-17 15:04:47,125 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 15:04:47,167 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:47,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:47,169 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 15:04:47,210 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 15:04:47,214 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08cc282cd0> has no local changes
2025-05-17 15:04:47,215 [ 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#426 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/)'
2025-05-17 15:04:47,221 [ scc.git] DEBUG [detached HEAD fdbc94e] merge master -Dorg -Ssuccess-only
2025-05-17 15:04:47,221 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:04:47,222 [ scc.git] INFO Overriding base-branch from master to develop
2025-05-17 15:04:47,222 [ scc.repo] DEBUG ## PRs found:
2025-05-17 15:04:47,368 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:47,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-05-17 15:04:47,955 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:48,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-05-17 15:04:48,432 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:48,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-05-17 15:04:48,923 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:49,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-17 15:04:49,428 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:49,660 [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-17 15:04:49,912 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:50,150 [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-17 15:04:50,402 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:50,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-17 15:04:50,850 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:51,037 [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-17 15:04:51,038 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-17 15:04:51,289 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:51,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-05-17 15:04:51,767 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:52,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-05-17 15:04:52,270 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:52,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-17 15:04:52,725 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:52,931 [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-17 15:04:53,183 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:53,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-17 15:04:53,630 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:53,810 [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-17 15:04:53,810 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-17 15:04:54,062 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:54,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-05-17 15:04:54,566 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:54,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-05-17 15:04:55,139 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:55,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-05-17 15:04:55,671 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:55,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-05-17 15:04:55,966 [ scc.repo] DEBUG ## Branches found:
2025-05-17 15:04:55,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-17 15:04:55,966 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:55,966 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:55,969 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-05-17 15:04:55,972 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-17 15:04:55,972 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-05-17 15:04:55,975 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-05-17 15:04:55,984 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-05-17 15:04:56,216 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:56,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-05-17 15:04:56,610 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-05-17 15:04:56,900 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-17 15:04:56,900 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-05-17 15:04:56,905 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-05-17 15:04:57,179 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-17 15:04:57,179 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-05-17 15:04:57,183 [ scc.git] DEBUG ## Unique users: []
2025-05-17 15:04:57,183 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:57,183 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:57,186 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-17 15:04:57,191 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:57,194 [ 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-17 15:04:57,204 [ 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-17 15:04:57,205 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-17 15:04:57,205 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-17 15:04:57,208 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-17 15:04:57,211 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-05-17 15:04:57,213 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:57,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:04:57,370 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-17 15:04:57,375 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-17 15:04:57,379 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#426](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-05-17 15:04:57,381 [ scc.config] DEBUG Found github.token
2025-05-17 15:04:57,381 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-05-17 15:04:57,381 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-05-17 15:04:57,386 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:57,388 [ 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-17 15:04:57,398 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-17 15:04:57,402 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-05-17 15:04:57,402 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-05-17 15:04:57,621 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:57,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:04:57,794 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-17 15:04:57,835 [ scc.git] DEBUG Get sha1 of %s
2025-05-17 15:04:57,835 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-17 15:04:57,837 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 15:04:57,877 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 15:04:57,880 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08d0081710> has no local changes
2025-05-17 15:04:57,881 [ 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#426 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/)'
2025-05-17 15:04:57,887 [ scc.git] DEBUG [detached HEAD 8ef8a9a] merge master -Dorg -Ssuccess-only
2025-05-17 15:04:57,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:04:57,888 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-17 15:04:57,969 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-05-17 15:04:58,045 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:58,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:04:58,223 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-05-17 15:04:58,225 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-05-17 15:04:58,469 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:58,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:04:58,642 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-05-17 15:04:58,644 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-05-17 15:04:58,888 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:59,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:04:59,055 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-05-17 15:04:59,057 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-05-17 15:04:59,301 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:59,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:04:59,465 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-05-17 15:04:59,709 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:04:59,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:04:59,879 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-05-17 15:04:59,881 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-05-17 15:05:00,125 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:05:00,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:05:00,305 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-05-17 15:05:00,307 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-05-17 15:05:00,551 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:05:00,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:05:00,724 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-05-17 15:05:00,726 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-05-17 15:05:00,970 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:05:01,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:05:01,212 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-05-17 15:05:01,214 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-05-17 15:05:01,458 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:05:01,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:05:01,647 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-05-17 15:05:01,649 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-05-17 15:05:01,893 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:05:02,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:05:02,059 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-05-17 15:05:02,061 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-05-17 15:05:02,304 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:05:02,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:05:02,478 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-05-17 15:05:02,480 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-05-17 15:05:02,724 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:05:02,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:05:02,898 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-05-17 15:05:02,900 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-05-17 15:05:03,144 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:05:03,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:05:03,318 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-05-17 15:05:03,562 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:05:03,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:05:03,735 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-05-17 15:05:03,979 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:05:04,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:05:04,154 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-05-17 15:05:04,156 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-05-17 15:05:04,400 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:05:04,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:05:04,581 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-05-17 15:05:04,826 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:05:04,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:05:04,985 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-05-17 15:05:05,229 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:05:05,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:05:05,415 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-05-17 15:05:05,417 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-05-17 15:05:05,662 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:05:05,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:05:05,841 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-05-17 15:05:05,843 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-05-17 15:05:06,088 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:05:06,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:05:06,258 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-05-17 15:05:06,260 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-05-17 15:05:06,504 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:05:06,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:05:06,678 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-05-17 15:05:06,680 [ scc.config] DEBUG Found submodule.scripts.url
2025-05-17 15:05:06,922 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-17 15:05:07,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-17 15:05:07,096 [ scc.config] DEBUG Found submodule.scripts.branch
2025-05-17 15:05:07,096 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-17 15:05:07,188 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08ce58f1d0> has local changes
2025-05-17 15:05:07,188 [ 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#426 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/426/)'
2025-05-17 15:05:07,203 [ scc.git] DEBUG [detached HEAD 29f854a] merge master -Dorg -Ssuccess-only
2025-05-17 15:05:07,203 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-05-17 15:05:07,204 [ scc.merge] INFO Repository: ome/omero-plugins
2025-05-17 15:05:07,204 [ scc.merge] INFO Already up to date.
2025-05-17 15:05:07,204 [ scc.merge] INFO
2025-05-17 15:05:07,204 [ scc.merge] INFO Merged PRs:
2025-05-17 15:05:07,204 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-05-17 15:05:07,204 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-05-17 15:05:07,204 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-05-17 15:05:07,204 [ scc.merge] INFO
2025-05-17 15:05:07,204 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-05-17 15:05:07,204 [ scc.merge] INFO Already up to date.
2025-05-17 15:05:07,204 [ scc.merge] INFO
2025-05-17 15:05:07,204 [ scc.merge] INFO
2025-05-17 15:05:07,204 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-05-17 15:05:07,204 [ scc.merge] INFO Excluded PRs:
2025-05-17 15:05:07,204 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-05-17 15:05:07,204 [ scc.merge] INFO Already up to date.
2025-05-17 15:05:07,204 [ scc.merge] INFO
2025-05-17 15:05:07,204 [ scc.merge] INFO
2025-05-17 15:05:07,204 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-05-17 15:05:07,204 [ scc.merge] INFO Excluded PRs:
2025-05-17 15:05:07,204 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-05-17 15:05:07,204 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-05-17 15:05:07,204 [ scc.merge] INFO Already up to date.
2025-05-17 15:05:07,204 [ scc.merge] INFO
2025-05-17 15:05:07,204 [ scc.merge] INFO Merged PRs:
2025-05-17 15:05:07,204 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-05-17 15:05:07,204 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-05-17 15:05:07,204 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-05-17 15:05:07,204 [ scc.merge] INFO
2025-05-17 15:05:07,204 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-05-17 15:05:07,204 [ scc.merge] INFO Excluded PRs:
2025-05-17 15:05:07,204 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-05-17 15:05:07,204 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-05-17 15:05:07,205 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (status: failure)
2025-05-17 15:05:07,205 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-05-17 15:05:07,205 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-17 15:05:07,205 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-05-17 15:05:07,205 [ scc.merge] INFO Updating 11d3587..5b2ca82
2025-05-17 15:05:07,205 [ scc.merge] INFO Previously merged:
2025-05-17 15:05:07,205 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-05-17 15:05:07,205 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-17 15:05:07,205 [ scc.merge] INFO
2025-05-17 15:05:07,205 [ scc.merge] INFO Merged PRs:
2025-05-17 15:05:07,205 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-05-17 15:05:07,205 [ scc.merge] INFO
2025-05-17 15:05:07,205 [ scc.merge] INFO Repository: ome/omero-figure
2025-05-17 15:05:07,205 [ scc.merge] INFO Excluded PRs:
2025-05-17 15:05:07,205 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-05-17 15:05:07,205 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-05-17 15:05:07,205 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-05-17 15:05:07,205 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-05-17 15:05:07,205 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-05-17 15:05:07,205 [ scc.merge] INFO Previously merged:
2025-05-17 15:05:07,205 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-05-17 15:05:07,205 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-05-17 15:05:07,205 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-05-17 15:05:07,205 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-17 15:05:07,205 [ scc.merge] INFO
2025-05-17 15:05:07,205 [ scc.merge] INFO Merged PRs:
2025-05-17 15:05:07,205 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-05-17 15:05:07,205 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-05-17 15:05:07,205 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-05-17 15:05:07,205 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-05-17 15:05:07,205 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-05-17 15:05:07,205 [ scc.merge] INFO
2025-05-17 15:05:07,205 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-17 15:05:07,205 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-05-17 15:05:07,205 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-05-17 15:05:07,205 [ scc.merge] INFO
2025-05-17 15:05:07,205 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-05-17 15:05:07,205 [ scc.merge] INFO Already up to date.
2025-05-17 15:05:07,205 [ scc.merge] INFO
2025-05-17 15:05:07,206 [ scc.merge] INFO Merged PRs:
2025-05-17 15:05:07,206 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-05-17 15:05:07,206 [ scc.merge] INFO
2025-05-17 15:05:07,206 [ scc.merge] INFO Repository: ome/omero-gallery
2025-05-17 15:05:07,206 [ scc.merge] INFO Already up to date.
2025-05-17 15:05:07,206 [ scc.merge] INFO
2025-05-17 15:05:07,206 [ scc.merge] INFO Merged PRs:
2025-05-17 15:05:07,206 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-05-17 15:05:07,206 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-05-17 15:05:07,206 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-05-17 15:05:07,206 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-05-17 15:05:07,206 [ scc.merge] INFO
2025-05-17 15:05:07,206 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-17 15:05:07,206 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-05-17 15:05:07,206 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-05-17 15:05:07,206 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-05-17 15:05:07,206 [ scc.merge] INFO
2025-05-17 15:05:07,206 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-05-17 15:05:07,206 [ scc.merge] INFO Excluded PRs:
2025-05-17 15:05:07,206 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-05-17 15:05:07,206 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-05-17 15:05:07,206 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-05-17 15:05:07,206 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-05-17 15:05:07,206 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-05-17 15:05:07,206 [ scc.merge] INFO Already up to date.
2025-05-17 15:05:07,206 [ scc.merge] INFO
2025-05-17 15:05:07,206 [ scc.merge] INFO Merged PRs:
2025-05-17 15:05:07,206 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-05-17 15:05:07,206 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-05-17 15:05:07,206 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-05-17 15:05:07,206 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-05-17 15:05:07,206 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-17 15:05:07,206 [ scc.merge] INFO
2025-05-17 15:05:07,206 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-17 15:05:07,206 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-05-17 15:05:07,206 [ scc.merge] INFO
2025-05-17 15:05:07,206 [ scc.merge] INFO Repository: ome/omero-mapr
2025-05-17 15:05:07,206 [ scc.merge] INFO Excluded PRs:
2025-05-17 15:05:07,206 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-05-17 15:05:07,206 [ scc.merge] INFO Already up to date.
2025-05-17 15:05:07,207 [ scc.merge] INFO
2025-05-17 15:05:07,207 [ scc.merge] INFO Merged PRs:
2025-05-17 15:05:07,207 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-05-17 15:05:07,207 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-17 15:05:07,207 [ scc.merge] INFO
2025-05-17 15:05:07,207 [ scc.merge] INFO Repository: ome/omero-metadata
2025-05-17 15:05:07,207 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-05-17 15:05:07,207 [ scc.merge] INFO Previously merged:
2025-05-17 15:05:07,207 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-17 15:05:07,207 [ scc.merge] INFO
2025-05-17 15:05:07,207 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-17 15:05:07,207 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-17 15:05:07,207 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-17 15:05:07,207 [ scc.merge] INFO
2025-05-17 15:05:07,207 [ scc.merge] INFO Repository: ome/omero-parade
2025-05-17 15:05:07,207 [ scc.merge] INFO Excluded PRs:
2025-05-17 15:05:07,207 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-05-17 15:05:07,207 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-05-17 15:05:07,207 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-05-17 15:05:07,207 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-05-17 15:05:07,207 [ scc.merge] INFO Already up to date.
2025-05-17 15:05:07,207 [ scc.merge] INFO
2025-05-17 15:05:07,207 [ scc.merge] INFO Merged PRs:
2025-05-17 15:05:07,207 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-17 15:05:07,207 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-17 15:05:07,207 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-17 15:05:07,207 [ scc.merge] INFO
2025-05-17 15:05:07,207 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-05-17 15:05:07,207 [ scc.merge] INFO Already up to date.
2025-05-17 15:05:07,207 [ scc.merge] INFO
2025-05-17 15:05:07,207 [ scc.merge] INFO
2025-05-17 15:05:07,207 [ scc.merge] INFO Repository: ome/omero-rois
2025-05-17 15:05:07,207 [ scc.merge] INFO Excluded PRs:
2025-05-17 15:05:07,207 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-05-17 15:05:07,207 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-17 15:05:07,207 [ scc.merge] INFO Already up to date.
2025-05-17 15:05:07,207 [ scc.merge] INFO
2025-05-17 15:05:07,207 [ scc.merge] INFO
2025-05-17 15:05:07,207 [ scc.merge] INFO Repository: ome/omero-signup
2025-05-17 15:05:07,208 [ scc.merge] INFO Already up to date.
2025-05-17 15:05:07,208 [ scc.merge] INFO
2025-05-17 15:05:07,208 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-17 15:05:07,208 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-17 15:05:07,208 [ scc.merge] INFO
2025-05-17 15:05:07,208 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-05-17 15:05:07,208 [ scc.merge] INFO Excluded PRs:
2025-05-17 15:05:07,208 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-05-17 15:05:07,208 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-05-17 15:05:07,208 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-05-17 15:05:07,208 [ scc.merge] INFO Already up to date.
2025-05-17 15:05:07,208 [ scc.merge] INFO
2025-05-17 15:05:07,208 [ scc.merge] INFO Merged PRs:
2025-05-17 15:05:07,208 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-17 15:05:07,208 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-05-17 15:05:07,208 [ scc.merge] INFO
2025-05-17 15:05:07,208 [ scc.merge] INFO Repository: ome/omero-upload
2025-05-17 15:05:07,208 [ scc.merge] INFO Already up to date.
2025-05-17 15:05:07,208 [ scc.merge] INFO
2025-05-17 15:05:07,208 [ scc.merge] INFO
2025-05-17 15:05:07,208 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-05-17 15:05:07,208 [ scc.merge] INFO Already up to date.
2025-05-17 15:05:07,208 [ scc.merge] INFO
2025-05-17 15:05:07,208 [ scc.merge] INFO Merged PRs:
2025-05-17 15:05:07,208 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-05-17 15:05:07,208 [ scc.merge] INFO
2025-05-17 15:05:07,208 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-05-17 15:05:07,208 [ scc.merge] INFO Excluded PRs:
2025-05-17 15:05:07,208 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-05-17 15:05:07,208 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-05-17 15:05:07,208 [ scc.merge] INFO Already up to date.
2025-05-17 15:05:07,208 [ scc.merge] INFO
2025-05-17 15:05:07,208 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-17 15:05:07,208 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-17 15:05:07,208 [ scc.merge] INFO
2025-05-17 15:05:07,208 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-05-17 15:05:07,208 [ scc.merge] INFO Already up to date.
2025-05-17 15:05:07,208 [ scc.merge] INFO
2025-05-17 15:05:07,208 [ scc.merge] INFO
2025-05-17 15:05:07,208 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-05-17 15:05:07,209 [ scc.merge] INFO Already up to date.
2025-05-17 15:05:07,209 [ scc.merge] INFO
2025-05-17 15:05:07,209 [ scc.merge] INFO
2025-05-17 15:05:07,209 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-05-17 15:05:07,209 [ scc.merge] INFO Already up to date.
2025-05-17 15:05:07,209 [ scc.merge] INFO
2025-05-17 15:05:07,209 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-17 15:05:07,209 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-05-17 15:05:07,209 [ scc.merge] INFO
2025-05-17 15:05:07,209 [ scc.merge] INFO Repository: ome/scripts
2025-05-17 15:05:07,209 [ scc.merge] INFO Excluded PRs:
2025-05-17 15:05:07,209 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-05-17 15:05:07,209 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-05-17 15:05:07,209 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-05-17 15:05:07,209 [ scc.merge] INFO Previously merged:
2025-05-17 15:05:07,209 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-05-17 15:05:07,209 [ scc.merge] INFO
2025-05-17 15:05:07,209 [ scc.merge] INFO Merged PRs:
2025-05-17 15:05:07,209 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-17 15:05:07,209 [ scc.merge] INFO
2025-05-17 15:05:07,209 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-17 15:05:07,209 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-17 15:05:07,209 [ scc.merge] INFO
2025-05-17 15:05:07,209 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-05-17 15:05:07,209 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 15:05:07,211 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-05-17 15:05:07,212 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 15:05:07,214 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:05:07,214 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-05-17 15:05:07,214 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 15:05:07,216 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:05:07,216 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-05-17 15:05:07,216 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 15:05:07,219 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:05:07,219 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-05-17 15:05:07,219 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 15:05:07,221 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:05:07,221 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-05-17 15:05:07,221 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 15:05:07,223 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:05:07,223 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-05-17 15:05:07,223 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 15:05:07,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:05:07,226 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-05-17 15:05:07,226 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 15:05:07,228 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:05:07,228 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-05-17 15:05:07,228 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 15:05:07,230 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:05:07,230 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-17 15:05:07,230 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 15:05:07,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:05:07,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-17 15:05:07,232 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 15:05:07,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:05:07,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-17 15:05:07,235 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 15:05:07,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:05:07,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-17 15:05:07,237 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 15:05:07,239 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:05:07,239 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-17 15:05:07,239 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 15:05:07,241 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:05:07,241 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-17 15:05:07,241 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 15:05:07,244 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:05:07,244 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-17 15:05:07,244 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 15:05:07,246 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:05:07,246 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-17 15:05:07,246 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 15:05:07,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:05:07,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-17 15:05:07,248 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 15:05:07,251 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:05:07,251 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-17 15:05:07,251 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 15:05:07,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:05:07,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-17 15:05:07,253 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 15:05:07,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:05:07,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-17 15:05:07,255 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 15:05:07,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:05:07,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-17 15:05:07,257 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 15:05:07,260 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-17 15:05:07,260 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-17 15:05:07,260 [ scc.git] DEBUG Calling 'git remote'
2025-05-17 15:05:07,262 [ 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 5331d87] 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 301c147] 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-17 15:05:55,985 [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-17 15:06:05,445 [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-17 15:06:07,938 [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-17 15:06:12,830 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-05-17 15:06:52,425 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/9161e9ff/images/svgs/logo.svg){kind=logo}
