Skipping 227 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-04-24 12:46:49,977 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 12:46:50,016 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:46:50,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:46:50,018 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 12:46:50,056 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 12:46:50,063 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f955a739e10> has no local changes
2025-04-24 12:46:50,063 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#398 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/)'
2025-04-24 12:46:50,070 [ scc.git] DEBUG [detached HEAD cf93f03] merge master -Dorg -Ssuccess-only
2025-04-24 12:46:50,070 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:46:50,071 [ scc.repo] DEBUG ## PRs found:
2025-04-24 12:46:50,228 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:46:50,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-04-24 12:46:50,782 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:46:51,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-04-24 12:46:51,283 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:46:51,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-24 12:46:51,857 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:46:52,075 [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-04-24 12:46:52,326 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:46:52,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-24 12:46:52,884 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:46:53,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-04-24 12:46:53,066 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-24 12:46:53,317 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:46:53,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-04-24 12:46:53,789 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:46:54,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-04-24 12:46:54,355 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:46:54,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-24 12:46:54,871 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:46:55,123 [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-04-24 12:46:55,375 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:46:55,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-24 12:46:55,850 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:46:56,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-04-24 12:46:56,032 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-04-24 12:46:56,032 [ scc.repo] DEBUG ## Branches found:
2025-04-24 12:46:56,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-24 12:46:56,032 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:46:56,033 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:46:56,035 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-24 12:46:56,038 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 12:46:56,038 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-24 12:46:56,041 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-24 12:46:56,044 [ scc.git] DEBUG Already up to date.
2025-04-24 12:46:56,044 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-04-24 12:46:56,358 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-24 12:46:56,358 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-04-24 12:46:56,362 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-04-24 12:46:56,641 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-24 12:46:56,641 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-04-24 12:46:56,645 [ scc.git] DEBUG ## Unique users: []
2025-04-24 12:46:56,645 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:46:56,645 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:46:56,647 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-24 12:46:56,651 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:46:56,653 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-24 12:46:56,662 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-24 12:46:56,665 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-04-24 12:46:56,666 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-04-24 12:46:56,666 [ scc.git] DEBUG requirements.txt | 2 +-
2025-04-24 12:46:56,666 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-04-24 12:46:56,666 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-04-24 12:46:56,666 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-04-24 12:46:56,667 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:46:56,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:46:56,829 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-24 12:46:56,833 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:46:56,835 [ 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-04-24 12:46:56,844 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-24 12:46:56,847 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-24 12:46:56,847 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-24 12:46:57,080 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:46:57,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:46:57,266 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 12:46:57,303 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:46:57,303 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:46:57,306 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 12:46:57,342 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 12:46:57,346 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f955a7275d0> has no local changes
2025-04-24 12:46:57,346 [ 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#398 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/)'
2025-04-24 12:46:57,352 [ scc.git] DEBUG [detached HEAD 8e9d505] merge master -Dorg -Ssuccess-only
2025-04-24 12:46:57,353 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:46:57,353 [ scc.repo] DEBUG ## PRs found:
2025-04-24 12:46:57,517 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:46:57,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-04-24 12:46:58,061 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:46:58,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-04-24 12:46:58,580 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:46:58,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-04-24 12:46:59,153 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:46:59,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-24 12:46:59,701 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:46:59,925 [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-04-24 12:47:00,176 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:00,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-24 12:47:00,775 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:00,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-04-24 12:47:00,985 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-24 12:47:01,236 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:01,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-04-24 12:47:01,762 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:02,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-04-24 12:47:02,261 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:02,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-24 12:47:02,805 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:03,039 [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-04-24 12:47:03,290 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:03,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-24 12:47:03,813 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:04,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-04-24 12:47:04,009 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-24 12:47:04,009 [ scc.repo] DEBUG ## Branches found:
2025-04-24 12:47:04,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-24 12:47:04,009 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:04,009 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:04,012 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-24 12:47:04,014 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 12:47:04,014 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-24 12:47:04,017 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-24 12:47:04,025 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-04-24 12:47:04,260 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:04,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-04-24 12:47:04,735 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-04-24 12:47:05,014 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-24 12:47:05,014 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-04-24 12:47:05,018 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-04-24 12:47:05,297 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-24 12:47:05,297 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-04-24 12:47:05,301 [ scc.git] DEBUG ## Unique users: []
2025-04-24 12:47:05,301 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:05,301 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:05,303 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-24 12:47:05,308 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:05,310 [ 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-04-24 12:47:05,323 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-04-24 12:47:05,323 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-04-24 12:47:05,323 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-24 12:47:05,323 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-24 12:47:05,323 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-24 12:47:05,324 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-24 12:47:05,326 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-24 12:47:05,331 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-24 12:47:05,332 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:05,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:47:05,494 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-24 12:47:05,498 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-24 12:47:05,502 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#398](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-04-24 12:47:05,504 [ scc.config] DEBUG Found github.token
2025-04-24 12:47:05,504 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-04-24 12:47:05,504 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-24 12:47:05,508 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:05,510 [ 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-04-24 12:47:05,525 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-24 12:47:05,525 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-24 12:47:05,525 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-04-24 12:47:05,526 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-24 12:47:05,526 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-24 12:47:05,529 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-24 12:47:05,534 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-24 12:47:05,745 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:05,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:47:05,915 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-24 12:47:05,920 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-24 12:47:05,924 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#398](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/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-04-24 12:47:05,926 [ scc.config] DEBUG Found github.token
2025-04-24 12:47:05,926 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-04-24 12:47:05,926 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 12:47:05,965 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:05,965 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:05,967 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 12:47:06,005 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 12:47:06,010 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f955cc76650> has no local changes
2025-04-24 12:47:06,010 [ 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#398 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/)'
2025-04-24 12:47:06,016 [ scc.git] DEBUG [detached HEAD 7fb9142] merge master -Dorg -Ssuccess-only
2025-04-24 12:47:06,017 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:47:06,017 [ scc.repo] DEBUG ## PRs found:
2025-04-24 12:47:06,167 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:06,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-04-24 12:47:06,743 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:07,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-04-24 12:47:07,293 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:07,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-24 12:47:07,875 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:08,151 [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-04-24 12:47:08,402 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:08,680 [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-04-24 12:47:08,932 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:09,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-24 12:47:09,506 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:09,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-04-24 12:47:09,694 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-24 12:47:09,945 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:10,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-04-24 12:47:10,211 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-24 12:47:10,462 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:10,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-24 12:47:11,081 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:11,397 [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-04-24 12:47:11,648 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:11,927 [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-04-24 12:47:12,178 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:12,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-24 12:47:12,764 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:12,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-04-24 12:47:12,979 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-24 12:47:13,230 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:13,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-04-24 12:47:13,483 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-24 12:47:13,734 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:14,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-24 12:47:14,366 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:14,654 [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-04-24 12:47:14,906 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:15,195 [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-04-24 12:47:15,446 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:15,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-24 12:47:16,000 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:16,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-04-24 12:47:16,186 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-24 12:47:16,437 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:16,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-04-24 12:47:16,966 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:17,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-04-24 12:47:17,483 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:17,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-04-24 12:47:17,960 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:18,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-04-24 12:47:18,470 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:18,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-04-24 12:47:19,024 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:19,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-04-24 12:47:19,506 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:19,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-04-24 12:47:19,820 [ scc.repo] DEBUG ## Branches found:
2025-04-24 12:47:19,820 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-24 12:47:19,821 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:19,821 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:19,823 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-24 12:47:19,826 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 12:47:19,826 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-24 12:47:19,829 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-24 12:47:19,832 [ scc.git] DEBUG Already up to date.
2025-04-24 12:47:19,832 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-04-24 12:47:20,110 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-24 12:47:20,110 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-04-24 12:47:20,115 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-04-24 12:47:20,415 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-24 12:47:20,415 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-04-24 12:47:20,419 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-04-24 12:47:20,679 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-24 12:47:20,679 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-04-24 12:47:20,683 [ scc.git] DEBUG ## Unique users: []
2025-04-24 12:47:20,683 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:20,683 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:20,685 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-24 12:47:20,688 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:20,690 [ 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-04-24 12:47:20,698 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-24 12:47:20,702 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-04-24 12:47:20,702 [ scc.git] DEBUG package.json | 2 +-
2025-04-24 12:47:20,702 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-04-24 12:47:20,703 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:20,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:47:20,863 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-04-24 12:47:20,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:20,868 [ 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-04-24 12:47:20,878 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-24 12:47:20,878 [ scc.git] DEBUG Auto-merging package.json
2025-04-24 12:47:20,879 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-24 12:47:20,882 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-04-24 12:47:20,882 [ scc.git] DEBUG package.json | 2 +-
2025-04-24 12:47:20,882 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-04-24 12:47:21,113 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:21,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:47:21,306 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-24 12:47:21,309 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:21,312 [ 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-04-24 12:47:21,320 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-24 12:47:21,322 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-24 12:47:21,322 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-24 12:47:21,557 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:21,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:47:21,721 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 12:47:21,759 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:21,759 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:21,761 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 12:47:21,799 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 12:47:21,803 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f955853ff10> has no local changes
2025-04-24 12:47:21,803 [ 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#398 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/)'
2025-04-24 12:47:21,809 [ scc.git] DEBUG [detached HEAD 194f45c] merge master -Dorg -Ssuccess-only
2025-04-24 12:47:21,810 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:47:21,810 [ scc.repo] DEBUG ## PRs found:
2025-04-24 12:47:21,972 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:22,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-04-24 12:47:22,158 [ scc.repo] DEBUG ## Branches found:
2025-04-24 12:47:22,158 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-24 12:47:22,158 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:22,159 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:22,161 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-24 12:47:22,163 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 12:47:22,163 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-24 12:47:22,166 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-24 12:47:22,169 [ scc.git] DEBUG Already up to date.
2025-04-24 12:47:22,170 [ scc.git] DEBUG ## Unique users: []
2025-04-24 12:47:22,170 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:22,170 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:22,172 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 12:47:22,209 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:22,209 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:22,211 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 12:47:22,247 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 12:47:22,250 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f955852bb90> has no local changes
2025-04-24 12:47:22,251 [ 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#398 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/)'
2025-04-24 12:47:22,256 [ scc.git] DEBUG [detached HEAD ca0e41a] merge master -Dorg -Ssuccess-only
2025-04-24 12:47:22,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:47:22,257 [ scc.repo] DEBUG ## PRs found:
2025-04-24 12:47:22,409 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:22,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-04-24 12:47:23,004 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:23,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-04-24 12:47:23,535 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:23,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-04-24 12:47:24,032 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:24,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-04-24 12:47:24,328 [ scc.repo] DEBUG ## Branches found:
2025-04-24 12:47:24,328 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-24 12:47:24,328 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:24,328 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:24,331 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-24 12:47:24,333 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 12:47:24,333 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-24 12:47:24,336 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-24 12:47:24,339 [ scc.git] DEBUG Already up to date.
2025-04-24 12:47:24,339 [ scc.git] DEBUG ## Unique users: []
2025-04-24 12:47:24,339 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:24,339 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:24,341 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 12:47:24,379 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:24,379 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:24,381 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 12:47:24,417 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 12:47:24,420 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f955852b1d0> has no local changes
2025-04-24 12:47:24,421 [ 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#398 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/)'
2025-04-24 12:47:24,427 [ scc.git] DEBUG [detached HEAD ec09bec] merge master -Dorg -Ssuccess-only
2025-04-24 12:47:24,427 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:47:24,427 [ scc.repo] DEBUG ## PRs found:
2025-04-24 12:47:24,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:24,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-04-24 12:47:25,134 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:25,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-04-24 12:47:25,633 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:25,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-04-24 12:47:26,165 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:26,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-24 12:47:26,768 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:27,001 [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-04-24 12:47:27,252 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:27,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-24 12:47:27,859 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:28,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-04-24 12:47:28,047 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-24 12:47:28,047 [ scc.repo] DEBUG ## Branches found:
2025-04-24 12:47:28,047 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-24 12:47:28,047 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:28,047 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:28,050 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-24 12:47:28,052 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 12:47:28,052 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-24 12:47:28,055 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-24 12:47:28,058 [ scc.git] DEBUG Already up to date.
2025-04-24 12:47:28,058 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-04-24 12:47:28,353 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-04-24 12:47:28,353 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-04-24 12:47:28,357 [ scc.git] DEBUG ## Unique users: []
2025-04-24 12:47:28,357 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:28,357 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:28,360 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-24 12:47:28,363 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:28,365 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-24 12:47:28,374 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-04-24 12:47:28,374 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-04-24 12:47:28,374 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-04-24 12:47:28,374 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-04-24 12:47:28,374 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-04-24 12:47:28,374 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-04-24 12:47:28,374 [ scc.git] DEBUG Auto-merging setup.py
2025-04-24 12:47:28,374 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-04-24 12:47:28,374 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-24 12:47:28,374 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-24 12:47:28,377 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-24 12:47:28,381 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-04-24 12:47:28,382 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:28,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:47:28,570 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-24 12:47:28,574 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-24 12:47:28,577 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#398](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
- omero_signup/views.py
--conflicts
2025-04-24 12:47:28,579 [ scc.config] DEBUG Found github.token
2025-04-24 12:47:28,579 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-04-24 12:47:28,579 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 12:47:28,616 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:28,616 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:28,618 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 12:47:28,656 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 12:47:28,660 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f955856f550> has no local changes
2025-04-24 12:47:28,660 [ 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#398 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/)'
2025-04-24 12:47:28,667 [ scc.git] DEBUG [detached HEAD 5c37b09] merge master -Dorg -Ssuccess-only
2025-04-24 12:47:28,667 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:47:28,667 [ scc.repo] DEBUG ## PRs found:
2025-04-24 12:47:28,821 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:29,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-04-24 12:47:29,410 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:29,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-04-24 12:47:29,927 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:30,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-04-24 12:47:30,545 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:30,851 [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-04-24 12:47:31,102 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:31,356 [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-04-24 12:47:31,607 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:31,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-04-24 12:47:32,081 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:32,294 [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-04-24 12:47:32,294 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-04-24 12:47:32,545 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:32,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-04-24 12:47:33,089 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:33,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-04-24 12:47:33,562 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:33,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-04-24 12:47:34,108 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:34,379 [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-04-24 12:47:34,630 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:34,911 [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-04-24 12:47:35,162 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:35,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-04-24 12:47:35,689 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:35,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-04-24 12:47:36,176 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:36,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-04-24 12:47:36,710 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:36,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-04-24 12:47:37,174 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:37,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-24 12:47:37,744 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:37,950 [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-04-24 12:47:38,202 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:38,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-24 12:47:38,681 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:38,883 [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-04-24 12:47:38,883 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-24 12:47:38,884 [ scc.repo] DEBUG ## Branches found:
2025-04-24 12:47:38,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-24 12:47:38,884 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:38,884 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:38,887 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-24 12:47:38,889 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 12:47:38,889 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-24 12:47:38,892 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-24 12:47:38,895 [ scc.git] DEBUG Already up to date.
2025-04-24 12:47:38,895 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-04-24 12:47:39,175 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-24 12:47:39,175 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-04-24 12:47:39,179 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-04-24 12:47:39,520 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-24 12:47:39,520 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-04-24 12:47:39,524 [ scc.git] DEBUG ## Unique users: []
2025-04-24 12:47:39,524 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:39,524 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:39,527 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-04-24 12:47:39,531 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:39,533 [ 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-04-24 12:47:39,545 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-24 12:47:39,549 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-04-24 12:47:39,549 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-04-24 12:47:39,549 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-04-24 12:47:39,549 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-04-24 12:47:39,549 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-04-24 12:47:39,549 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-04-24 12:47:39,549 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-04-24 12:47:39,549 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-04-24 12:47:39,550 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:39,550 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-04-24 12:47:39,550 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-04-24 12:47:39,550 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-04-24 12:47:39,550 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-04-24 12:47:39,550 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-04-24 12:47:39,550 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-04-24 12:47:39,550 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-04-24 12:47:39,550 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-04-24 12:47:39,550 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-04-24 12:47:39,550 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-04-24 12:47:39,550 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-04-24 12:47:39,550 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-04-24 12:47:39,550 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-04-24 12:47:39,550 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-04-24 12:47:39,550 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-04-24 12:47:39,550 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-04-24 12:47:39,551 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-04-24 12:47:39,551 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-04-24 12:47:39,551 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-04-24 12:47:39,551 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-04-24 12:47:39,551 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-04-24 12:47:39,551 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-04-24 12:47:39,551 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-04-24 12:47:39,551 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-04-24 12:47:39,551 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-04-24 12:47:39,551 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-04-24 12:47:39,551 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-04-24 12:47:39,551 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-04-24 12:47:39,551 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-04-24 12:47:39,551 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-04-24 12:47:39,551 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-04-24 12:47:39,551 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-04-24 12:47:39,551 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-04-24 12:47:39,551 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-04-24 12:47:39,551 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-04-24 12:47:39,551 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-04-24 12:47:39,551 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-04-24 12:47:39,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:47:39,708 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-04-24 12:47:39,712 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:39,714 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-04-24 12:47:39,724 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-24 12:47:39,727 [ scc.git] DEBUG docker | 1 +
2025-04-24 12:47:39,727 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-04-24 12:47:39,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:40,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:47:40,130 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 12:47:40,168 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:40,168 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:40,170 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 12:47:40,206 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 12:47:40,211 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f955854f610> has no local changes
2025-04-24 12:47:40,211 [ 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#398 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/)'
2025-04-24 12:47:40,217 [ scc.git] DEBUG [detached HEAD 56674cb] merge master -Dorg -Ssuccess-only
2025-04-24 12:47:40,217 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:47:40,217 [ scc.repo] DEBUG ## PRs found:
2025-04-24 12:47:40,381 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:40,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-04-24 12:47:40,563 [ scc.repo] DEBUG ## Branches found:
2025-04-24 12:47:40,563 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-24 12:47:40,563 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:40,563 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:40,565 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-24 12:47:40,568 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 12:47:40,568 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-24 12:47:40,571 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-24 12:47:40,574 [ scc.git] DEBUG Already up to date.
2025-04-24 12:47:40,574 [ scc.git] DEBUG ## Unique users: []
2025-04-24 12:47:40,574 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:40,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:40,576 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 12:47:40,614 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:40,614 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:40,617 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 12:47:40,654 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 12:47:40,657 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f95585256d0> has no local changes
2025-04-24 12:47:40,657 [ 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#398 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/)'
2025-04-24 12:47:40,663 [ scc.git] DEBUG [detached HEAD 2ce8360] merge master -Dorg -Ssuccess-only
2025-04-24 12:47:40,664 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:47:40,664 [ scc.repo] DEBUG ## PRs found:
2025-04-24 12:47:40,814 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:41,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-04-24 12:47:41,373 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:41,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-04-24 12:47:41,877 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:42,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-04-24 12:47:42,359 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:42,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-24 12:47:42,939 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:43,162 [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-04-24 12:47:43,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:43,626 [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-04-24 12:47:43,878 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:44,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-24 12:47:44,473 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:44,657 [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-04-24 12:47:44,658 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-04-24 12:47:44,658 [ scc.repo] DEBUG ## Branches found:
2025-04-24 12:47:44,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-24 12:47:44,659 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:44,659 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:44,662 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-24 12:47:44,664 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 12:47:44,664 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-24 12:47:44,667 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-24 12:47:44,670 [ scc.git] DEBUG Already up to date.
2025-04-24 12:47:44,670 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-04-24 12:47:44,985 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-04-24 12:47:44,985 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-04-24 12:47:44,989 [ scc.git] DEBUG ## Unique users: []
2025-04-24 12:47:44,990 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:44,990 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:44,992 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-04-24 12:47:44,995 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:44,997 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-04-24 12:47:45,005 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-24 12:47:45,008 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-04-24 12:47:45,008 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-04-24 12:47:45,008 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-04-24 12:47:45,008 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-04-24 12:47:45,008 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-04-24 12:47:45,011 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:45,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:47:45,179 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 12:47:45,218 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:45,218 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:45,220 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 12:47:45,257 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 12:47:45,261 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f95585a0810> has no local changes
2025-04-24 12:47:45,261 [ 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#398 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/)'
2025-04-24 12:47:45,267 [ scc.git] DEBUG [detached HEAD 62db99a] merge master -Dorg -Ssuccess-only
2025-04-24 12:47:45,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:47:45,268 [ scc.git] INFO Overriding base-branch from master to main
2025-04-24 12:47:45,268 [ scc.repo] DEBUG ## PRs found:
2025-04-24 12:47:45,430 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:45,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-04-24 12:47:45,960 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:46,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-04-24 12:47:46,457 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:46,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-04-24 12:47:46,993 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:47,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-04-24 12:47:47,612 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:47,944 [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-04-24 12:47:48,195 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:48,426 [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-04-24 12:47:48,678 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:48,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-04-24 12:47:49,149 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:49,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-04-24 12:47:49,680 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:49,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-04-24 12:47:50,149 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:50,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-24 12:47:50,663 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:50,893 [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-04-24 12:47:51,144 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:51,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-24 12:47:51,693 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:51,883 [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-04-24 12:47:51,883 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-24 12:47:51,884 [ scc.repo] DEBUG ## Branches found:
2025-04-24 12:47:51,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-24 12:47:51,884 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:51,884 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:51,887 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-04-24 12:47:51,889 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 12:47:51,889 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-04-24 12:47:51,892 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-04-24 12:47:51,895 [ scc.git] DEBUG Already up to date.
2025-04-24 12:47:51,895 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-04-24 12:47:52,219 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-04-24 12:47:52,220 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-04-24 12:47:52,224 [ scc.git] DEBUG ## Unique users: []
2025-04-24 12:47:52,224 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:52,224 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:52,227 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-24 12:47:52,230 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:52,232 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-24 12:47:52,240 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-04-24 12:47:52,240 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-04-24 12:47:52,241 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-24 12:47:52,241 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-24 12:47:52,244 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-24 12:47:52,248 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-04-24 12:47:52,249 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:52,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:47:52,427 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-24 12:47:52,431 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-24 12:47:52,434 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#398](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-04-24 12:47:52,436 [ scc.config] DEBUG Found github.token
2025-04-24 12:47:52,436 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-04-24 12:47:52,436 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 12:47:52,474 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:52,475 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:52,477 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 12:47:52,514 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 12:47:52,517 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f955cd69a90> has no local changes
2025-04-24 12:47:52,518 [ 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#398 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/)'
2025-04-24 12:47:52,524 [ scc.git] DEBUG [detached HEAD 22fa716] merge master -Dorg -Ssuccess-only
2025-04-24 12:47:52,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:47:52,524 [ scc.repo] DEBUG ## PRs found:
2025-04-24 12:47:52,678 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:52,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-04-24 12:47:52,878 [ scc.repo] DEBUG ## Branches found:
2025-04-24 12:47:52,878 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-24 12:47:52,878 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:52,878 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:52,881 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-24 12:47:52,883 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 12:47:52,883 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-24 12:47:52,886 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-24 12:47:52,889 [ scc.git] DEBUG Already up to date.
2025-04-24 12:47:52,889 [ scc.git] DEBUG ## Unique users: []
2025-04-24 12:47:52,889 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:52,889 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:52,891 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 12:47:52,929 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:52,929 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:52,932 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 12:47:52,969 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 12:47:52,972 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f955a728110> has no local changes
2025-04-24 12:47:52,972 [ 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#398 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/)'
2025-04-24 12:47:52,978 [ scc.git] DEBUG [detached HEAD 11d1cec] merge master -Dorg -Ssuccess-only
2025-04-24 12:47:52,979 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:47:52,979 [ scc.repo] DEBUG ## PRs found:
2025-04-24 12:47:53,129 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:53,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-04-24 12:47:53,340 [ scc.repo] DEBUG ## Branches found:
2025-04-24 12:47:53,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-24 12:47:53,340 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:53,340 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:53,343 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-24 12:47:53,345 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 12:47:53,345 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-24 12:47:53,348 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-24 12:47:53,351 [ scc.git] DEBUG Already up to date.
2025-04-24 12:47:53,351 [ scc.git] DEBUG ## Unique users: []
2025-04-24 12:47:53,351 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:53,351 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:53,353 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 12:47:53,391 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:53,391 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:53,393 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 12:47:53,431 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 12:47:53,434 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9558597c10> has no local changes
2025-04-24 12:47:53,434 [ 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#398 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/)'
2025-04-24 12:47:53,441 [ scc.git] DEBUG [detached HEAD 7585628] merge master -Dorg -Ssuccess-only
2025-04-24 12:47:53,441 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:47:53,441 [ scc.repo] DEBUG ## PRs found:
2025-04-24 12:47:53,591 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:53,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-04-24 12:47:54,155 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:54,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-04-24 12:47:54,669 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:54,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-04-24 12:47:55,166 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:55,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-24 12:47:55,714 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:55,960 [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-04-24 12:47:56,211 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:56,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-24 12:47:56,669 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:56,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-04-24 12:47:56,865 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-04-24 12:47:56,865 [ scc.repo] DEBUG ## Branches found:
2025-04-24 12:47:56,865 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-24 12:47:56,865 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:56,865 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:56,868 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-24 12:47:56,870 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 12:47:56,871 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-24 12:47:56,873 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-24 12:47:56,876 [ scc.git] DEBUG Already up to date.
2025-04-24 12:47:56,876 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-04-24 12:47:57,191 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-04-24 12:47:57,191 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-04-24 12:47:57,195 [ scc.git] DEBUG ## Unique users: []
2025-04-24 12:47:57,195 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:57,195 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:57,198 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-24 12:47:57,201 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:57,203 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-24 12:47:57,211 [ scc.git] DEBUG Auto-merging Dockerfile
2025-04-24 12:47:57,211 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-04-24 12:47:57,212 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-24 12:47:57,212 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-24 12:47:57,215 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-24 12:47:57,220 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-04-24 12:47:57,221 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:57,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:47:57,415 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-24 12:47:57,417 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-24 12:47:57,420 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#398](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-04-24 12:47:57,422 [ scc.config] DEBUG Found github.token
2025-04-24 12:47:57,422 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-04-24 12:47:57,422 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 12:47:57,460 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:47:57,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:47:57,462 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 12:47:57,499 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 12:47:57,503 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f955a904610> has no local changes
2025-04-24 12:47:57,503 [ 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#398 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/)'
2025-04-24 12:47:57,510 [ scc.git] DEBUG [detached HEAD 467abd8] merge master -Dorg -Ssuccess-only
2025-04-24 12:47:57,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:47:57,510 [ scc.git] INFO Overriding base-branch from master to develop
2025-04-24 12:47:57,510 [ scc.repo] DEBUG ## PRs found:
2025-04-24 12:47:57,666 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:58,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-04-24 12:47:58,293 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:58,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-04-24 12:47:58,782 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:59,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-04-24 12:47:59,262 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:47:59,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-24 12:47:59,815 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:00,070 [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-04-24 12:48:00,321 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:00,568 [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-04-24 12:48:00,820 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:01,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-24 12:48:01,330 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:01,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-04-24 12:48:01,524 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-24 12:48:01,774 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:02,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-04-24 12:48:02,306 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:02,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-04-24 12:48:02,809 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:03,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-24 12:48:03,366 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:03,594 [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-04-24 12:48:03,845 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:04,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-24 12:48:04,421 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:04,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-04-24 12:48:04,612 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-24 12:48:04,863 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:05,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-04-24 12:48:05,360 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:05,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-04-24 12:48:05,932 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:06,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-04-24 12:48:06,422 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:06,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-04-24 12:48:06,728 [ scc.repo] DEBUG ## Branches found:
2025-04-24 12:48:06,728 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-24 12:48:06,728 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:48:06,728 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:48:06,731 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-04-24 12:48:06,733 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 12:48:06,733 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-04-24 12:48:06,736 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-04-24 12:48:06,745 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-04-24 12:48:06,978 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:07,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-04-24 12:48:07,430 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-04-24 12:48:07,738 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-24 12:48:07,738 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-04-24 12:48:07,742 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-04-24 12:48:08,035 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-24 12:48:08,035 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-04-24 12:48:08,039 [ scc.git] DEBUG ## Unique users: []
2025-04-24 12:48:08,039 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:48:08,039 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:48:08,041 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-24 12:48:08,047 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:48:08,049 [ 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-04-24 12:48:08,059 [ 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-04-24 12:48:08,060 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-24 12:48:08,060 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-24 12:48:08,063 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-24 12:48:08,067 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-04-24 12:48:08,068 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:08,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:48:08,254 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-24 12:48:08,259 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-24 12:48:08,263 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#398](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-04-24 12:48:08,265 [ scc.config] DEBUG Found github.token
2025-04-24 12:48:08,265 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-04-24 12:48:08,265 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-24 12:48:08,270 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:48:08,272 [ 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-04-24 12:48:08,282 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-24 12:48:08,285 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-04-24 12:48:08,285 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-04-24 12:48:08,504 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:08,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:48:08,660 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 12:48:08,698 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 12:48:08,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 12:48:08,700 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 12:48:08,736 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 12:48:08,740 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f955a6dee50> has no local changes
2025-04-24 12:48:08,740 [ 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#398 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/)'
2025-04-24 12:48:08,747 [ scc.git] DEBUG [detached HEAD 108ee4f] merge master -Dorg -Ssuccess-only
2025-04-24 12:48:08,747 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:48:08,747 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 12:48:08,819 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-04-24 12:48:08,911 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:09,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:48:09,082 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-04-24 12:48:09,084 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-04-24 12:48:09,328 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:09,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:48:09,510 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-04-24 12:48:09,512 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-04-24 12:48:09,756 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:09,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:48:09,933 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-04-24 12:48:09,935 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-04-24 12:48:10,180 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:10,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:48:10,359 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-04-24 12:48:10,604 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:10,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:48:10,769 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-04-24 12:48:10,771 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-04-24 12:48:11,016 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:11,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:48:11,197 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-04-24 12:48:11,199 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-04-24 12:48:11,443 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:11,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:48:11,618 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-04-24 12:48:11,620 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-04-24 12:48:11,864 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:12,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:48:12,038 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-04-24 12:48:12,040 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-04-24 12:48:12,284 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:12,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:48:12,468 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-04-24 12:48:12,470 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-04-24 12:48:12,714 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:12,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:48:12,894 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-04-24 12:48:12,896 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-04-24 12:48:13,140 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:13,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:48:13,311 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-04-24 12:48:13,313 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-04-24 12:48:13,558 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:13,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:48:13,738 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-04-24 12:48:13,740 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-04-24 12:48:13,984 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:14,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:48:14,153 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-04-24 12:48:14,397 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:14,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:48:14,562 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-04-24 12:48:14,807 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:14,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:48:14,979 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-04-24 12:48:14,981 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-04-24 12:48:15,225 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:15,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:48:15,399 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-04-24 12:48:15,643 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:15,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:48:15,816 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-04-24 12:48:16,060 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:16,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:48:16,245 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-04-24 12:48:16,247 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-04-24 12:48:16,491 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:16,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:48:16,667 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-04-24 12:48:16,669 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-04-24 12:48:16,913 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:17,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:48:17,086 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-04-24 12:48:17,088 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-04-24 12:48:17,333 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:18,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:48:18,824 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-04-24 12:48:18,826 [ scc.config] DEBUG Found submodule.scripts.url
2025-04-24 12:48:19,070 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 12:48:19,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 12:48:19,288 [ scc.config] DEBUG Found submodule.scripts.branch
2025-04-24 12:48:19,288 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 12:48:19,375 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f955a912810> has local changes
2025-04-24 12:48:19,375 [ 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'
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..7a2c812
Previously merged:
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 147 will-moore 'Name option'
- PR 171 will-moore 'Initial addition of integration tests'
Conflicting PRs (not included):
- PR 167 dominikl 'Add extinfo command'
Repository: ome/omero-figure
Excluded PRs:
- 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#398 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/398/)'
2025-04-24 12:48:19,388 [ scc.git] DEBUG [detached HEAD cd16006] merge master -Dorg -Ssuccess-only
2025-04-24 12:48:19,388 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-04-24 12:48:19,388 [ scc.merge] INFO Repository: ome/omero-plugins
2025-04-24 12:48:19,388 [ scc.merge] INFO Already up to date.
2025-04-24 12:48:19,388 [ scc.merge] INFO
2025-04-24 12:48:19,388 [ scc.merge] INFO Merged PRs:
2025-04-24 12:48:19,388 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-04-24 12:48:19,389 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-04-24 12:48:19,389 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-04-24 12:48:19,389 [ scc.merge] INFO
2025-04-24 12:48:19,389 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-04-24 12:48:19,389 [ scc.merge] INFO Already up to date.
2025-04-24 12:48:19,389 [ scc.merge] INFO
2025-04-24 12:48:19,389 [ scc.merge] INFO
2025-04-24 12:48:19,389 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-04-24 12:48:19,389 [ scc.merge] INFO Excluded PRs:
2025-04-24 12:48:19,389 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-04-24 12:48:19,389 [ scc.merge] INFO Already up to date.
2025-04-24 12:48:19,389 [ scc.merge] INFO
2025-04-24 12:48:19,389 [ scc.merge] INFO
2025-04-24 12:48:19,389 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-04-24 12:48:19,389 [ scc.merge] INFO Excluded PRs:
2025-04-24 12:48:19,389 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-04-24 12:48:19,389 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-04-24 12:48:19,389 [ scc.merge] INFO Already up to date.
2025-04-24 12:48:19,389 [ scc.merge] INFO
2025-04-24 12:48:19,389 [ scc.merge] INFO Merged PRs:
2025-04-24 12:48:19,389 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-04-24 12:48:19,389 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-04-24 12:48:19,389 [ scc.merge] INFO
2025-04-24 12:48:19,389 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-04-24 12:48:19,389 [ scc.merge] INFO Excluded PRs:
2025-04-24 12:48:19,389 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-04-24 12:48:19,389 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-04-24 12:48:19,389 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-04-24 12:48:19,389 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-24 12:48:19,389 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-04-24 12:48:19,389 [ scc.merge] INFO Updating 11d3587..7a2c812
2025-04-24 12:48:19,389 [ scc.merge] INFO Previously merged:
2025-04-24 12:48:19,389 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-24 12:48:19,389 [ scc.merge] INFO
2025-04-24 12:48:19,390 [ scc.merge] INFO Merged PRs:
2025-04-24 12:48:19,390 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-04-24 12:48:19,390 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-04-24 12:48:19,390 [ scc.merge] INFO
2025-04-24 12:48:19,390 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-24 12:48:19,390 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-04-24 12:48:19,390 [ scc.merge] INFO
2025-04-24 12:48:19,390 [ scc.merge] INFO Repository: ome/omero-figure
2025-04-24 12:48:19,390 [ scc.merge] INFO Excluded PRs:
2025-04-24 12:48:19,390 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-04-24 12:48:19,390 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-04-24 12:48:19,390 [ scc.merge] INFO Updating 9cc36cde..4f0362e2
2025-04-24 12:48:19,390 [ scc.merge] INFO Previously merged:
2025-04-24 12:48:19,390 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-24 12:48:19,390 [ scc.merge] INFO
2025-04-24 12:48:19,390 [ scc.merge] INFO Merged PRs:
2025-04-24 12:48:19,390 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-04-24 12:48:19,390 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-04-24 12:48:19,390 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-04-24 12:48:19,390 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-04-24 12:48:19,390 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-04-24 12:48:19,390 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-04-24 12:48:19,390 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-04-24 12:48:19,390 [ scc.merge] INFO
2025-04-24 12:48:19,390 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-24 12:48:19,390 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-04-24 12:48:19,390 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-04-24 12:48:19,390 [ scc.merge] INFO
2025-04-24 12:48:19,390 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-04-24 12:48:19,390 [ scc.merge] INFO Already up to date.
2025-04-24 12:48:19,390 [ scc.merge] INFO
2025-04-24 12:48:19,390 [ scc.merge] INFO Merged PRs:
2025-04-24 12:48:19,390 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-04-24 12:48:19,390 [ scc.merge] INFO
2025-04-24 12:48:19,390 [ scc.merge] INFO Repository: ome/omero-gallery
2025-04-24 12:48:19,390 [ scc.merge] INFO Already up to date.
2025-04-24 12:48:19,391 [ scc.merge] INFO
2025-04-24 12:48:19,391 [ scc.merge] INFO Merged PRs:
2025-04-24 12:48:19,391 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-04-24 12:48:19,391 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-04-24 12:48:19,391 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-04-24 12:48:19,391 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-04-24 12:48:19,391 [ scc.merge] INFO
2025-04-24 12:48:19,391 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-24 12:48:19,391 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-04-24 12:48:19,391 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-04-24 12:48:19,391 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-04-24 12:48:19,391 [ scc.merge] INFO
2025-04-24 12:48:19,391 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-04-24 12:48:19,391 [ scc.merge] INFO Excluded PRs:
2025-04-24 12:48:19,391 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-04-24 12:48:19,391 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-04-24 12:48:19,391 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-04-24 12:48:19,391 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-04-24 12:48:19,391 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-04-24 12:48:19,391 [ scc.merge] INFO Already up to date.
2025-04-24 12:48:19,391 [ scc.merge] INFO
2025-04-24 12:48:19,391 [ scc.merge] INFO Merged PRs:
2025-04-24 12:48:19,391 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-04-24 12:48:19,391 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-04-24 12:48:19,391 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-04-24 12:48:19,391 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-04-24 12:48:19,391 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-24 12:48:19,391 [ scc.merge] INFO
2025-04-24 12:48:19,391 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-24 12:48:19,391 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-04-24 12:48:19,391 [ scc.merge] INFO
2025-04-24 12:48:19,391 [ scc.merge] INFO Repository: ome/omero-mapr
2025-04-24 12:48:19,391 [ scc.merge] INFO Excluded PRs:
2025-04-24 12:48:19,391 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-04-24 12:48:19,391 [ scc.merge] INFO Already up to date.
2025-04-24 12:48:19,391 [ scc.merge] INFO
2025-04-24 12:48:19,392 [ scc.merge] INFO Merged PRs:
2025-04-24 12:48:19,392 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-04-24 12:48:19,392 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-24 12:48:19,392 [ scc.merge] INFO
2025-04-24 12:48:19,392 [ scc.merge] INFO Repository: ome/omero-metadata
2025-04-24 12:48:19,392 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-04-24 12:48:19,392 [ scc.merge] INFO Previously merged:
2025-04-24 12:48:19,392 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-24 12:48:19,392 [ scc.merge] INFO
2025-04-24 12:48:19,392 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-24 12:48:19,392 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-24 12:48:19,392 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-24 12:48:19,392 [ scc.merge] INFO
2025-04-24 12:48:19,392 [ scc.merge] INFO Repository: ome/omero-parade
2025-04-24 12:48:19,392 [ scc.merge] INFO Excluded PRs:
2025-04-24 12:48:19,392 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-04-24 12:48:19,392 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-04-24 12:48:19,392 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-04-24 12:48:19,392 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-04-24 12:48:19,392 [ scc.merge] INFO Already up to date.
2025-04-24 12:48:19,392 [ scc.merge] INFO
2025-04-24 12:48:19,392 [ scc.merge] INFO Merged PRs:
2025-04-24 12:48:19,392 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-24 12:48:19,392 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-24 12:48:19,392 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-24 12:48:19,392 [ scc.merge] INFO
2025-04-24 12:48:19,392 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-04-24 12:48:19,392 [ scc.merge] INFO Already up to date.
2025-04-24 12:48:19,392 [ scc.merge] INFO
2025-04-24 12:48:19,392 [ scc.merge] INFO
2025-04-24 12:48:19,392 [ scc.merge] INFO Repository: ome/omero-rois
2025-04-24 12:48:19,392 [ scc.merge] INFO Excluded PRs:
2025-04-24 12:48:19,392 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-04-24 12:48:19,392 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-24 12:48:19,392 [ scc.merge] INFO Already up to date.
2025-04-24 12:48:19,392 [ scc.merge] INFO
2025-04-24 12:48:19,393 [ scc.merge] INFO
2025-04-24 12:48:19,393 [ scc.merge] INFO Repository: ome/omero-signup
2025-04-24 12:48:19,393 [ scc.merge] INFO Already up to date.
2025-04-24 12:48:19,393 [ scc.merge] INFO
2025-04-24 12:48:19,393 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-24 12:48:19,393 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-24 12:48:19,393 [ scc.merge] INFO
2025-04-24 12:48:19,393 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-04-24 12:48:19,393 [ scc.merge] INFO Excluded PRs:
2025-04-24 12:48:19,393 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-04-24 12:48:19,393 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-04-24 12:48:19,393 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-04-24 12:48:19,393 [ scc.merge] INFO Already up to date.
2025-04-24 12:48:19,393 [ scc.merge] INFO
2025-04-24 12:48:19,393 [ scc.merge] INFO Merged PRs:
2025-04-24 12:48:19,393 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-24 12:48:19,393 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-04-24 12:48:19,393 [ scc.merge] INFO
2025-04-24 12:48:19,393 [ scc.merge] INFO Repository: ome/omero-upload
2025-04-24 12:48:19,393 [ scc.merge] INFO Already up to date.
2025-04-24 12:48:19,393 [ scc.merge] INFO
2025-04-24 12:48:19,393 [ scc.merge] INFO
2025-04-24 12:48:19,393 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-04-24 12:48:19,393 [ scc.merge] INFO Already up to date.
2025-04-24 12:48:19,393 [ scc.merge] INFO
2025-04-24 12:48:19,393 [ scc.merge] INFO Merged PRs:
2025-04-24 12:48:19,393 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-04-24 12:48:19,393 [ scc.merge] INFO
2025-04-24 12:48:19,393 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-04-24 12:48:19,393 [ scc.merge] INFO Excluded PRs:
2025-04-24 12:48:19,393 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-04-24 12:48:19,393 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-04-24 12:48:19,393 [ scc.merge] INFO Already up to date.
2025-04-24 12:48:19,393 [ scc.merge] INFO
2025-04-24 12:48:19,393 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-24 12:48:19,393 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-24 12:48:19,394 [ scc.merge] INFO
2025-04-24 12:48:19,394 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-04-24 12:48:19,394 [ scc.merge] INFO Already up to date.
2025-04-24 12:48:19,394 [ scc.merge] INFO
2025-04-24 12:48:19,394 [ scc.merge] INFO
2025-04-24 12:48:19,394 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-04-24 12:48:19,394 [ scc.merge] INFO Already up to date.
2025-04-24 12:48:19,394 [ scc.merge] INFO
2025-04-24 12:48:19,394 [ scc.merge] INFO
2025-04-24 12:48:19,394 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-04-24 12:48:19,394 [ scc.merge] INFO Already up to date.
2025-04-24 12:48:19,394 [ scc.merge] INFO
2025-04-24 12:48:19,394 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-24 12:48:19,394 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-04-24 12:48:19,394 [ scc.merge] INFO
2025-04-24 12:48:19,394 [ scc.merge] INFO Repository: ome/scripts
2025-04-24 12:48:19,394 [ scc.merge] INFO Excluded PRs:
2025-04-24 12:48:19,394 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-04-24 12:48:19,394 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-04-24 12:48:19,394 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-04-24 12:48:19,394 [ scc.merge] INFO Previously merged:
2025-04-24 12:48:19,394 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-04-24 12:48:19,394 [ scc.merge] INFO
2025-04-24 12:48:19,394 [ scc.merge] INFO Merged PRs:
2025-04-24 12:48:19,394 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-24 12:48:19,394 [ scc.merge] INFO
2025-04-24 12:48:19,394 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-24 12:48:19,394 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-24 12:48:19,394 [ scc.merge] INFO
2025-04-24 12:48:19,394 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-04-24 12:48:19,394 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 12:48:19,396 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-04-24 12:48:19,396 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 12:48:19,399 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:48:19,399 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-04-24 12:48:19,399 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 12:48:19,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:48:19,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-04-24 12:48:19,401 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 12:48:19,403 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:48:19,403 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-04-24 12:48:19,403 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 12:48:19,405 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:48:19,405 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-04-24 12:48:19,405 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 12:48:19,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:48:19,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-04-24 12:48:19,408 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 12:48:19,410 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:48:19,410 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-04-24 12:48:19,410 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 12:48:19,412 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:48:19,412 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-04-24 12:48:19,412 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 12:48:19,414 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:48:19,414 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-24 12:48:19,414 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 12:48:19,416 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:48:19,416 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-24 12:48:19,416 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 12:48:19,418 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:48:19,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-24 12:48:19,419 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 12:48:19,421 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:48:19,421 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-24 12:48:19,421 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 12:48:19,423 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:48:19,423 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-24 12:48:19,423 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 12:48:19,425 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:48:19,425 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-24 12:48:19,425 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 12:48:19,427 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:48:19,427 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-24 12:48:19,427 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 12:48:19,429 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:48:19,429 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-24 12:48:19,429 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 12:48:19,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:48:19,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-24 12:48:19,431 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 12:48:19,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:48:19,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-24 12:48:19,434 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 12:48:19,436 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:48:19,436 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-24 12:48:19,436 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 12:48:19,438 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:48:19,438 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-24 12:48:19,438 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 12:48:19,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:48:19,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-24 12:48:19,440 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 12:48:19,442 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 12:48:19,442 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-24 12:48:19,442 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 12:48:19,444 [ 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 26d347d] 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 6c30872] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-04-24 12:49:07,779 [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-04-24 12:49:17,636 [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-04-24 12:49:20,220 [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-04-24 12:49:25,119 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-24 12:50:06,316 [ 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/9bac06d9/images/svgs/logo.svg){kind=logo}
