Skipping 225 KB..
Full LogConflicting PR. Removed from build [OMERO-plugins-push#374](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-04-01 01:13:10,168 [ scc.config] DEBUG Found github.token
2025-04-01 01:13:10,168 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-04-01 01:13:10,168 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-04-01 01:13:10,175 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:10,177 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 506 (Use the release/v1 branch for the PyPA action publishing to PyPI) 7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-04-01 01:13:10,192 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-01 01:13:10,195 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-01 01:13:10,195 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-01 01:13:10,411 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:10,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:13:10,582 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-01 01:13:10,620 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:10,620 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:10,622 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-01 01:13:10,662 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-01 01:13:10,666 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f85768b8850> has no local changes
2025-04-01 01:13:10,666 [ 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#374 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/)'
2025-04-01 01:13:10,725 [ scc.git] DEBUG [detached HEAD 295f2d6] merge master -Dorg -Ssuccess-only
2025-04-01 01:13:10,725 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:13:10,725 [ scc.repo] DEBUG ## PRs found:
2025-04-01 01:13:10,832 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:11,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-04-01 01:13:11,344 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:11,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-04-01 01:13:11,840 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:12,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-01 01:13:12,366 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:12,602 [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-01 01:13:12,854 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:13,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-01 01:13:13,362 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:13,557 [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-01 01:13:13,557 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-01 01:13:13,808 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:14,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-04-01 01:13:14,289 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:14,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-04-01 01:13:14,803 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:15,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-01 01:13:15,344 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:15,534 [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-01 01:13:15,785 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:15,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-01 01:13:16,236 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:16,476 [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-01 01:13:16,477 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-04-01 01:13:16,477 [ scc.repo] DEBUG ## Branches found:
2025-04-01 01:13:16,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-01 01:13:16,477 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:16,477 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:16,480 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-01 01:13:16,482 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-01 01:13:16,482 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-01 01:13:16,485 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-01 01:13:16,488 [ scc.git] DEBUG Already up to date.
2025-04-01 01:13:16,488 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-04-01 01:13:16,802 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-01 01:13:16,802 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-04-01 01:13:16,807 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-04-01 01:13:17,205 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-01 01:13:17,206 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-04-01 01:13:17,208 [ scc.git] DEBUG ## Unique users: []
2025-04-01 01:13:17,208 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:17,208 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:17,211 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-01 01:13:17,215 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:17,217 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-01 01:13:17,226 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-01 01:13:17,230 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-04-01 01:13:17,230 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-04-01 01:13:17,230 [ scc.git] DEBUG requirements.txt | 2 +-
2025-04-01 01:13:17,230 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-04-01 01:13:17,230 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-04-01 01:13:17,230 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-04-01 01:13:17,231 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:17,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:13:17,389 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-01 01:13:17,394 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:17,396 [ 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-01 01:13:17,405 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-01 01:13:17,408 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-01 01:13:17,408 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-01 01:13:17,640 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:17,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:13:17,805 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-01 01:13:17,843 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:17,843 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:17,845 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-01 01:13:17,884 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-01 01:13:17,888 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f857690b650> has no local changes
2025-04-01 01:13:17,888 [ 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#374 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/)'
2025-04-01 01:13:17,895 [ scc.git] DEBUG [detached HEAD 3645537] merge master -Dorg -Ssuccess-only
2025-04-01 01:13:17,895 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:13:17,895 [ scc.repo] DEBUG ## PRs found:
2025-04-01 01:13:18,056 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:18,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-04-01 01:13:18,641 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:18,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/90 HTTP/1.1" 200 None
2025-04-01 01:13:19,128 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:19,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/1e9675222e8664801fda8bed3b15c27c28d39202 HTTP/1.1" 200 None
2025-04-01 01:13:19,665 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:19,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/1e9675222e8664801fda8bed3b15c27c28d39202/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-01 01:13:20,160 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:20,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/1e9675222e8664801fda8bed3b15c27c28d39202 HTTP/1.1" 200 None
2025-04-01 01:13:20,714 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:20,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/1e9675222e8664801fda8bed3b15c27c28d39202?per_page=1 HTTP/1.1" 200 2
2025-04-01 01:13:20,890 [ scc.repo] DEBUG - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-01 01:13:21,141 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:21,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-04-01 01:13:21,630 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:21,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-04-01 01:13:22,179 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:22,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-01 01:13:22,720 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:22,976 [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-01 01:13:23,228 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:23,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-01 01:13:23,737 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:23,933 [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-01 01:13:23,933 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-01 01:13:24,184 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:24,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-04-01 01:13:24,698 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:24,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-04-01 01:13:25,166 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:25,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-01 01:13:25,768 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:26,000 [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-01 01:13:26,251 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:26,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-01 01:13:26,714 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:26,901 [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-01 01:13:26,902 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-01 01:13:26,902 [ scc.repo] DEBUG ## Branches found:
2025-04-01 01:13:26,902 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-01 01:13:26,902 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:26,902 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:26,905 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-01 01:13:26,907 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-01 01:13:26,907 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-01 01:13:26,910 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-01 01:13:26,913 [ scc.git] DEBUG Already up to date.
2025-04-01 01:13:26,913 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-04-01 01:13:27,199 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-01 01:13:27,199 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-04-01 01:13:27,203 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-04-01 01:13:27,483 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-01 01:13:27,483 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-04-01 01:13:27,488 [ scc.git] DEBUG Calling 'git fetch origin pull/90/head'
2025-04-01 01:13:27,888 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-01 01:13:27,889 [ scc.git] DEBUG * branch refs/pull/90/head -> FETCH_HEAD
2025-04-01 01:13:27,891 [ scc.git] DEBUG ## Unique users: []
2025-04-01 01:13:27,891 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:27,891 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:27,894 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-01 01:13:27,899 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:27,901 [ 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-01 01:13:27,913 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-04-01 01:13:27,913 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-04-01 01:13:27,913 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-01 01:13:27,914 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-01 01:13:27,914 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-01 01:13:27,914 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-01 01:13:27,917 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-04-01 01:13:27,922 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-04-01 01:13:27,923 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:28,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:13:28,079 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-01 01:13:28,084 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-04-01 01:13:28,087 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#374](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-04-01 01:13:28,089 [ scc.config] DEBUG Found github.token
2025-04-01 01:13:28,089 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-04-01 01:13:28,089 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-01 01:13:28,094 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:28,096 [ 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-01 01:13:28,111 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-01 01:13:28,111 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-01 01:13:28,111 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-04-01 01:13:28,111 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-01 01:13:28,112 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-01 01:13:28,114 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-04-01 01:13:28,119 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-04-01 01:13:28,330 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:28,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:13:28,512 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-01 01:13:28,516 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-04-01 01:13:28,519 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#374](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/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-01 01:13:28,521 [ scc.config] DEBUG Found github.token
2025-04-01 01:13:28,521 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-04-01 01:13:28,521 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1e9675222e8664801fda8bed3b15c27c28d39202'
2025-04-01 01:13:28,525 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:28,527 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 90 (Use the release/v1 branch for the PyPA action publishing to PyPI) 1e9675222e8664801fda8bed3b15c27c28d39202'
2025-04-01 01:13:28,536 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-01 01:13:28,539 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-01 01:13:28,539 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-01 01:13:28,763 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:28,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:13:28,932 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-01 01:13:28,972 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:28,972 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:28,974 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-01 01:13:29,014 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-01 01:13:29,019 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f85768f1b90> has no local changes
2025-04-01 01:13:29,019 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Already up to date.
Merged PRs:
- 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#374 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/)'
2025-04-01 01:13:29,025 [ scc.git] DEBUG [detached HEAD d1058d7] merge master -Dorg -Ssuccess-only
2025-04-01 01:13:29,025 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:13:29,025 [ scc.repo] DEBUG ## PRs found:
2025-04-01 01:13:29,183 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:29,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-04-01 01:13:29,773 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:30,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-04-01 01:13:30,279 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:30,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-01 01:13:30,835 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:31,084 [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-01 01:13:31,335 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:31,546 [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-01 01:13:31,797 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:32,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-01 01:13:32,345 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:32,553 [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-01 01:13:32,554 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-01 01:13:32,805 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:33,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-04-01 01:13:33,034 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-01 01:13:33,285 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:33,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-01 01:13:33,838 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:34,112 [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-01 01:13:34,364 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:34,640 [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-01 01:13:34,891 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:35,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-01 01:13:35,547 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:35,732 [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-01 01:13:35,732 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-01 01:13:35,983 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:36,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-04-01 01:13:36,209 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-01 01:13:36,460 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:36,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-01 01:13:37,018 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:37,305 [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-01 01:13:37,557 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:37,830 [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-01 01:13:38,082 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:38,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-01 01:13:38,557 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:38,761 [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-01 01:13:38,761 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-01 01:13:39,012 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:39,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-04-01 01:13:39,534 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:39,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-04-01 01:13:40,031 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:40,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-04-01 01:13:40,537 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:40,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-04-01 01:13:41,016 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:41,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-04-01 01:13:41,556 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:41,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-04-01 01:13:42,047 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:42,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-04-01 01:13:42,329 [ scc.repo] DEBUG ## Branches found:
2025-04-01 01:13:42,330 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-01 01:13:42,330 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:42,330 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:42,333 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-01 01:13:42,335 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-01 01:13:42,335 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-01 01:13:42,338 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-01 01:13:42,342 [ scc.git] DEBUG Already up to date.
2025-04-01 01:13:42,342 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-04-01 01:13:42,634 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-01 01:13:42,634 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-04-01 01:13:42,639 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-04-01 01:13:42,900 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-01 01:13:42,900 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-04-01 01:13:42,904 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-04-01 01:13:43,277 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-01 01:13:43,277 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-04-01 01:13:43,280 [ scc.git] DEBUG ## Unique users: []
2025-04-01 01:13:43,280 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:43,280 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:43,282 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-01 01:13:43,285 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:43,287 [ 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-01 01:13:43,296 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-01 01:13:43,299 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-04-01 01:13:43,299 [ scc.git] DEBUG package.json | 2 +-
2025-04-01 01:13:43,299 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-04-01 01:13:43,300 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:43,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:13:43,460 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-04-01 01:13:43,463 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:43,466 [ 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-01 01:13:43,476 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-01 01:13:43,476 [ scc.git] DEBUG Auto-merging package.json
2025-04-01 01:13:43,477 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-01 01:13:43,480 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-04-01 01:13:43,480 [ scc.git] DEBUG package.json | 2 +-
2025-04-01 01:13:43,480 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-04-01 01:13:43,711 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:43,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:13:43,872 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-01 01:13:43,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:43,877 [ 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-01 01:13:43,886 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-01 01:13:43,889 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-01 01:13:43,889 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-01 01:13:44,123 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:44,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:13:44,292 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-01 01:13:44,332 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:44,332 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:44,334 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-01 01:13:44,372 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-01 01:13:44,376 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f857690b710> has no local changes
2025-04-01 01:13:44,376 [ 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#374 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/)'
2025-04-01 01:13:44,383 [ scc.git] DEBUG [detached HEAD f0d2567] merge master -Dorg -Ssuccess-only
2025-04-01 01:13:44,383 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:13:44,383 [ scc.repo] DEBUG ## PRs found:
2025-04-01 01:13:44,543 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:44,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-04-01 01:13:44,725 [ scc.repo] DEBUG ## Branches found:
2025-04-01 01:13:44,725 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-01 01:13:44,725 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:44,725 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:44,728 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-01 01:13:44,730 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-01 01:13:44,730 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-01 01:13:44,733 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-01 01:13:44,736 [ scc.git] DEBUG Already up to date.
2025-04-01 01:13:44,736 [ scc.git] DEBUG ## Unique users: []
2025-04-01 01:13:44,736 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:44,736 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:44,739 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-01 01:13:44,776 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:44,777 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:44,779 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-01 01:13:44,815 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-01 01:13:44,819 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8576909b90> has no local changes
2025-04-01 01:13:44,819 [ 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#374 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/)'
2025-04-01 01:13:44,825 [ scc.git] DEBUG [detached HEAD d443afe] merge master -Dorg -Ssuccess-only
2025-04-01 01:13:44,825 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:13:44,825 [ scc.repo] DEBUG ## PRs found:
2025-04-01 01:13:44,976 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:45,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-04-01 01:13:45,539 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:45,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-04-01 01:13:46,051 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:46,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-04-01 01:13:46,533 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:46,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-04-01 01:13:46,760 [ scc.repo] DEBUG ## Branches found:
2025-04-01 01:13:46,760 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-01 01:13:46,760 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:46,760 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:46,763 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-01 01:13:46,765 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-01 01:13:46,765 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-01 01:13:46,768 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-01 01:13:46,771 [ scc.git] DEBUG Already up to date.
2025-04-01 01:13:46,771 [ scc.git] DEBUG ## Unique users: []
2025-04-01 01:13:46,771 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:46,771 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:46,774 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-01 01:13:46,814 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:46,814 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:46,816 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-01 01:13:46,854 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-01 01:13:46,857 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8576908ad0> has no local changes
2025-04-01 01:13:46,858 [ 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#374 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/)'
2025-04-01 01:13:46,864 [ scc.git] DEBUG [detached HEAD d351733] merge master -Dorg -Ssuccess-only
2025-04-01 01:13:46,864 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:13:46,864 [ scc.repo] DEBUG ## PRs found:
2025-04-01 01:13:47,011 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:47,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-04-01 01:13:47,576 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:47,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-04-01 01:13:48,082 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:48,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-04-01 01:13:48,553 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:48,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-01 01:13:49,164 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:49,370 [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-01 01:13:49,622 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:49,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-01 01:13:50,068 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:50,279 [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-01 01:13:50,279 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-01 01:13:50,280 [ scc.repo] DEBUG ## Branches found:
2025-04-01 01:13:50,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-01 01:13:50,280 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:50,280 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:50,283 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-01 01:13:50,285 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-01 01:13:50,285 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-01 01:13:50,288 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-01 01:13:50,291 [ scc.git] DEBUG Already up to date.
2025-04-01 01:13:50,291 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-04-01 01:13:50,565 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-04-01 01:13:50,565 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-04-01 01:13:50,569 [ scc.git] DEBUG ## Unique users: []
2025-04-01 01:13:50,569 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:50,569 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:50,572 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-01 01:13:50,575 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:50,577 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-01 01:13:50,586 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-04-01 01:13:50,586 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-04-01 01:13:50,586 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-04-01 01:13:50,586 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-04-01 01:13:50,586 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-04-01 01:13:50,586 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-04-01 01:13:50,586 [ scc.git] DEBUG Auto-merging setup.py
2025-04-01 01:13:50,586 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-04-01 01:13:50,586 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-01 01:13:50,587 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-01 01:13:50,589 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-01 01:13:50,594 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-04-01 01:13:50,595 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:50,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:13:50,756 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-01 01:13:50,759 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-01 01:13:50,762 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#374](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/urls.py
- omero_signup/signup_settings.py
- setup.py
--conflicts
2025-04-01 01:13:50,765 [ scc.config] DEBUG Found github.token
2025-04-01 01:13:50,765 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-04-01 01:13:50,765 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-01 01:13:50,804 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:50,805 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:50,807 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-01 01:13:50,845 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-01 01:13:50,849 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8574707690> has no local changes
2025-04-01 01:13:50,849 [ 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#374 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/)'
2025-04-01 01:13:50,855 [ scc.git] DEBUG [detached HEAD 168cf3d] merge master -Dorg -Ssuccess-only
2025-04-01 01:13:50,856 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:13:50,856 [ scc.repo] DEBUG ## PRs found:
2025-04-01 01:13:51,007 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:51,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-04-01 01:13:51,569 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:51,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-04-01 01:13:52,082 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:52,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-04-01 01:13:52,590 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:52,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-04-01 01:13:53,142 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:53,394 [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-01 01:13:53,646 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:53,914 [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-01 01:13:54,166 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:54,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-04-01 01:13:54,692 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:54,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-04-01 01:13:55,173 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:55,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-04-01 01:13:55,694 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:55,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-04-01 01:13:56,210 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:56,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-01 01:13:56,749 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:56,947 [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-01 01:13:57,198 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:57,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-01 01:13:57,664 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:57,851 [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-01 01:13:57,851 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-01 01:13:57,852 [ scc.repo] DEBUG ## Branches found:
2025-04-01 01:13:57,852 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-01 01:13:57,852 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:57,852 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:57,855 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-01 01:13:57,857 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-01 01:13:57,857 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-01 01:13:57,860 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-01 01:13:57,863 [ scc.git] DEBUG Already up to date.
2025-04-01 01:13:57,863 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-04-01 01:13:58,191 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-01 01:13:58,191 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-04-01 01:13:58,195 [ scc.git] DEBUG ## Unique users: []
2025-04-01 01:13:58,195 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:58,195 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:58,197 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-04-01 01:13:58,202 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:58,204 [ 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-01 01:13:58,216 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-01 01:13:58,221 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-04-01 01:13:58,221 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-04-01 01:13:58,221 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-04-01 01:13:58,221 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-04-01 01:13:58,221 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-04-01 01:13:58,221 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-04-01 01:13:58,221 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-04-01 01:13:58,221 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-04-01 01:13:58,221 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-04-01 01:13:58,222 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:58,222 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-04-01 01:13:58,222 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-04-01 01:13:58,222 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-04-01 01:13:58,222 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-04-01 01:13:58,222 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-04-01 01:13:58,222 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-04-01 01:13:58,222 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-04-01 01:13:58,222 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-04-01 01:13:58,222 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-04-01 01:13:58,222 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-04-01 01:13:58,222 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-04-01 01:13:58,222 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-04-01 01:13:58,222 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-04-01 01:13:58,222 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-04-01 01:13:58,222 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-04-01 01:13:58,222 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-04-01 01:13:58,222 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-04-01 01:13:58,222 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-04-01 01:13:58,222 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-04-01 01:13:58,223 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-04-01 01:13:58,223 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-04-01 01:13:58,223 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-04-01 01:13:58,223 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-04-01 01:13:58,223 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-04-01 01:13:58,223 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-04-01 01:13:58,223 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-04-01 01:13:58,223 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-04-01 01:13:58,223 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-04-01 01:13:58,223 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-04-01 01:13:58,223 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-04-01 01:13:58,223 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-04-01 01:13:58,223 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-04-01 01:13:58,223 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-04-01 01:13:58,223 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-04-01 01:13:58,223 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-04-01 01:13:58,223 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-04-01 01:13:58,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:13:58,397 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-01 01:13:58,436 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:58,436 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:58,438 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-01 01:13:58,476 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-01 01:13:58,480 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f85768f3810> has no local changes
2025-04-01 01:13:58,480 [ 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'
Generated by OMERO-plugins-push#374 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/)'
2025-04-01 01:13:58,487 [ scc.git] DEBUG [detached HEAD 8f0c845] merge master -Dorg -Ssuccess-only
2025-04-01 01:13:58,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:13:58,488 [ scc.repo] DEBUG ## PRs found:
2025-04-01 01:13:58,648 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:58,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-04-01 01:13:58,869 [ scc.repo] DEBUG ## Branches found:
2025-04-01 01:13:58,869 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-01 01:13:58,869 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:58,869 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:58,872 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-01 01:13:58,874 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-01 01:13:58,874 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-01 01:13:58,877 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-01 01:13:58,880 [ scc.git] DEBUG Already up to date.
2025-04-01 01:13:58,880 [ scc.git] DEBUG ## Unique users: []
2025-04-01 01:13:58,880 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:58,880 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:58,883 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-01 01:13:58,922 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:13:58,922 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:13:58,924 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-01 01:13:58,962 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-01 01:13:58,965 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f857690a750> has no local changes
2025-04-01 01:13:58,965 [ 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#374 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/)'
2025-04-01 01:13:58,971 [ scc.git] DEBUG [detached HEAD 209defe] merge master -Dorg -Ssuccess-only
2025-04-01 01:13:58,972 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:13:58,972 [ scc.repo] DEBUG ## PRs found:
2025-04-01 01:13:59,120 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:59,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-04-01 01:13:59,679 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:13:59,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-04-01 01:14:00,175 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:00,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-04-01 01:14:00,654 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:00,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-01 01:14:01,232 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:01,490 [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-01 01:14:01,741 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:01,966 [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-01 01:14:02,217 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:02,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-01 01:14:02,756 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:02,923 [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-01 01:14:02,924 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-04-01 01:14:02,924 [ scc.repo] DEBUG ## Branches found:
2025-04-01 01:14:02,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-01 01:14:02,924 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:14:02,924 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:14:02,927 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-01 01:14:02,929 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-01 01:14:02,929 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-01 01:14:02,932 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-01 01:14:02,936 [ scc.git] DEBUG Already up to date.
2025-04-01 01:14:02,936 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-04-01 01:14:03,210 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-04-01 01:14:03,211 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-04-01 01:14:03,215 [ scc.git] DEBUG ## Unique users: []
2025-04-01 01:14:03,215 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:14:03,215 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:14:03,217 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-04-01 01:14:03,220 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:14:03,222 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-04-01 01:14:03,230 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-01 01:14:03,233 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-04-01 01:14:03,233 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-04-01 01:14:03,233 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-04-01 01:14:03,233 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-04-01 01:14:03,233 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-04-01 01:14:03,234 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:03,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:03,426 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-01 01:14:03,464 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:14:03,464 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:14:03,466 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-01 01:14:03,505 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-01 01:14:03,508 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8574724e50> has no local changes
2025-04-01 01:14:03,508 [ 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#374 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/)'
2025-04-01 01:14:03,514 [ scc.git] DEBUG [detached HEAD 191d146] merge master -Dorg -Ssuccess-only
2025-04-01 01:14:03,515 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:03,515 [ scc.git] INFO Overriding base-branch from master to main
2025-04-01 01:14:03,515 [ scc.repo] DEBUG ## PRs found:
2025-04-01 01:14:03,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:03,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-04-01 01:14:04,209 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:04,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-04-01 01:14:04,715 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:04,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-04-01 01:14:05,206 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:05,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-04-01 01:14:05,746 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:05,969 [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-01 01:14:06,220 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:06,474 [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-01 01:14:06,726 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:06,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-04-01 01:14:07,233 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:07,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-04-01 01:14:07,727 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:07,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-04-01 01:14:08,202 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:08,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-01 01:14:08,727 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:08,965 [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-01 01:14:09,217 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:09,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-01 01:14:09,759 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:09,964 [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-01 01:14:09,965 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-01 01:14:09,965 [ scc.repo] DEBUG ## Branches found:
2025-04-01 01:14:09,965 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-01 01:14:09,965 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:14:09,965 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:14:09,968 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-04-01 01:14:09,971 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-01 01:14:09,971 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-04-01 01:14:09,974 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-04-01 01:14:09,977 [ scc.git] DEBUG Already up to date.
2025-04-01 01:14:09,977 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-04-01 01:14:10,263 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-04-01 01:14:10,263 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-04-01 01:14:10,268 [ scc.git] DEBUG ## Unique users: []
2025-04-01 01:14:10,268 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:14:10,268 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:14:10,270 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-01 01:14:10,273 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:14:10,275 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-01 01:14:10,283 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-04-01 01:14:10,283 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-04-01 01:14:10,283 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-01 01:14:10,284 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-01 01:14:10,286 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-01 01:14:10,290 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-04-01 01:14:10,292 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:10,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:10,488 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-01 01:14:10,491 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-01 01:14:10,494 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#374](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-04-01 01:14:10,496 [ scc.config] DEBUG Found github.token
2025-04-01 01:14:10,496 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-04-01 01:14:10,496 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-01 01:14:10,534 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:14:10,534 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:14:10,536 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-01 01:14:10,573 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-01 01:14:10,576 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8574740650> has no local changes
2025-04-01 01:14:10,577 [ 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#374 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/)'
2025-04-01 01:14:10,583 [ scc.git] DEBUG [detached HEAD 9168719] merge master -Dorg -Ssuccess-only
2025-04-01 01:14:10,583 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:10,583 [ scc.repo] DEBUG ## PRs found:
2025-04-01 01:14:10,739 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:11,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-04-01 01:14:11,057 [ scc.repo] DEBUG ## Branches found:
2025-04-01 01:14:11,057 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-01 01:14:11,057 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:14:11,057 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:14:11,059 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-01 01:14:11,062 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-01 01:14:11,062 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-01 01:14:11,064 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-01 01:14:11,067 [ scc.git] DEBUG Already up to date.
2025-04-01 01:14:11,068 [ scc.git] DEBUG ## Unique users: []
2025-04-01 01:14:11,068 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:14:11,068 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:14:11,070 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-01 01:14:11,108 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:14:11,108 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:14:11,111 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-01 01:14:11,148 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-01 01:14:11,151 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f857778b710> has no local changes
2025-04-01 01:14:11,151 [ 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#374 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/)'
2025-04-01 01:14:11,157 [ scc.git] DEBUG [detached HEAD 1621c2c] merge master -Dorg -Ssuccess-only
2025-04-01 01:14:11,158 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:11,158 [ scc.repo] DEBUG ## PRs found:
2025-04-01 01:14:11,308 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:11,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-04-01 01:14:11,501 [ scc.repo] DEBUG ## Branches found:
2025-04-01 01:14:11,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-01 01:14:11,501 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:14:11,501 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:14:11,503 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-01 01:14:11,505 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-01 01:14:11,505 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-01 01:14:11,508 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-01 01:14:11,512 [ scc.git] DEBUG Already up to date.
2025-04-01 01:14:11,512 [ scc.git] DEBUG ## Unique users: []
2025-04-01 01:14:11,512 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:14:11,512 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:14:11,514 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-01 01:14:11,552 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:14:11,552 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:14:11,554 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-01 01:14:11,591 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-01 01:14:11,595 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f85746f0310> has no local changes
2025-04-01 01:14:11,595 [ 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#374 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/)'
2025-04-01 01:14:11,601 [ scc.git] DEBUG [detached HEAD 6379fcd] merge master -Dorg -Ssuccess-only
2025-04-01 01:14:11,601 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:11,601 [ scc.repo] DEBUG ## PRs found:
2025-04-01 01:14:11,752 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:12,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-04-01 01:14:12,285 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:12,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-04-01 01:14:12,809 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:13,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-04-01 01:14:13,274 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:13,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-01 01:14:13,829 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:14,061 [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-01 01:14:14,312 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:14,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-01 01:14:14,867 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:15,052 [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-01 01:14:15,052 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-04-01 01:14:15,052 [ scc.repo] DEBUG ## Branches found:
2025-04-01 01:14:15,052 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-01 01:14:15,052 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:14:15,052 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:14:15,055 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-01 01:14:15,057 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-01 01:14:15,057 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-01 01:14:15,060 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-01 01:14:15,063 [ scc.git] DEBUG Already up to date.
2025-04-01 01:14:15,063 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-04-01 01:14:15,357 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-04-01 01:14:15,357 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-04-01 01:14:15,361 [ scc.git] DEBUG ## Unique users: []
2025-04-01 01:14:15,361 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:14:15,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:14:15,363 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-01 01:14:15,366 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:14:15,368 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-01 01:14:15,377 [ scc.git] DEBUG Auto-merging Dockerfile
2025-04-01 01:14:15,377 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-04-01 01:14:15,377 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-01 01:14:15,378 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-01 01:14:15,380 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-01 01:14:15,385 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-04-01 01:14:15,386 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:15,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:15,548 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-01 01:14:15,550 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-01 01:14:15,553 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#374](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-04-01 01:14:15,555 [ scc.config] DEBUG Found github.token
2025-04-01 01:14:15,555 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-04-01 01:14:15,555 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-01 01:14:15,593 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:14:15,593 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:14:15,595 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-01 01:14:15,633 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-01 01:14:15,637 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f85747b0850> has no local changes
2025-04-01 01:14:15,637 [ 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#374 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/)'
2025-04-01 01:14:15,644 [ scc.git] DEBUG [detached HEAD 05eb62a] merge master -Dorg -Ssuccess-only
2025-04-01 01:14:15,644 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:15,644 [ scc.git] INFO Overriding base-branch from master to develop
2025-04-01 01:14:15,644 [ scc.repo] DEBUG ## PRs found:
2025-04-01 01:14:15,799 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:16,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-04-01 01:14:16,372 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:16,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-04-01 01:14:16,863 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:17,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-04-01 01:14:17,322 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:17,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-01 01:14:17,848 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:18,081 [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-01 01:14:18,333 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:18,559 [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-01 01:14:18,811 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:19,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-01 01:14:19,279 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:19,457 [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-01 01:14:19,457 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-01 01:14:19,708 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:19,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-04-01 01:14:20,202 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:20,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-04-01 01:14:20,679 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:20,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-01 01:14:21,138 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:21,341 [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-01 01:14:21,592 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:21,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-01 01:14:22,066 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:22,249 [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-01 01:14:22,249 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-01 01:14:22,500 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:22,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-04-01 01:14:23,012 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:23,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-04-01 01:14:23,576 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:23,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-04-01 01:14:24,083 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:24,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-04-01 01:14:24,375 [ scc.repo] DEBUG ## Branches found:
2025-04-01 01:14:24,375 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-01 01:14:24,375 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:14:24,375 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:14:24,378 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-04-01 01:14:24,380 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-01 01:14:24,380 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-04-01 01:14:24,383 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-04-01 01:14:24,392 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-04-01 01:14:24,625 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:25,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-04-01 01:14:25,059 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-04-01 01:14:25,373 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-01 01:14:25,374 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-04-01 01:14:25,378 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-04-01 01:14:25,646 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-01 01:14:25,646 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-04-01 01:14:25,650 [ scc.git] DEBUG ## Unique users: []
2025-04-01 01:14:25,650 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:14:25,650 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:14:25,652 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-01 01:14:25,658 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:14:25,660 [ 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-01 01:14:25,671 [ 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-01 01:14:25,671 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-01 01:14:25,671 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-01 01:14:25,674 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-01 01:14:25,678 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-04-01 01:14:25,679 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:25,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:25,832 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-01 01:14:25,837 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-01 01:14:25,841 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#374](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-04-01 01:14:25,843 [ scc.config] DEBUG Found github.token
2025-04-01 01:14:25,843 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-04-01 01:14:25,844 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-01 01:14:25,848 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:14:25,850 [ 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-01 01:14:25,860 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-01 01:14:25,863 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-04-01 01:14:25,863 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-04-01 01:14:26,083 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:26,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:26,259 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-01 01:14:26,297 [ scc.git] DEBUG Get sha1 of %s
2025-04-01 01:14:26,297 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-01 01:14:26,300 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-01 01:14:26,336 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-01 01:14:26,340 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f85747b1dd0> has no local changes
2025-04-01 01:14:26,340 [ 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#374 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/)'
2025-04-01 01:14:26,347 [ scc.git] DEBUG [detached HEAD 9d43c1d] merge master -Dorg -Ssuccess-only
2025-04-01 01:14:26,347 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:26,347 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-01 01:14:26,426 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-04-01 01:14:26,510 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:26,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:26,707 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-04-01 01:14:26,709 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-04-01 01:14:26,953 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:27,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:27,122 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-04-01 01:14:27,124 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-04-01 01:14:27,369 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:27,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:27,536 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-04-01 01:14:27,538 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-04-01 01:14:27,783 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:27,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:27,953 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-04-01 01:14:28,198 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:28,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:28,380 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-04-01 01:14:28,382 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-04-01 01:14:28,627 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:28,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:28,786 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-04-01 01:14:28,788 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-04-01 01:14:29,033 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:29,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:29,234 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-04-01 01:14:29,236 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-04-01 01:14:29,481 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:29,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:29,694 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-04-01 01:14:29,696 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-04-01 01:14:29,941 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:30,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:30,111 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-04-01 01:14:30,113 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-04-01 01:14:30,358 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:30,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:30,535 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-04-01 01:14:30,537 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-04-01 01:14:30,782 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:30,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:30,962 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-04-01 01:14:30,964 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-04-01 01:14:31,209 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:31,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:31,373 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-04-01 01:14:31,375 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-04-01 01:14:31,619 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:31,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:31,793 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-04-01 01:14:32,038 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:32,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:32,211 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-04-01 01:14:32,456 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:32,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:32,637 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-04-01 01:14:32,639 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-04-01 01:14:32,884 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:33,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:33,044 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-04-01 01:14:33,289 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:33,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:33,464 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-04-01 01:14:33,709 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:33,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:33,884 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-04-01 01:14:33,886 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-04-01 01:14:34,130 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:34,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:34,301 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-04-01 01:14:34,303 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-04-01 01:14:34,547 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:34,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:34,720 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-04-01 01:14:34,722 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-04-01 01:14:34,967 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:35,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:35,161 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-04-01 01:14:35,163 [ scc.config] DEBUG Found submodule.scripts.url
2025-04-01 01:14:35,408 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-01 01:14:35,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-01 01:14:35,569 [ scc.config] DEBUG Found submodule.scripts.branch
2025-04-01 01:14:35,569 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-01 01:14:35,659 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f85769cb310> has local changes
2025-04-01 01:14:35,659 [ 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 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI' (status: failure)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 147 will-moore 'Name option'
- PR 167 dominikl 'Add extinfo command'
Conflicting PRs (not included):
- PR 102 will-moore 'Zarr export tests'
- PR 123 will-moore 'Support export of Fileset:ID'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
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 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
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
Already up to date.
Merged PRs:
- 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'
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#374 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/374/)'
2025-04-01 01:14:35,673 [ scc.git] DEBUG [detached HEAD 84e2bbd] merge master -Dorg -Ssuccess-only
2025-04-01 01:14:35,673 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-04-01 01:14:35,673 [ scc.merge] INFO Repository: ome/omero-plugins
2025-04-01 01:14:35,673 [ scc.merge] INFO Already up to date.
2025-04-01 01:14:35,673 [ scc.merge] INFO
2025-04-01 01:14:35,673 [ scc.merge] INFO Merged PRs:
2025-04-01 01:14:35,673 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-04-01 01:14:35,673 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-04-01 01:14:35,674 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-04-01 01:14:35,674 [ scc.merge] INFO
2025-04-01 01:14:35,674 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-04-01 01:14:35,674 [ scc.merge] INFO Already up to date.
2025-04-01 01:14:35,674 [ scc.merge] INFO
2025-04-01 01:14:35,674 [ scc.merge] INFO
2025-04-01 01:14:35,674 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-04-01 01:14:35,674 [ scc.merge] INFO Excluded PRs:
2025-04-01 01:14:35,674 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-04-01 01:14:35,674 [ scc.merge] INFO Already up to date.
2025-04-01 01:14:35,674 [ scc.merge] INFO
2025-04-01 01:14:35,674 [ scc.merge] INFO
2025-04-01 01:14:35,674 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-04-01 01:14:35,674 [ scc.merge] INFO Excluded PRs:
2025-04-01 01:14:35,674 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-04-01 01:14:35,674 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-04-01 01:14:35,674 [ scc.merge] INFO Already up to date.
2025-04-01 01:14:35,674 [ scc.merge] INFO
2025-04-01 01:14:35,674 [ scc.merge] INFO Merged PRs:
2025-04-01 01:14:35,674 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-04-01 01:14:35,674 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-04-01 01:14:35,674 [ scc.merge] INFO
2025-04-01 01:14:35,674 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-04-01 01:14:35,674 [ scc.merge] INFO Excluded PRs:
2025-04-01 01:14:35,674 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI' (status: failure)
2025-04-01 01:14:35,674 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-04-01 01:14:35,674 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-01 01:14:35,674 [ scc.merge] INFO Already up to date.
2025-04-01 01:14:35,674 [ scc.merge] INFO
2025-04-01 01:14:35,674 [ scc.merge] INFO Merged PRs:
2025-04-01 01:14:35,674 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-04-01 01:14:35,674 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-04-01 01:14:35,674 [ scc.merge] INFO
2025-04-01 01:14:35,674 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-01 01:14:35,674 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-04-01 01:14:35,674 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-04-01 01:14:35,674 [ scc.merge] INFO
2025-04-01 01:14:35,674 [ scc.merge] INFO Repository: ome/omero-figure
2025-04-01 01:14:35,675 [ scc.merge] INFO Excluded PRs:
2025-04-01 01:14:35,675 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-04-01 01:14:35,675 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-04-01 01:14:35,675 [ scc.merge] INFO Already up to date.
2025-04-01 01:14:35,675 [ scc.merge] INFO
2025-04-01 01:14:35,675 [ scc.merge] INFO Merged PRs:
2025-04-01 01:14:35,675 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-04-01 01:14:35,675 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-04-01 01:14:35,675 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-04-01 01:14:35,675 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-04-01 01:14:35,675 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-04-01 01:14:35,675 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-01 01:14:35,675 [ scc.merge] INFO
2025-04-01 01:14:35,675 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-01 01:14:35,675 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-04-01 01:14:35,675 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-04-01 01:14:35,675 [ scc.merge] INFO
2025-04-01 01:14:35,675 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-04-01 01:14:35,675 [ scc.merge] INFO Already up to date.
2025-04-01 01:14:35,675 [ scc.merge] INFO
2025-04-01 01:14:35,675 [ scc.merge] INFO Merged PRs:
2025-04-01 01:14:35,675 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-04-01 01:14:35,675 [ scc.merge] INFO
2025-04-01 01:14:35,675 [ scc.merge] INFO Repository: ome/omero-gallery
2025-04-01 01:14:35,675 [ scc.merge] INFO Already up to date.
2025-04-01 01:14:35,675 [ scc.merge] INFO
2025-04-01 01:14:35,675 [ scc.merge] INFO Merged PRs:
2025-04-01 01:14:35,675 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-04-01 01:14:35,675 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-04-01 01:14:35,675 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-04-01 01:14:35,675 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-04-01 01:14:35,675 [ scc.merge] INFO
2025-04-01 01:14:35,675 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-01 01:14:35,675 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-04-01 01:14:35,675 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-04-01 01:14:35,675 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-04-01 01:14:35,675 [ scc.merge] INFO
2025-04-01 01:14:35,675 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-04-01 01:14:35,675 [ scc.merge] INFO Excluded PRs:
2025-04-01 01:14:35,675 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-04-01 01:14:35,676 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-04-01 01:14:35,676 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-04-01 01:14:35,676 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-04-01 01:14:35,676 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-04-01 01:14:35,676 [ scc.merge] INFO Already up to date.
2025-04-01 01:14:35,676 [ scc.merge] INFO
2025-04-01 01:14:35,676 [ scc.merge] INFO Merged PRs:
2025-04-01 01:14:35,676 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-04-01 01:14:35,676 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-04-01 01:14:35,676 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-04-01 01:14:35,676 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-04-01 01:14:35,676 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-01 01:14:35,676 [ scc.merge] INFO
2025-04-01 01:14:35,676 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-01 01:14:35,676 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-04-01 01:14:35,676 [ scc.merge] INFO
2025-04-01 01:14:35,676 [ scc.merge] INFO Repository: ome/omero-mapr
2025-04-01 01:14:35,676 [ scc.merge] INFO Excluded PRs:
2025-04-01 01:14:35,676 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-04-01 01:14:35,676 [ scc.merge] INFO Already up to date.
2025-04-01 01:14:35,676 [ scc.merge] INFO
2025-04-01 01:14:35,676 [ scc.merge] INFO Merged PRs:
2025-04-01 01:14:35,676 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-04-01 01:14:35,676 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-01 01:14:35,676 [ scc.merge] INFO
2025-04-01 01:14:35,676 [ scc.merge] INFO Repository: ome/omero-metadata
2025-04-01 01:14:35,676 [ scc.merge] INFO Already up to date.
2025-04-01 01:14:35,676 [ scc.merge] INFO
2025-04-01 01:14:35,676 [ scc.merge] INFO Merged PRs:
2025-04-01 01:14:35,676 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-01 01:14:35,676 [ scc.merge] INFO
2025-04-01 01:14:35,676 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-01 01:14:35,676 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-01 01:14:35,676 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-01 01:14:35,676 [ scc.merge] INFO
2025-04-01 01:14:35,676 [ scc.merge] INFO Repository: ome/omero-parade
2025-04-01 01:14:35,676 [ scc.merge] INFO Excluded PRs:
2025-04-01 01:14:35,676 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-04-01 01:14:35,676 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-04-01 01:14:35,676 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-04-01 01:14:35,677 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-04-01 01:14:35,677 [ scc.merge] INFO Already up to date.
2025-04-01 01:14:35,677 [ scc.merge] INFO
2025-04-01 01:14:35,677 [ scc.merge] INFO Merged PRs:
2025-04-01 01:14:35,677 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-01 01:14:35,677 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-01 01:14:35,677 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-01 01:14:35,677 [ scc.merge] INFO
2025-04-01 01:14:35,677 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-04-01 01:14:35,677 [ scc.merge] INFO Already up to date.
2025-04-01 01:14:35,677 [ scc.merge] INFO
2025-04-01 01:14:35,677 [ scc.merge] INFO
2025-04-01 01:14:35,677 [ scc.merge] INFO Repository: ome/omero-rois
2025-04-01 01:14:35,677 [ scc.merge] INFO Excluded PRs:
2025-04-01 01:14:35,677 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-04-01 01:14:35,677 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-01 01:14:35,677 [ scc.merge] INFO Already up to date.
2025-04-01 01:14:35,677 [ scc.merge] INFO
2025-04-01 01:14:35,677 [ scc.merge] INFO
2025-04-01 01:14:35,677 [ scc.merge] INFO Repository: ome/omero-signup
2025-04-01 01:14:35,677 [ scc.merge] INFO Already up to date.
2025-04-01 01:14:35,677 [ scc.merge] INFO
2025-04-01 01:14:35,677 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-01 01:14:35,677 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-01 01:14:35,677 [ scc.merge] INFO
2025-04-01 01:14:35,677 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-04-01 01:14:35,677 [ scc.merge] INFO Excluded PRs:
2025-04-01 01:14:35,677 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-04-01 01:14:35,677 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-04-01 01:14:35,677 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-04-01 01:14:35,677 [ scc.merge] INFO Already up to date.
2025-04-01 01:14:35,677 [ scc.merge] INFO
2025-04-01 01:14:35,677 [ scc.merge] INFO Merged PRs:
2025-04-01 01:14:35,677 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-01 01:14:35,677 [ scc.merge] INFO
2025-04-01 01:14:35,677 [ scc.merge] INFO Repository: ome/omero-upload
2025-04-01 01:14:35,677 [ scc.merge] INFO Already up to date.
2025-04-01 01:14:35,677 [ scc.merge] INFO
2025-04-01 01:14:35,677 [ scc.merge] INFO
2025-04-01 01:14:35,678 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-04-01 01:14:35,678 [ scc.merge] INFO Already up to date.
2025-04-01 01:14:35,678 [ scc.merge] INFO
2025-04-01 01:14:35,678 [ scc.merge] INFO Merged PRs:
2025-04-01 01:14:35,678 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-04-01 01:14:35,678 [ scc.merge] INFO
2025-04-01 01:14:35,678 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-04-01 01:14:35,678 [ scc.merge] INFO Excluded PRs:
2025-04-01 01:14:35,678 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-04-01 01:14:35,678 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-04-01 01:14:35,678 [ scc.merge] INFO Already up to date.
2025-04-01 01:14:35,678 [ scc.merge] INFO
2025-04-01 01:14:35,678 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-01 01:14:35,678 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-01 01:14:35,678 [ scc.merge] INFO
2025-04-01 01:14:35,678 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-04-01 01:14:35,678 [ scc.merge] INFO Already up to date.
2025-04-01 01:14:35,678 [ scc.merge] INFO
2025-04-01 01:14:35,678 [ scc.merge] INFO
2025-04-01 01:14:35,678 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-04-01 01:14:35,678 [ scc.merge] INFO Already up to date.
2025-04-01 01:14:35,678 [ scc.merge] INFO
2025-04-01 01:14:35,678 [ scc.merge] INFO
2025-04-01 01:14:35,678 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-04-01 01:14:35,678 [ scc.merge] INFO Already up to date.
2025-04-01 01:14:35,678 [ scc.merge] INFO
2025-04-01 01:14:35,678 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-01 01:14:35,678 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-04-01 01:14:35,678 [ scc.merge] INFO
2025-04-01 01:14:35,678 [ scc.merge] INFO Repository: ome/scripts
2025-04-01 01:14:35,678 [ scc.merge] INFO Excluded PRs:
2025-04-01 01:14:35,678 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-04-01 01:14:35,678 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-04-01 01:14:35,678 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-04-01 01:14:35,678 [ scc.merge] INFO Previously merged:
2025-04-01 01:14:35,678 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-04-01 01:14:35,678 [ scc.merge] INFO
2025-04-01 01:14:35,678 [ scc.merge] INFO Merged PRs:
2025-04-01 01:14:35,678 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-01 01:14:35,678 [ scc.merge] INFO
2025-04-01 01:14:35,678 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-01 01:14:35,679 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-01 01:14:35,679 [ scc.merge] INFO
2025-04-01 01:14:35,679 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-04-01 01:14:35,679 [ scc.git] DEBUG Calling 'git remote'
2025-04-01 01:14:35,681 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-04-01 01:14:35,681 [ scc.git] DEBUG Calling 'git remote'
2025-04-01 01:14:35,683 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:35,683 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-04-01 01:14:35,683 [ scc.git] DEBUG Calling 'git remote'
2025-04-01 01:14:35,685 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:35,685 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-04-01 01:14:35,685 [ scc.git] DEBUG Calling 'git remote'
2025-04-01 01:14:35,687 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:35,687 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-04-01 01:14:35,687 [ scc.git] DEBUG Calling 'git remote'
2025-04-01 01:14:35,690 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:35,690 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-04-01 01:14:35,690 [ scc.git] DEBUG Calling 'git remote'
2025-04-01 01:14:35,692 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:35,692 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-04-01 01:14:35,692 [ scc.git] DEBUG Calling 'git remote'
2025-04-01 01:14:35,694 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:35,694 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-04-01 01:14:35,694 [ scc.git] DEBUG Calling 'git remote'
2025-04-01 01:14:35,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:35,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-04-01 01:14:35,697 [ scc.git] DEBUG Calling 'git remote'
2025-04-01 01:14:35,699 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:35,699 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-01 01:14:35,699 [ scc.git] DEBUG Calling 'git remote'
2025-04-01 01:14:35,701 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:35,701 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-01 01:14:35,701 [ scc.git] DEBUG Calling 'git remote'
2025-04-01 01:14:35,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:35,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-01 01:14:35,703 [ scc.git] DEBUG Calling 'git remote'
2025-04-01 01:14:35,705 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:35,706 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-01 01:14:35,706 [ scc.git] DEBUG Calling 'git remote'
2025-04-01 01:14:35,708 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:35,708 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-01 01:14:35,708 [ scc.git] DEBUG Calling 'git remote'
2025-04-01 01:14:35,710 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:35,710 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-01 01:14:35,710 [ scc.git] DEBUG Calling 'git remote'
2025-04-01 01:14:35,712 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:35,712 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-01 01:14:35,712 [ scc.git] DEBUG Calling 'git remote'
2025-04-01 01:14:35,714 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:35,714 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-01 01:14:35,714 [ scc.git] DEBUG Calling 'git remote'
2025-04-01 01:14:35,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:35,717 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-01 01:14:35,717 [ scc.git] DEBUG Calling 'git remote'
2025-04-01 01:14:35,719 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:35,719 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-01 01:14:35,719 [ scc.git] DEBUG Calling 'git remote'
2025-04-01 01:14:35,721 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:35,721 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-01 01:14:35,721 [ scc.git] DEBUG Calling 'git remote'
2025-04-01 01:14:35,723 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:35,723 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-01 01:14:35,723 [ scc.git] DEBUG Calling 'git remote'
2025-04-01 01:14:35,725 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:35,725 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-01 01:14:35,725 [ scc.git] DEBUG Calling 'git remote'
2025-04-01 01:14:35,727 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-01 01:14:35,727 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-01 01:14:35,727 [ scc.git] DEBUG Calling 'git remote'
2025-04-01 01:14:35,730 [ 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 82f4325] 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 c92418b] 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-01 01:15:23,454 [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-01 01:15:32,933 [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-01 01:15:35,400 [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-01 01:15:40,214 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-01 01:16:27,180 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts (hide)
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/316c2b55/images/svgs/logo.svg){kind=logo}
