Skipping 228 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
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#413 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/)'
2025-05-09 00:43:51,972 [ scc.git] DEBUG [detached HEAD 534eeee] merge master -Dorg -Ssuccess-only
2025-05-09 00:43:51,972 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:43:51,972 [ scc.repo] DEBUG ## PRs found:
2025-05-09 00:43:52,128 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:43:52,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-05-09 00:43:52,679 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:43:52,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-05-09 00:43:53,170 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:43:53,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-09 00:43:53,735 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:43:53,959 [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-09 00:43:54,210 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:43:54,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-09 00:43:54,746 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:43:54,959 [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-09 00:43:54,959 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-09 00:43:55,210 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:43:55,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-05-09 00:43:55,704 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:43:56,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-05-09 00:43:56,271 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:43:56,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-09 00:43:56,824 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:43:57,017 [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-09 00:43:57,268 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:43:57,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-09 00:43:57,768 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:43:57,943 [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-09 00:43:57,944 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-05-09 00:43:57,944 [ scc.repo] DEBUG ## Branches found:
2025-05-09 00:43:57,944 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-09 00:43:57,944 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:43:57,944 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:43:57,947 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-09 00:43:57,949 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-09 00:43:57,949 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-09 00:43:57,952 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-09 00:43:57,955 [ scc.git] DEBUG Already up to date.
2025-05-09 00:43:57,955 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-05-09 00:43:58,276 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-09 00:43:58,276 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-05-09 00:43:58,281 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-05-09 00:43:58,588 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-09 00:43:58,589 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-05-09 00:43:58,592 [ scc.git] DEBUG ## Unique users: []
2025-05-09 00:43:58,592 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:43:58,592 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:43:58,595 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-09 00:43:58,599 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:43:58,601 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-09 00:43:58,610 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-09 00:43:58,614 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-05-09 00:43:58,614 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-05-09 00:43:58,614 [ scc.git] DEBUG requirements.txt | 2 +-
2025-05-09 00:43:58,614 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-05-09 00:43:58,614 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-05-09 00:43:58,614 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-05-09 00:43:58,615 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:43:58,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:43:58,782 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-05-09 00:43:58,786 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:43:58,788 [ 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-09 00:43:58,798 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-09 00:43:58,801 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-09 00:43:58,801 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-09 00:43:59,032 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:43:59,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:43:59,198 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-09 00:43:59,239 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:43:59,239 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:43:59,241 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-09 00:43:59,279 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-09 00:43:59,283 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7407911150> has no local changes
2025-05-09 00:43:59,283 [ 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#413 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/)'
2025-05-09 00:43:59,289 [ scc.git] DEBUG [detached HEAD f99c047] merge master -Dorg -Ssuccess-only
2025-05-09 00:43:59,290 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:43:59,290 [ scc.repo] DEBUG ## PRs found:
2025-05-09 00:43:59,449 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:43:59,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-05-09 00:43:59,970 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:00,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-05-09 00:44:00,471 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:00,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-05-09 00:44:00,984 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:01,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-09 00:44:01,525 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:01,730 [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-09 00:44:01,981 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:02,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-09 00:44:02,536 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:02,727 [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-09 00:44:02,728 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-09 00:44:02,979 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:03,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-05-09 00:44:03,476 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:03,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-05-09 00:44:03,963 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:04,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-09 00:44:04,524 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:04,823 [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-09 00:44:05,074 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:05,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-09 00:44:05,593 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:05,769 [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-09 00:44:05,769 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-09 00:44:05,769 [ scc.repo] DEBUG ## Branches found:
2025-05-09 00:44:05,769 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-09 00:44:05,769 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:05,770 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:05,772 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-09 00:44:05,775 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-09 00:44:05,775 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-09 00:44:05,778 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-09 00:44:05,786 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-05-09 00:44:06,020 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:06,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-05-09 00:44:06,455 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-05-09 00:44:06,757 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-09 00:44:06,757 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-05-09 00:44:06,761 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-05-09 00:44:07,022 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-09 00:44:07,022 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-05-09 00:44:07,026 [ scc.git] DEBUG ## Unique users: []
2025-05-09 00:44:07,026 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:07,026 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:07,028 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-09 00:44:07,033 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:07,035 [ 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-09 00:44:07,048 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-05-09 00:44:07,048 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-05-09 00:44:07,049 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-09 00:44:07,049 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-09 00:44:07,049 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-09 00:44:07,049 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-09 00:44:07,052 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-09 00:44:07,056 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-09 00:44:07,058 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:07,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:44:07,230 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-09 00:44:07,235 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-09 00:44:07,238 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#413](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-05-09 00:44:07,241 [ scc.config] DEBUG Found github.token
2025-05-09 00:44:07,241 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-05-09 00:44:07,241 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-09 00:44:07,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:07,248 [ 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-09 00:44:07,263 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-09 00:44:07,263 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-09 00:44:07,263 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-05-09 00:44:07,263 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-09 00:44:07,264 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-09 00:44:07,267 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-09 00:44:07,272 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-09 00:44:07,481 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:07,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:44:07,639 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-09 00:44:07,644 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-09 00:44:07,647 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#413](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/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-09 00:44:07,649 [ scc.config] DEBUG Found github.token
2025-05-09 00:44:07,649 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-05-09 00:44:07,649 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-09 00:44:07,687 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:07,687 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:07,690 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-09 00:44:07,727 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-09 00:44:07,731 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7407a058d0> has no local changes
2025-05-09 00:44:07,732 [ 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#413 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/)'
2025-05-09 00:44:07,739 [ scc.git] DEBUG [detached HEAD f2191c6] merge master -Dorg -Ssuccess-only
2025-05-09 00:44:07,740 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:44:07,740 [ scc.repo] DEBUG ## PRs found:
2025-05-09 00:44:07,890 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:08,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-05-09 00:44:08,465 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:08,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-05-09 00:44:08,937 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:09,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-09 00:44:09,470 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:09,722 [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-09 00:44:09,973 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:10,217 [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-09 00:44:10,469 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:10,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-09 00:44:10,927 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:11,143 [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-09 00:44:11,143 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-09 00:44:11,394 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:11,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-05-09 00:44:11,623 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-09 00:44:11,874 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:12,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-09 00:44:12,435 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:12,718 [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-09 00:44:12,970 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:13,261 [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-09 00:44:13,512 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:13,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-09 00:44:14,035 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:14,219 [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-09 00:44:14,219 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-09 00:44:14,470 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:14,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-05-09 00:44:14,722 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-09 00:44:14,973 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:15,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-09 00:44:15,515 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:15,762 [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-09 00:44:16,013 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:16,338 [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-09 00:44:16,590 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:16,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-09 00:44:17,065 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:17,272 [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-09 00:44:17,272 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-09 00:44:17,523 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:17,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-05-09 00:44:18,019 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:18,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-05-09 00:44:18,494 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:18,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-05-09 00:44:19,003 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:19,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-05-09 00:44:19,489 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:19,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-05-09 00:44:19,996 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:20,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-05-09 00:44:20,468 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:20,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-05-09 00:44:20,813 [ scc.repo] DEBUG ## Branches found:
2025-05-09 00:44:20,813 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-09 00:44:20,813 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:20,813 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:20,816 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-09 00:44:20,819 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-09 00:44:20,819 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-09 00:44:20,822 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-09 00:44:20,825 [ scc.git] DEBUG Already up to date.
2025-05-09 00:44:20,825 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-05-09 00:44:21,135 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-09 00:44:21,135 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-05-09 00:44:21,140 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-05-09 00:44:21,453 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-09 00:44:21,453 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-05-09 00:44:21,457 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-05-09 00:44:21,753 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-09 00:44:21,753 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-05-09 00:44:21,758 [ scc.git] DEBUG ## Unique users: []
2025-05-09 00:44:21,758 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:21,758 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:21,761 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-05-09 00:44:21,764 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:21,766 [ 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-09 00:44:21,775 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-09 00:44:21,778 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-05-09 00:44:21,778 [ scc.git] DEBUG package.json | 2 +-
2025-05-09 00:44:21,778 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-05-09 00:44:21,780 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:21,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:44:21,966 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-05-09 00:44:21,970 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:21,972 [ 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-09 00:44:21,984 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-09 00:44:21,984 [ scc.git] DEBUG Auto-merging package.json
2025-05-09 00:44:21,985 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-09 00:44:21,989 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-05-09 00:44:21,989 [ scc.git] DEBUG package.json | 2 +-
2025-05-09 00:44:21,989 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-05-09 00:44:22,217 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:22,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:44:22,379 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-05-09 00:44:22,383 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:22,386 [ 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-09 00:44:22,395 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-09 00:44:22,398 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-09 00:44:22,398 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-09 00:44:22,630 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:22,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:44:22,812 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-09 00:44:22,851 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:22,851 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:22,854 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-09 00:44:22,891 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-09 00:44:22,896 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7407bccc50> has no local changes
2025-05-09 00:44:22,896 [ 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#413 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/)'
2025-05-09 00:44:22,903 [ scc.git] DEBUG [detached HEAD 770c6c6] merge master -Dorg -Ssuccess-only
2025-05-09 00:44:22,904 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:44:22,904 [ scc.repo] DEBUG ## PRs found:
2025-05-09 00:44:23,063 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:23,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-05-09 00:44:23,237 [ scc.repo] DEBUG ## Branches found:
2025-05-09 00:44:23,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-09 00:44:23,237 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:23,237 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:23,240 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-09 00:44:23,242 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-09 00:44:23,243 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-09 00:44:23,246 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-09 00:44:23,249 [ scc.git] DEBUG Already up to date.
2025-05-09 00:44:23,249 [ scc.git] DEBUG ## Unique users: []
2025-05-09 00:44:23,250 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:23,250 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:23,252 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-09 00:44:23,290 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:23,290 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:23,293 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-09 00:44:23,331 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-09 00:44:23,335 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7404829f90> has no local changes
2025-05-09 00:44:23,335 [ 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#413 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/)'
2025-05-09 00:44:23,342 [ scc.git] DEBUG [detached HEAD 6890477] merge master -Dorg -Ssuccess-only
2025-05-09 00:44:23,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:44:23,342 [ scc.repo] DEBUG ## PRs found:
2025-05-09 00:44:23,488 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:23,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-05-09 00:44:24,029 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:24,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-05-09 00:44:24,554 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:24,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-05-09 00:44:25,023 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:25,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-05-09 00:44:25,264 [ scc.repo] DEBUG ## Branches found:
2025-05-09 00:44:25,264 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-09 00:44:25,264 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:25,264 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:25,267 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-09 00:44:25,270 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-09 00:44:25,270 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-09 00:44:25,273 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-09 00:44:25,276 [ scc.git] DEBUG Already up to date.
2025-05-09 00:44:25,276 [ scc.git] DEBUG ## Unique users: []
2025-05-09 00:44:25,276 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:25,276 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:25,278 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-09 00:44:25,318 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:25,318 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:25,321 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-09 00:44:25,358 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-09 00:44:25,362 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f74047eed50> has no local changes
2025-05-09 00:44:25,362 [ 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#413 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/)'
2025-05-09 00:44:25,369 [ scc.git] DEBUG [detached HEAD 7cd5467] merge master -Dorg -Ssuccess-only
2025-05-09 00:44:25,369 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:44:25,369 [ scc.repo] DEBUG ## PRs found:
2025-05-09 00:44:25,515 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:25,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-05-09 00:44:26,036 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:26,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-05-09 00:44:26,527 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:26,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-05-09 00:44:26,974 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:27,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-09 00:44:27,582 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:27,799 [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-09 00:44:28,050 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:28,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-09 00:44:28,624 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:28,824 [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-09 00:44:28,824 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-09 00:44:28,824 [ scc.repo] DEBUG ## Branches found:
2025-05-09 00:44:28,824 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-09 00:44:28,824 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:28,825 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:28,827 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-09 00:44:28,830 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-09 00:44:28,830 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-09 00:44:28,833 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-09 00:44:28,836 [ scc.git] DEBUG Already up to date.
2025-05-09 00:44:28,836 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-05-09 00:44:29,136 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-05-09 00:44:29,136 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-05-09 00:44:29,140 [ scc.git] DEBUG ## Unique users: []
2025-05-09 00:44:29,140 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:29,141 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:29,143 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-09 00:44:29,146 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:29,148 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-09 00:44:29,158 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-05-09 00:44:29,158 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-05-09 00:44:29,158 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-05-09 00:44:29,158 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-05-09 00:44:29,158 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-05-09 00:44:29,158 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-05-09 00:44:29,158 [ scc.git] DEBUG Auto-merging setup.py
2025-05-09 00:44:29,158 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-05-09 00:44:29,158 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-09 00:44:29,158 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-09 00:44:29,161 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-09 00:44:29,165 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-05-09 00:44:29,167 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:29,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:44:29,326 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-09 00:44:29,329 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-09 00:44:29,332 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#413](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/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-09 00:44:29,335 [ scc.config] DEBUG Found github.token
2025-05-09 00:44:29,335 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-05-09 00:44:29,335 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-09 00:44:29,373 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:29,373 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:29,376 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-09 00:44:29,413 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-09 00:44:29,417 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f74047e2890> has no local changes
2025-05-09 00:44:29,417 [ 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#413 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/)'
2025-05-09 00:44:29,423 [ scc.git] DEBUG [detached HEAD c3d2f0f] merge master -Dorg -Ssuccess-only
2025-05-09 00:44:29,424 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:44:29,424 [ scc.repo] DEBUG ## PRs found:
2025-05-09 00:44:29,577 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:29,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-05-09 00:44:30,169 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:30,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-05-09 00:44:30,639 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:30,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-09 00:44:31,214 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:31,476 [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-09 00:44:31,728 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:31,997 [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-09 00:44:32,249 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:32,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-09 00:44:32,832 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:33,041 [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-09 00:44:33,041 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-05-09 00:44:33,292 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:33,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-05-09 00:44:33,774 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:34,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-05-09 00:44:34,257 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:34,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-05-09 00:44:34,784 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:35,031 [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-09 00:44:35,283 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:35,524 [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-09 00:44:35,776 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:36,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-05-09 00:44:36,284 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:36,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-05-09 00:44:36,773 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:37,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-05-09 00:44:37,260 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:37,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-05-09 00:44:37,717 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:37,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-09 00:44:38,226 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:38,450 [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-09 00:44:38,702 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:38,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-09 00:44:39,224 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:39,410 [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-09 00:44:39,411 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-09 00:44:39,411 [ scc.repo] DEBUG ## Branches found:
2025-05-09 00:44:39,411 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-09 00:44:39,411 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:39,411 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:39,414 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-09 00:44:39,418 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-09 00:44:39,418 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-09 00:44:39,421 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-09 00:44:39,424 [ scc.git] DEBUG Already up to date.
2025-05-09 00:44:39,424 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-05-09 00:44:39,732 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-09 00:44:39,732 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-05-09 00:44:39,736 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-05-09 00:44:40,024 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-09 00:44:40,025 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-05-09 00:44:40,029 [ scc.git] DEBUG ## Unique users: []
2025-05-09 00:44:40,029 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:40,029 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:40,031 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-05-09 00:44:40,036 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:40,038 [ 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-09 00:44:40,050 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-09 00:44:40,054 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-05-09 00:44:40,054 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-05-09 00:44:40,054 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-05-09 00:44:40,054 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-05-09 00:44:40,054 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-05-09 00:44:40,054 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-05-09 00:44:40,054 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-05-09 00:44:40,055 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:40,055 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-05-09 00:44:40,055 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-05-09 00:44:40,055 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-05-09 00:44:40,055 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-05-09 00:44:40,056 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-05-09 00:44:40,056 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-05-09 00:44:40,056 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-05-09 00:44:40,056 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-05-09 00:44:40,056 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-05-09 00:44:40,056 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-05-09 00:44:40,056 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-05-09 00:44:40,056 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-05-09 00:44:40,056 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-05-09 00:44:40,056 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-05-09 00:44:40,056 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-05-09 00:44:40,056 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-05-09 00:44:40,056 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-05-09 00:44:40,056 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-05-09 00:44:40,056 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-05-09 00:44:40,056 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-05-09 00:44:40,056 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-05-09 00:44:40,056 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-05-09 00:44:40,056 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-05-09 00:44:40,056 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-05-09 00:44:40,056 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-05-09 00:44:40,056 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-05-09 00:44:40,056 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-05-09 00:44:40,056 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-05-09 00:44:40,056 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-05-09 00:44:40,056 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-05-09 00:44:40,056 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-05-09 00:44:40,056 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-05-09 00:44:40,056 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-05-09 00:44:40,056 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-05-09 00:44:40,056 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-05-09 00:44:40,056 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-05-09 00:44:40,056 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-05-09 00:44:40,056 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-05-09 00:44:40,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:44:40,226 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-09 00:44:40,231 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:40,233 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-09 00:44:40,244 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-09 00:44:40,246 [ scc.git] DEBUG docker | 1 +
2025-05-09 00:44:40,246 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-05-09 00:44:40,477 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:40,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:44:40,643 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-09 00:44:40,683 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:40,683 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:40,685 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-09 00:44:40,722 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-09 00:44:40,727 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f74048377d0> has no local changes
2025-05-09 00:44:40,727 [ 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#413 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/)'
2025-05-09 00:44:40,734 [ scc.git] DEBUG [detached HEAD c43a2ec] merge master -Dorg -Ssuccess-only
2025-05-09 00:44:40,734 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:44:40,735 [ scc.repo] DEBUG ## PRs found:
2025-05-09 00:44:40,894 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:41,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-05-09 00:44:41,093 [ scc.repo] DEBUG ## Branches found:
2025-05-09 00:44:41,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-09 00:44:41,094 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:41,094 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:41,096 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-09 00:44:41,099 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-09 00:44:41,099 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-09 00:44:41,102 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-09 00:44:41,104 [ scc.git] DEBUG Already up to date.
2025-05-09 00:44:41,104 [ scc.git] DEBUG ## Unique users: []
2025-05-09 00:44:41,105 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:41,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:41,107 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-09 00:44:41,144 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:41,144 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:41,146 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-09 00:44:41,184 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-09 00:44:41,188 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7404868550> has no local changes
2025-05-09 00:44:41,188 [ 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#413 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/)'
2025-05-09 00:44:41,194 [ scc.git] DEBUG [detached HEAD 56e9fad] merge master -Dorg -Ssuccess-only
2025-05-09 00:44:41,194 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:44:41,194 [ scc.repo] DEBUG ## PRs found:
2025-05-09 00:44:41,345 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:41,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-05-09 00:44:41,861 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:42,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-05-09 00:44:42,335 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:42,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-05-09 00:44:42,831 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:43,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-09 00:44:43,369 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:43,603 [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-09 00:44:43,854 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:44,127 [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-09 00:44:44,378 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:44,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-09 00:44:44,932 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:45,118 [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-09 00:44:45,118 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-05-09 00:44:45,118 [ scc.repo] DEBUG ## Branches found:
2025-05-09 00:44:45,119 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-09 00:44:45,119 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:45,119 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:45,121 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-09 00:44:45,125 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-09 00:44:45,125 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-09 00:44:45,127 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-09 00:44:45,131 [ scc.git] DEBUG Already up to date.
2025-05-09 00:44:45,131 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-05-09 00:44:45,437 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-05-09 00:44:45,437 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-05-09 00:44:45,441 [ scc.git] DEBUG ## Unique users: []
2025-05-09 00:44:45,441 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:45,441 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:45,443 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-05-09 00:44:45,446 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:45,448 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-05-09 00:44:45,456 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-09 00:44:45,459 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-05-09 00:44:45,459 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-05-09 00:44:45,459 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-05-09 00:44:45,459 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-05-09 00:44:45,459 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-05-09 00:44:45,460 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:45,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:44:45,644 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-09 00:44:45,683 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:45,683 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:45,686 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-09 00:44:45,723 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-09 00:44:45,727 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f740486bf50> has no local changes
2025-05-09 00:44:45,727 [ 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#413 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/)'
2025-05-09 00:44:45,733 [ scc.git] DEBUG [detached HEAD 89aca2c] merge master -Dorg -Ssuccess-only
2025-05-09 00:44:45,734 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:44:45,734 [ scc.git] INFO Overriding base-branch from master to main
2025-05-09 00:44:45,734 [ scc.repo] DEBUG ## PRs found:
2025-05-09 00:44:45,896 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:46,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-05-09 00:44:46,382 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:46,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-05-09 00:44:46,885 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:47,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-05-09 00:44:47,400 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:47,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-05-09 00:44:47,932 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:48,274 [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-09 00:44:48,526 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:48,751 [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-09 00:44:49,003 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:49,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-05-09 00:44:49,479 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:49,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-05-09 00:44:49,967 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:50,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-05-09 00:44:50,449 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:50,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-09 00:44:51,008 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:51,207 [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-09 00:44:51,459 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:51,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-09 00:44:51,973 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:52,154 [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-09 00:44:52,154 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-09 00:44:52,155 [ scc.repo] DEBUG ## Branches found:
2025-05-09 00:44:52,155 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-09 00:44:52,155 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:52,155 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:52,158 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-05-09 00:44:52,161 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-09 00:44:52,161 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-05-09 00:44:52,164 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-05-09 00:44:52,167 [ scc.git] DEBUG Already up to date.
2025-05-09 00:44:52,168 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-05-09 00:44:52,460 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-05-09 00:44:52,460 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-05-09 00:44:52,464 [ scc.git] DEBUG ## Unique users: []
2025-05-09 00:44:52,464 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:52,464 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:52,466 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-09 00:44:52,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:52,472 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-09 00:44:52,480 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-05-09 00:44:52,480 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-05-09 00:44:52,480 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-09 00:44:52,480 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-09 00:44:52,483 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-09 00:44:52,487 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-05-09 00:44:52,488 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:52,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:44:52,644 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-09 00:44:52,647 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-09 00:44:52,650 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#413](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-05-09 00:44:52,652 [ scc.config] DEBUG Found github.token
2025-05-09 00:44:52,652 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-05-09 00:44:52,652 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-09 00:44:52,690 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:52,690 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:52,692 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-09 00:44:52,729 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-09 00:44:52,732 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f740483c490> has no local changes
2025-05-09 00:44:52,732 [ 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#413 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/)'
2025-05-09 00:44:52,738 [ scc.git] DEBUG [detached HEAD cba2058] merge master -Dorg -Ssuccess-only
2025-05-09 00:44:52,739 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:44:52,739 [ scc.repo] DEBUG ## PRs found:
2025-05-09 00:44:52,895 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:53,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-05-09 00:44:53,079 [ scc.repo] DEBUG ## Branches found:
2025-05-09 00:44:53,079 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-09 00:44:53,079 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:53,079 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:53,082 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-09 00:44:53,084 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-09 00:44:53,084 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-09 00:44:53,087 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-09 00:44:53,090 [ scc.git] DEBUG Already up to date.
2025-05-09 00:44:53,090 [ scc.git] DEBUG ## Unique users: []
2025-05-09 00:44:53,090 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:53,090 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:53,092 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-09 00:44:53,129 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:53,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:53,131 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-09 00:44:53,169 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-09 00:44:53,172 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f74048a2510> has no local changes
2025-05-09 00:44:53,172 [ 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#413 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/)'
2025-05-09 00:44:53,178 [ scc.git] DEBUG [detached HEAD 9d58efe] merge master -Dorg -Ssuccess-only
2025-05-09 00:44:53,178 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:44:53,178 [ scc.repo] DEBUG ## PRs found:
2025-05-09 00:44:53,330 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:53,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-05-09 00:44:53,521 [ scc.repo] DEBUG ## Branches found:
2025-05-09 00:44:53,521 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-09 00:44:53,521 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:53,521 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:53,523 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-09 00:44:53,526 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-09 00:44:53,526 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-09 00:44:53,529 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-09 00:44:53,532 [ scc.git] DEBUG Already up to date.
2025-05-09 00:44:53,532 [ scc.git] DEBUG ## Unique users: []
2025-05-09 00:44:53,532 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:53,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:53,534 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-09 00:44:53,571 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:53,571 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:53,573 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-09 00:44:53,610 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-09 00:44:53,614 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f74048a1910> has no local changes
2025-05-09 00:44:53,614 [ 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#413 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/)'
2025-05-09 00:44:53,621 [ scc.git] DEBUG [detached HEAD 946e879] merge master -Dorg -Ssuccess-only
2025-05-09 00:44:53,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:44:53,621 [ scc.repo] DEBUG ## PRs found:
2025-05-09 00:44:53,772 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:54,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-05-09 00:44:54,282 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:54,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-05-09 00:44:54,774 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:54,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-05-09 00:44:55,243 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:55,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-09 00:44:55,783 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:55,976 [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-09 00:44:56,227 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:56,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-09 00:44:56,765 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:56,966 [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-09 00:44:56,966 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-05-09 00:44:56,967 [ scc.repo] DEBUG ## Branches found:
2025-05-09 00:44:56,967 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-09 00:44:56,967 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:56,967 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:56,970 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-09 00:44:56,972 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-09 00:44:56,972 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-09 00:44:56,975 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-09 00:44:56,978 [ scc.git] DEBUG Already up to date.
2025-05-09 00:44:56,978 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-05-09 00:44:57,276 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-05-09 00:44:57,276 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-05-09 00:44:57,280 [ scc.git] DEBUG ## Unique users: []
2025-05-09 00:44:57,280 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:57,280 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:57,283 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-09 00:44:57,286 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:57,288 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-09 00:44:57,296 [ scc.git] DEBUG Auto-merging Dockerfile
2025-05-09 00:44:57,296 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-05-09 00:44:57,297 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-09 00:44:57,297 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-09 00:44:57,300 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-09 00:44:57,305 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-05-09 00:44:57,306 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:57,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:44:57,467 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-09 00:44:57,470 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-09 00:44:57,473 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#413](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-05-09 00:44:57,475 [ scc.config] DEBUG Found github.token
2025-05-09 00:44:57,475 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-05-09 00:44:57,475 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-09 00:44:57,514 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:44:57,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:44:57,516 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-09 00:44:57,554 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-09 00:44:57,558 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f74048a9ed0> has no local changes
2025-05-09 00:44:57,558 [ 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#413 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/)'
2025-05-09 00:44:57,564 [ scc.git] DEBUG [detached HEAD f039255] merge master -Dorg -Ssuccess-only
2025-05-09 00:44:57,564 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:44:57,565 [ scc.git] INFO Overriding base-branch from master to develop
2025-05-09 00:44:57,565 [ scc.repo] DEBUG ## PRs found:
2025-05-09 00:44:57,718 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:57,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-05-09 00:44:58,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:58,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-05-09 00:44:58,734 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:58,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-05-09 00:44:59,239 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:59,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-09 00:44:59,681 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:44:59,910 [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-09 00:45:00,161 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:00,391 [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-09 00:45:00,643 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:00,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-09 00:45:01,096 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:01,299 [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-09 00:45:01,299 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-09 00:45:01,550 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:01,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-05-09 00:45:02,048 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:02,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-05-09 00:45:02,500 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:02,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-09 00:45:03,047 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:03,260 [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-09 00:45:03,511 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:03,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-09 00:45:03,956 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:04,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 500 0
2025-05-09 00:45:04,847 [urllib3.util] DEBUG Incremented Retry for (url='/repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1'): GithubRetry(total=9, connect=None, read=None, redirect=None, status=None)
2025-05-09 00:45:04,848 [urllib3.conn] DEBUG Retry: /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1
2025-05-09 00:45:05,014 [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-09 00:45:05,014 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-09 00:45:05,265 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:05,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-05-09 00:45:05,795 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:06,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-05-09 00:45:06,432 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:06,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-05-09 00:45:06,929 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:07,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-05-09 00:45:07,274 [ scc.repo] DEBUG ## Branches found:
2025-05-09 00:45:07,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-09 00:45:07,274 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:45:07,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:45:07,277 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-05-09 00:45:07,280 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-09 00:45:07,280 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-05-09 00:45:07,283 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-05-09 00:45:07,291 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-05-09 00:45:07,524 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:07,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-05-09 00:45:07,948 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-05-09 00:45:08,264 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-09 00:45:08,264 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-05-09 00:45:08,268 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-05-09 00:45:08,583 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-09 00:45:08,583 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-05-09 00:45:08,587 [ scc.git] DEBUG ## Unique users: []
2025-05-09 00:45:08,587 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:45:08,587 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:45:08,590 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-09 00:45:08,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:45:08,598 [ 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-09 00:45:08,609 [ 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-09 00:45:08,609 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-09 00:45:08,610 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-09 00:45:08,612 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-09 00:45:08,616 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-05-09 00:45:08,617 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:08,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:45:08,781 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-09 00:45:08,786 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-09 00:45:08,790 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#413](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-05-09 00:45:08,792 [ scc.config] DEBUG Found github.token
2025-05-09 00:45:08,792 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-05-09 00:45:08,792 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-05-09 00:45:08,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:45:08,799 [ 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-09 00:45:08,809 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-09 00:45:08,812 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-05-09 00:45:08,812 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-05-09 00:45:09,031 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:09,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:45:09,199 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-09 00:45:09,237 [ scc.git] DEBUG Get sha1 of %s
2025-05-09 00:45:09,238 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-09 00:45:09,240 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-09 00:45:09,276 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-09 00:45:09,280 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7404886e90> has no local changes
2025-05-09 00:45:09,280 [ 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#413 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/)'
2025-05-09 00:45:09,286 [ scc.git] DEBUG [detached HEAD 8216821] merge master -Dorg -Ssuccess-only
2025-05-09 00:45:09,287 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:45:09,287 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-09 00:45:09,364 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-05-09 00:45:09,450 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:09,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:45:09,621 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-05-09 00:45:09,623 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-05-09 00:45:09,867 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:10,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:45:10,045 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-05-09 00:45:10,047 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-05-09 00:45:10,291 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:10,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:45:10,455 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-05-09 00:45:10,457 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-05-09 00:45:10,701 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:10,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:45:10,867 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-05-09 00:45:11,112 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:11,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:45:11,289 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-05-09 00:45:11,291 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-05-09 00:45:11,536 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:11,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:45:11,699 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-05-09 00:45:11,701 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-05-09 00:45:11,946 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:12,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:45:12,110 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-05-09 00:45:12,112 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-05-09 00:45:12,357 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:12,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:45:12,530 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-05-09 00:45:12,532 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-05-09 00:45:12,776 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:12,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:45:12,944 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-05-09 00:45:12,946 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-05-09 00:45:13,191 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:13,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:45:13,356 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-05-09 00:45:13,358 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-05-09 00:45:13,603 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:13,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:45:13,770 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-05-09 00:45:13,772 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-05-09 00:45:14,017 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:14,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:45:14,188 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-05-09 00:45:14,190 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-05-09 00:45:14,435 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:14,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:45:14,618 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-05-09 00:45:14,862 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:15,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:45:15,031 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-05-09 00:45:15,276 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:15,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:45:15,452 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-05-09 00:45:15,454 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-05-09 00:45:15,698 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:15,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:45:15,883 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-05-09 00:45:16,127 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:16,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:45:16,302 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-05-09 00:45:16,546 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:16,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:45:16,718 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-05-09 00:45:16,720 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-05-09 00:45:16,964 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:17,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:45:17,149 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-05-09 00:45:17,151 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-05-09 00:45:17,395 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:17,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:45:17,573 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-05-09 00:45:17,575 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-05-09 00:45:17,819 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:17,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:45:17,997 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-05-09 00:45:17,999 [ scc.config] DEBUG Found submodule.scripts.url
2025-05-09 00:45:18,243 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-09 00:45:18,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-09 00:45:18,415 [ scc.config] DEBUG Found submodule.scripts.branch
2025-05-09 00:45:18,415 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-09 00:45:18,507 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7407fb0090> has local changes
2025-05-09 00:45:18,507 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
- PR 71 dominikl 'Escape slash character in image names'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
Updating 11d3587..5b2ca82
Previously merged:
- PR 171 will-moore 'Initial addition of integration tests'
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 167 dominikl 'Add extinfo command'
Repository: ome/omero-figure
Excluded PRs:
- PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
- PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..4f0362e2
Previously merged:
- 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 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
- PR 635 dependabot[bot] 'Bump esbuild and vite'
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#413 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/413/)'
2025-05-09 00:45:18,521 [ scc.git] DEBUG [detached HEAD b4083eb] merge master -Dorg -Ssuccess-only
2025-05-09 00:45:18,521 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-05-09 00:45:18,522 [ scc.merge] INFO Repository: ome/omero-plugins
2025-05-09 00:45:18,522 [ scc.merge] INFO Already up to date.
2025-05-09 00:45:18,522 [ scc.merge] INFO
2025-05-09 00:45:18,522 [ scc.merge] INFO Merged PRs:
2025-05-09 00:45:18,522 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-05-09 00:45:18,522 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-05-09 00:45:18,522 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-05-09 00:45:18,522 [ scc.merge] INFO
2025-05-09 00:45:18,522 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-05-09 00:45:18,522 [ scc.merge] INFO Already up to date.
2025-05-09 00:45:18,522 [ scc.merge] INFO
2025-05-09 00:45:18,522 [ scc.merge] INFO
2025-05-09 00:45:18,522 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-05-09 00:45:18,522 [ scc.merge] INFO Excluded PRs:
2025-05-09 00:45:18,522 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-05-09 00:45:18,522 [ scc.merge] INFO Already up to date.
2025-05-09 00:45:18,522 [ scc.merge] INFO
2025-05-09 00:45:18,522 [ scc.merge] INFO
2025-05-09 00:45:18,522 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-05-09 00:45:18,522 [ scc.merge] INFO Excluded PRs:
2025-05-09 00:45:18,522 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-05-09 00:45:18,522 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-05-09 00:45:18,522 [ scc.merge] INFO Already up to date.
2025-05-09 00:45:18,522 [ scc.merge] INFO
2025-05-09 00:45:18,522 [ scc.merge] INFO Merged PRs:
2025-05-09 00:45:18,522 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-05-09 00:45:18,522 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-05-09 00:45:18,523 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-05-09 00:45:18,523 [ scc.merge] INFO
2025-05-09 00:45:18,523 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-05-09 00:45:18,523 [ scc.merge] INFO Excluded PRs:
2025-05-09 00:45:18,523 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-05-09 00:45:18,523 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-05-09 00:45:18,523 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-05-09 00:45:18,523 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-09 00:45:18,523 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-05-09 00:45:18,523 [ scc.merge] INFO Updating 11d3587..5b2ca82
2025-05-09 00:45:18,523 [ scc.merge] INFO Previously merged:
2025-05-09 00:45:18,523 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-05-09 00:45:18,523 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-09 00:45:18,523 [ scc.merge] INFO
2025-05-09 00:45:18,523 [ scc.merge] INFO Merged PRs:
2025-05-09 00:45:18,523 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-05-09 00:45:18,523 [ scc.merge] INFO
2025-05-09 00:45:18,523 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-09 00:45:18,523 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-05-09 00:45:18,523 [ scc.merge] INFO
2025-05-09 00:45:18,523 [ scc.merge] INFO Repository: ome/omero-figure
2025-05-09 00:45:18,523 [ scc.merge] INFO Excluded PRs:
2025-05-09 00:45:18,523 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-05-09 00:45:18,523 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-05-09 00:45:18,523 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-05-09 00:45:18,523 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-05-09 00:45:18,523 [ scc.merge] INFO Updating 9cc36cde..4f0362e2
2025-05-09 00:45:18,523 [ scc.merge] INFO Previously merged:
2025-05-09 00:45:18,523 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-09 00:45:18,523 [ scc.merge] INFO
2025-05-09 00:45:18,523 [ scc.merge] INFO Merged PRs:
2025-05-09 00:45:18,523 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-05-09 00:45:18,523 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-05-09 00:45:18,523 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-05-09 00:45:18,523 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-05-09 00:45:18,523 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-05-09 00:45:18,523 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-05-09 00:45:18,523 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-05-09 00:45:18,523 [ scc.merge] INFO
2025-05-09 00:45:18,523 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-09 00:45:18,524 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-05-09 00:45:18,524 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-05-09 00:45:18,524 [ scc.merge] INFO
2025-05-09 00:45:18,524 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-05-09 00:45:18,524 [ scc.merge] INFO Already up to date.
2025-05-09 00:45:18,524 [ scc.merge] INFO
2025-05-09 00:45:18,524 [ scc.merge] INFO Merged PRs:
2025-05-09 00:45:18,524 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-05-09 00:45:18,524 [ scc.merge] INFO
2025-05-09 00:45:18,524 [ scc.merge] INFO Repository: ome/omero-gallery
2025-05-09 00:45:18,524 [ scc.merge] INFO Already up to date.
2025-05-09 00:45:18,524 [ scc.merge] INFO
2025-05-09 00:45:18,524 [ scc.merge] INFO Merged PRs:
2025-05-09 00:45:18,524 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-05-09 00:45:18,524 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-05-09 00:45:18,524 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-05-09 00:45:18,524 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-05-09 00:45:18,524 [ scc.merge] INFO
2025-05-09 00:45:18,524 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-09 00:45:18,524 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-05-09 00:45:18,524 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-05-09 00:45:18,524 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-05-09 00:45:18,524 [ scc.merge] INFO
2025-05-09 00:45:18,524 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-05-09 00:45:18,524 [ scc.merge] INFO Excluded PRs:
2025-05-09 00:45:18,524 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-05-09 00:45:18,524 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-05-09 00:45:18,524 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-05-09 00:45:18,524 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-05-09 00:45:18,524 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-05-09 00:45:18,524 [ scc.merge] INFO Already up to date.
2025-05-09 00:45:18,524 [ scc.merge] INFO
2025-05-09 00:45:18,524 [ scc.merge] INFO Merged PRs:
2025-05-09 00:45:18,524 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-05-09 00:45:18,524 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-05-09 00:45:18,524 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-05-09 00:45:18,524 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-05-09 00:45:18,524 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-09 00:45:18,524 [ scc.merge] INFO
2025-05-09 00:45:18,525 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-09 00:45:18,525 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-05-09 00:45:18,525 [ scc.merge] INFO
2025-05-09 00:45:18,525 [ scc.merge] INFO Repository: ome/omero-mapr
2025-05-09 00:45:18,525 [ scc.merge] INFO Excluded PRs:
2025-05-09 00:45:18,525 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-05-09 00:45:18,525 [ scc.merge] INFO Already up to date.
2025-05-09 00:45:18,525 [ scc.merge] INFO
2025-05-09 00:45:18,525 [ scc.merge] INFO Merged PRs:
2025-05-09 00:45:18,525 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-05-09 00:45:18,525 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-09 00:45:18,525 [ scc.merge] INFO
2025-05-09 00:45:18,525 [ scc.merge] INFO Repository: ome/omero-metadata
2025-05-09 00:45:18,525 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-05-09 00:45:18,525 [ scc.merge] INFO Previously merged:
2025-05-09 00:45:18,525 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-09 00:45:18,525 [ scc.merge] INFO
2025-05-09 00:45:18,525 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-09 00:45:18,525 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-09 00:45:18,525 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-09 00:45:18,525 [ scc.merge] INFO
2025-05-09 00:45:18,525 [ scc.merge] INFO Repository: ome/omero-parade
2025-05-09 00:45:18,525 [ scc.merge] INFO Excluded PRs:
2025-05-09 00:45:18,525 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-05-09 00:45:18,525 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-05-09 00:45:18,525 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-05-09 00:45:18,525 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-05-09 00:45:18,525 [ scc.merge] INFO Already up to date.
2025-05-09 00:45:18,525 [ scc.merge] INFO
2025-05-09 00:45:18,525 [ scc.merge] INFO Merged PRs:
2025-05-09 00:45:18,525 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-09 00:45:18,525 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-09 00:45:18,525 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-09 00:45:18,525 [ scc.merge] INFO
2025-05-09 00:45:18,525 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-05-09 00:45:18,525 [ scc.merge] INFO Already up to date.
2025-05-09 00:45:18,525 [ scc.merge] INFO
2025-05-09 00:45:18,525 [ scc.merge] INFO
2025-05-09 00:45:18,525 [ scc.merge] INFO Repository: ome/omero-rois
2025-05-09 00:45:18,525 [ scc.merge] INFO Excluded PRs:
2025-05-09 00:45:18,525 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-05-09 00:45:18,526 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-09 00:45:18,526 [ scc.merge] INFO Already up to date.
2025-05-09 00:45:18,526 [ scc.merge] INFO
2025-05-09 00:45:18,526 [ scc.merge] INFO
2025-05-09 00:45:18,526 [ scc.merge] INFO Repository: ome/omero-signup
2025-05-09 00:45:18,526 [ scc.merge] INFO Already up to date.
2025-05-09 00:45:18,526 [ scc.merge] INFO
2025-05-09 00:45:18,526 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-09 00:45:18,526 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-09 00:45:18,526 [ scc.merge] INFO
2025-05-09 00:45:18,526 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-05-09 00:45:18,526 [ scc.merge] INFO Excluded PRs:
2025-05-09 00:45:18,526 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-05-09 00:45:18,526 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-05-09 00:45:18,526 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-05-09 00:45:18,526 [ scc.merge] INFO Already up to date.
2025-05-09 00:45:18,526 [ scc.merge] INFO
2025-05-09 00:45:18,526 [ scc.merge] INFO Merged PRs:
2025-05-09 00:45:18,526 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-09 00:45:18,526 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-05-09 00:45:18,526 [ scc.merge] INFO
2025-05-09 00:45:18,526 [ scc.merge] INFO Repository: ome/omero-upload
2025-05-09 00:45:18,526 [ scc.merge] INFO Already up to date.
2025-05-09 00:45:18,526 [ scc.merge] INFO
2025-05-09 00:45:18,526 [ scc.merge] INFO
2025-05-09 00:45:18,526 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-05-09 00:45:18,526 [ scc.merge] INFO Already up to date.
2025-05-09 00:45:18,526 [ scc.merge] INFO
2025-05-09 00:45:18,526 [ scc.merge] INFO Merged PRs:
2025-05-09 00:45:18,526 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-05-09 00:45:18,526 [ scc.merge] INFO
2025-05-09 00:45:18,526 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-05-09 00:45:18,526 [ scc.merge] INFO Excluded PRs:
2025-05-09 00:45:18,526 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-05-09 00:45:18,526 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-05-09 00:45:18,526 [ scc.merge] INFO Already up to date.
2025-05-09 00:45:18,526 [ scc.merge] INFO
2025-05-09 00:45:18,526 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-09 00:45:18,526 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-09 00:45:18,526 [ scc.merge] INFO
2025-05-09 00:45:18,527 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-05-09 00:45:18,527 [ scc.merge] INFO Already up to date.
2025-05-09 00:45:18,527 [ scc.merge] INFO
2025-05-09 00:45:18,527 [ scc.merge] INFO
2025-05-09 00:45:18,527 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-05-09 00:45:18,527 [ scc.merge] INFO Already up to date.
2025-05-09 00:45:18,527 [ scc.merge] INFO
2025-05-09 00:45:18,527 [ scc.merge] INFO
2025-05-09 00:45:18,527 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-05-09 00:45:18,527 [ scc.merge] INFO Already up to date.
2025-05-09 00:45:18,527 [ scc.merge] INFO
2025-05-09 00:45:18,527 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-09 00:45:18,527 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-05-09 00:45:18,527 [ scc.merge] INFO
2025-05-09 00:45:18,527 [ scc.merge] INFO Repository: ome/scripts
2025-05-09 00:45:18,527 [ scc.merge] INFO Excluded PRs:
2025-05-09 00:45:18,527 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-05-09 00:45:18,527 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-05-09 00:45:18,527 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-05-09 00:45:18,527 [ scc.merge] INFO Previously merged:
2025-05-09 00:45:18,527 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-05-09 00:45:18,527 [ scc.merge] INFO
2025-05-09 00:45:18,527 [ scc.merge] INFO Merged PRs:
2025-05-09 00:45:18,527 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-09 00:45:18,527 [ scc.merge] INFO
2025-05-09 00:45:18,527 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-09 00:45:18,527 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-09 00:45:18,527 [ scc.merge] INFO
2025-05-09 00:45:18,527 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-05-09 00:45:18,527 [ scc.git] DEBUG Calling 'git remote'
2025-05-09 00:45:18,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-05-09 00:45:18,529 [ scc.git] DEBUG Calling 'git remote'
2025-05-09 00:45:18,532 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:45:18,532 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-05-09 00:45:18,532 [ scc.git] DEBUG Calling 'git remote'
2025-05-09 00:45:18,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:45:18,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-05-09 00:45:18,534 [ scc.git] DEBUG Calling 'git remote'
2025-05-09 00:45:18,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:45:18,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-05-09 00:45:18,536 [ scc.git] DEBUG Calling 'git remote'
2025-05-09 00:45:18,538 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:45:18,538 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-05-09 00:45:18,538 [ scc.git] DEBUG Calling 'git remote'
2025-05-09 00:45:18,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:45:18,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-05-09 00:45:18,541 [ scc.git] DEBUG Calling 'git remote'
2025-05-09 00:45:18,543 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:45:18,543 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-05-09 00:45:18,543 [ scc.git] DEBUG Calling 'git remote'
2025-05-09 00:45:18,545 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:45:18,545 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-05-09 00:45:18,545 [ scc.git] DEBUG Calling 'git remote'
2025-05-09 00:45:18,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:45:18,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-09 00:45:18,547 [ scc.git] DEBUG Calling 'git remote'
2025-05-09 00:45:18,549 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:45:18,549 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-09 00:45:18,549 [ scc.git] DEBUG Calling 'git remote'
2025-05-09 00:45:18,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:45:18,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-09 00:45:18,552 [ scc.git] DEBUG Calling 'git remote'
2025-05-09 00:45:18,554 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:45:18,554 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-09 00:45:18,554 [ scc.git] DEBUG Calling 'git remote'
2025-05-09 00:45:18,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:45:18,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-09 00:45:18,556 [ scc.git] DEBUG Calling 'git remote'
2025-05-09 00:45:18,558 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:45:18,558 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-09 00:45:18,558 [ scc.git] DEBUG Calling 'git remote'
2025-05-09 00:45:18,560 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:45:18,560 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-09 00:45:18,560 [ scc.git] DEBUG Calling 'git remote'
2025-05-09 00:45:18,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:45:18,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-09 00:45:18,563 [ scc.git] DEBUG Calling 'git remote'
2025-05-09 00:45:18,565 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:45:18,565 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-09 00:45:18,565 [ scc.git] DEBUG Calling 'git remote'
2025-05-09 00:45:18,567 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:45:18,567 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-09 00:45:18,567 [ scc.git] DEBUG Calling 'git remote'
2025-05-09 00:45:18,569 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:45:18,569 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-09 00:45:18,569 [ scc.git] DEBUG Calling 'git remote'
2025-05-09 00:45:18,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:45:18,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-09 00:45:18,571 [ scc.git] DEBUG Calling 'git remote'
2025-05-09 00:45:18,573 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:45:18,574 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-09 00:45:18,574 [ scc.git] DEBUG Calling 'git remote'
2025-05-09 00:45:18,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-09 00:45:18,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-09 00:45:18,576 [ scc.git] DEBUG Calling 'git remote'
2025-05-09 00:45:18,578 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.10.0 to 5.10.3-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD 9cc62a3] 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 1d9ac45] 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-09 00:46:06,438 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2025-05-09 00:46:16,029 [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-09 00:46:18,477 [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-09 00:46:23,218 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-05-09 00:47:04,534 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/eb00aee0/images/svgs/logo.svg){kind=logo}
