Skipping 192 KB..
Full Log2025-03-26 00:55:56,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-26 00:55:56,854 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:55:57,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-26 00:55:57,359 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:55:57,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-26 00:55:57,896 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:55:58,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-26 00:55:58,528 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:55:58,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc?per_page=1 HTTP/1.1" 200 2
2025-03-26 00:55:58,723 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-26 00:55:58,976 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:55:59,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-03-26 00:55:59,457 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:55:59,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-03-26 00:55:59,917 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:00,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-03-26 00:56:00,423 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:00,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-03-26 00:56:00,906 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:01,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-26 00:56:01,417 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:01,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-26 00:56:01,964 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:02,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-26 00:56:02,475 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:02,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-26 00:56:02,935 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:03,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2025-03-26 00:56:03,122 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-26 00:56:03,374 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:03,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-03-26 00:56:03,885 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:04,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-03-26 00:56:04,397 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:04,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-26 00:56:04,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:05,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-26 00:56:05,463 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:05,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-03-26 00:56:05,991 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:06,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-26 00:56:06,540 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:06,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2025-03-26 00:56:06,731 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-03-26 00:56:06,982 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:07,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-03-26 00:56:07,479 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:07,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-03-26 00:56:07,972 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:08,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-26 00:56:08,505 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:08,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-26 00:56:09,021 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:09,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-26 00:56:09,480 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:09,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2025-03-26 00:56:09,671 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-03-26 00:56:09,672 [ scc.repo] DEBUG ## Branches found:
2025-03-26 00:56:09,672 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-26 00:56:09,672 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:09,672 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:09,678 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-26 00:56:09,684 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-26 00:56:09,684 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-26 00:56:09,690 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-26 00:56:09,695 [ scc.git] DEBUG Already up to date.
2025-03-26 00:56:09,695 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-03-26 00:56:12,129 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-26 00:56:12,129 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-03-26 00:56:12,134 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-03-26 00:56:13,873 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-26 00:56:13,873 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-03-26 00:56:13,879 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-03-26 00:56:14,265 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-26 00:56:14,266 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-03-26 00:56:14,271 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-03-26 00:56:14,577 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-26 00:56:14,577 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-03-26 00:56:14,582 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-03-26 00:56:14,877 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-26 00:56:14,878 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-03-26 00:56:14,882 [ scc.git] DEBUG ## Unique users: []
2025-03-26 00:56:14,882 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:14,883 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:14,888 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-26 00:56:14,897 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:14,902 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-26 00:56:14,993 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-03-26 00:56:14,993 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-03-26 00:56:14,994 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-26 00:56:14,998 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-03-26 00:56:14,998 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-03-26 00:56:14,998 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-03-26 00:56:15,000 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:15,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:56:15,172 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-26 00:56:15,183 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:15,188 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-26 00:56:15,399 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-03-26 00:56:15,399 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-03-26 00:56:15,399 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-03-26 00:56:15,399 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-03-26 00:56:15,400 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-26 00:56:15,405 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-03-26 00:56:15,405 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-03-26 00:56:15,405 [ scc.git] DEBUG src/app/header.html | 5 +
2025-03-26 00:56:15,405 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-03-26 00:56:15,405 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-03-26 00:56:15,405 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-03-26 00:56:15,405 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-03-26 00:56:15,405 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-03-26 00:56:15,424 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:15,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:56:15,595 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-26 00:56:15,606 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:15,611 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-26 00:56:15,674 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-03-26 00:56:15,675 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-26 00:56:15,678 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-03-26 00:56:15,678 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-03-26 00:56:15,678 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-03-26 00:56:15,847 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:16,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:56:16,016 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-26 00:56:16,071 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:16,078 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-26 00:56:16,097 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-26 00:56:16,107 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-03-26 00:56:16,107 [ scc.git] DEBUG package.json | 2 +-
2025-03-26 00:56:16,107 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-03-26 00:56:16,269 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:16,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:56:16,438 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-26 00:56:16,525 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:16,531 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-26 00:56:16,730 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-26 00:56:16,731 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-03-26 00:56:16,731 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-26 00:56:16,732 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-26 00:56:16,738 [ scc.git] DEBUG Calling 'git reset --hard c2f695be472020400e9b8ad51a6512fb5a4ea125'
2025-03-26 00:56:16,749 [ scc.git] DEBUG HEAD is now at c2f695b merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-03-26 00:56:16,751 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:16,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:56:16,911 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-26 00:56:16,917 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-03-26 00:56:16,923 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#367](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-03-26 00:56:16,928 [ scc.config] DEBUG Found github.token
2025-03-26 00:56:16,928 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-03-26 00:56:16,928 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-26 00:56:16,971 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:16,971 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:16,976 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-26 00:56:17,016 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-26 00:56:17,026 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efcec743520> has no local changes
2025-03-26 00:56:17,027 [ 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)
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'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#367 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/)'
2025-03-26 00:56:17,036 [ scc.git] DEBUG [detached HEAD 2d3e362] merge master -Dorg -Ssuccess-only
2025-03-26 00:56:17,036 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:56:17,036 [ scc.repo] DEBUG ## PRs found:
2025-03-26 00:56:17,163 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:17,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-03-26 00:56:17,763 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:18,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-03-26 00:56:18,264 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:18,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-03-26 00:56:18,798 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:19,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-26 00:56:19,340 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:19,584 [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-03-26 00:56:19,836 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:20,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-26 00:56:20,369 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:20,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-03-26 00:56:20,556 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-03-26 00:56:20,556 [ scc.repo] DEBUG ## Branches found:
2025-03-26 00:56:20,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-26 00:56:20,556 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:20,556 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:20,562 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-26 00:56:20,567 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-26 00:56:20,567 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-26 00:56:20,573 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-26 00:56:20,578 [ scc.git] DEBUG Already up to date.
2025-03-26 00:56:20,578 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-03-26 00:56:21,546 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-03-26 00:56:21,546 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-03-26 00:56:21,550 [ scc.git] DEBUG ## Unique users: []
2025-03-26 00:56:21,550 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:21,550 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:21,556 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-26 00:56:21,562 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:21,567 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-26 00:56:21,578 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-26 00:56:21,582 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-03-26 00:56:21,582 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-03-26 00:56:21,582 [ scc.git] DEBUG requirements.txt | 2 +-
2025-03-26 00:56:21,582 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-03-26 00:56:21,582 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-03-26 00:56:21,582 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-03-26 00:56:21,584 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:21,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:56:21,760 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-26 00:56:21,804 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:21,804 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:21,809 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-26 00:56:21,849 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-26 00:56:21,856 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efced7b9af0> has no local changes
2025-03-26 00:56:21,856 [ 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'
Generated by OMERO-plugins-push#367 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/)'
2025-03-26 00:56:21,865 [ scc.git] DEBUG [detached HEAD 6656179] merge master -Dorg -Ssuccess-only
2025-03-26 00:56:21,865 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:56:21,866 [ scc.repo] DEBUG ## PRs found:
2025-03-26 00:56:22,012 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:22,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-03-26 00:56:22,591 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:22,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-03-26 00:56:23,082 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:23,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-03-26 00:56:23,600 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:23,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-26 00:56:24,122 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:24,455 [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-03-26 00:56:24,708 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:24,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-26 00:56:25,153 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:25,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-03-26 00:56:25,543 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-26 00:56:25,795 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:26,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-03-26 00:56:26,305 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:26,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-03-26 00:56:26,791 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:28,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-26 00:56:28,376 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:29,190 [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-03-26 00:56:29,443 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:29,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-26 00:56:29,993 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:30,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-03-26 00:56:30,242 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-26 00:56:30,243 [ scc.repo] DEBUG ## Branches found:
2025-03-26 00:56:30,243 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-26 00:56:30,243 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:30,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:30,249 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-26 00:56:30,254 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-26 00:56:30,254 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-26 00:56:30,260 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-26 00:56:30,265 [ scc.git] DEBUG Already up to date.
2025-03-26 00:56:30,266 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-03-26 00:56:31,017 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-26 00:56:31,018 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-03-26 00:56:31,023 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-03-26 00:56:31,690 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-26 00:56:31,691 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-03-26 00:56:31,695 [ scc.git] DEBUG ## Unique users: []
2025-03-26 00:56:31,695 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:31,696 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:31,702 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-26 00:56:31,709 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:31,714 [ 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-03-26 00:56:31,854 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-03-26 00:56:31,854 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-03-26 00:56:31,854 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-26 00:56:31,854 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-26 00:56:31,855 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-26 00:56:31,855 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-26 00:56:31,861 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-26 00:56:31,868 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-26 00:56:31,871 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:32,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:56:32,041 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-26 00:56:32,049 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-26 00:56:32,055 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#367](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-03-26 00:56:32,059 [ scc.config] DEBUG Found github.token
2025-03-26 00:56:32,060 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-03-26 00:56:32,060 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-26 00:56:32,067 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:32,072 [ 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-03-26 00:56:32,156 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-26 00:56:32,156 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-26 00:56:32,156 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-03-26 00:56:32,156 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-26 00:56:32,157 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-26 00:56:32,162 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-26 00:56:32,170 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-26 00:56:32,293 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:32,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:56:32,471 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-26 00:56:32,479 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-26 00:56:32,484 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#367](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/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-03-26 00:56:32,490 [ scc.config] DEBUG Found github.token
2025-03-26 00:56:32,490 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-03-26 00:56:32,490 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-26 00:56:32,533 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:32,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:32,539 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-26 00:56:32,580 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-26 00:56:32,588 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efcec785fa0> has no local changes
2025-03-26 00:56:32,588 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Already up to date.
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#367 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/)'
2025-03-26 00:56:32,598 [ scc.git] DEBUG [detached HEAD c4937bb] merge master -Dorg -Ssuccess-only
2025-03-26 00:56:32,598 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:56:32,599 [ scc.repo] DEBUG ## PRs found:
2025-03-26 00:56:32,723 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:33,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-03-26 00:56:33,306 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:33,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-03-26 00:56:33,599 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-26 00:56:33,850 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:34,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-26 00:56:34,440 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:34,727 [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-03-26 00:56:34,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:35,303 [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-03-26 00:56:35,556 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:35,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-26 00:56:36,042 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:36,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-03-26 00:56:36,215 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-26 00:56:36,466 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:36,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-03-26 00:56:36,746 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-26 00:56:36,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:37,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-26 00:56:37,587 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:37,828 [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-03-26 00:56:38,081 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:38,417 [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-03-26 00:56:38,672 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:39,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-26 00:56:39,263 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:39,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-03-26 00:56:39,439 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-26 00:56:39,690 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:39,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-03-26 00:56:40,177 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:40,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-03-26 00:56:40,700 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:40,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-03-26 00:56:41,199 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:41,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-03-26 00:56:41,691 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:41,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-03-26 00:56:42,209 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:42,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-03-26 00:56:42,697 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:42,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-03-26 00:56:42,977 [ scc.repo] DEBUG ## Branches found:
2025-03-26 00:56:42,977 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-26 00:56:42,977 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:42,977 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:42,983 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-26 00:56:42,988 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-26 00:56:42,988 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-26 00:56:42,994 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-26 00:56:43,000 [ scc.git] DEBUG Already up to date.
2025-03-26 00:56:43,000 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-03-26 00:56:43,328 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-26 00:56:43,328 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-03-26 00:56:43,333 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-03-26 00:56:43,628 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-26 00:56:43,628 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-03-26 00:56:43,633 [ scc.git] DEBUG ## Unique users: []
2025-03-26 00:56:43,633 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:43,633 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:43,639 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-26 00:56:43,695 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:43,701 [ 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-03-26 00:56:43,818 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-26 00:56:43,821 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-03-26 00:56:43,821 [ scc.git] DEBUG package.json | 2 +-
2025-03-26 00:56:43,822 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-03-26 00:56:43,824 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:44,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:56:44,004 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-03-26 00:56:44,055 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:44,061 [ 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-03-26 00:56:44,167 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-26 00:56:44,168 [ scc.git] DEBUG Auto-merging package.json
2025-03-26 00:56:44,168 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-26 00:56:44,172 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-03-26 00:56:44,172 [ scc.git] DEBUG package.json | 2 +-
2025-03-26 00:56:44,172 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-03-26 00:56:44,256 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:44,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:56:44,420 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-26 00:56:44,464 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:44,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:44,470 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-26 00:56:44,511 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-26 00:56:44,519 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efcec796880> has no local changes
2025-03-26 00:56:44,519 [ 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'
Generated by OMERO-plugins-push#367 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/)'
2025-03-26 00:56:44,529 [ scc.git] DEBUG [detached HEAD f80a0f9] merge master -Dorg -Ssuccess-only
2025-03-26 00:56:44,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:56:44,529 [ scc.repo] DEBUG ## PRs found:
2025-03-26 00:56:44,672 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:44,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-03-26 00:56:44,880 [ scc.repo] DEBUG ## Branches found:
2025-03-26 00:56:44,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-26 00:56:44,881 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:44,881 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:44,887 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-26 00:56:44,892 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-26 00:56:44,892 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-26 00:56:44,897 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-26 00:56:44,903 [ scc.git] DEBUG Already up to date.
2025-03-26 00:56:44,903 [ scc.git] DEBUG ## Unique users: []
2025-03-26 00:56:44,903 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:44,903 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:44,908 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-26 00:56:44,951 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:44,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:44,957 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-26 00:56:44,998 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-26 00:56:45,005 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efcec77e220> has no local changes
2025-03-26 00:56:45,005 [ 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#367 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/)'
2025-03-26 00:56:45,014 [ scc.git] DEBUG [detached HEAD babf089] merge master -Dorg -Ssuccess-only
2025-03-26 00:56:45,014 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:56:45,015 [ scc.repo] DEBUG ## PRs found:
2025-03-26 00:56:45,133 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:45,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-03-26 00:56:45,739 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:46,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-03-26 00:56:46,261 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:46,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-03-26 00:56:46,765 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:47,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-03-26 00:56:47,141 [ scc.repo] DEBUG ## Branches found:
2025-03-26 00:56:47,141 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-26 00:56:47,141 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:47,141 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:47,147 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-26 00:56:47,152 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-26 00:56:47,152 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-26 00:56:47,158 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-26 00:56:47,163 [ scc.git] DEBUG Already up to date.
2025-03-26 00:56:47,164 [ scc.git] DEBUG ## Unique users: []
2025-03-26 00:56:47,164 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:47,164 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:47,169 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-26 00:56:47,212 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:47,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:47,218 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-26 00:56:47,259 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-26 00:56:47,266 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efcec785af0> has no local changes
2025-03-26 00:56:47,267 [ 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#367 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/)'
2025-03-26 00:56:47,275 [ scc.git] DEBUG [detached HEAD bb85dd0] merge master -Dorg -Ssuccess-only
2025-03-26 00:56:47,276 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:56:47,276 [ scc.repo] DEBUG ## PRs found:
2025-03-26 00:56:47,393 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:47,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-03-26 00:56:47,952 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:48,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-03-26 00:56:48,562 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:48,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-03-26 00:56:49,031 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:49,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-26 00:56:49,614 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:49,852 [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-03-26 00:56:50,104 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:50,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-26 00:56:50,688 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:50,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-03-26 00:56:50,878 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-26 00:56:50,878 [ scc.repo] DEBUG ## Branches found:
2025-03-26 00:56:50,878 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-26 00:56:50,879 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:50,879 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:50,885 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-26 00:56:50,890 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-26 00:56:50,890 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-26 00:56:50,895 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-26 00:56:50,901 [ scc.git] DEBUG Already up to date.
2025-03-26 00:56:50,901 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-03-26 00:56:51,319 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-03-26 00:56:51,319 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-03-26 00:56:51,323 [ scc.git] DEBUG ## Unique users: []
2025-03-26 00:56:51,324 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:51,324 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:51,329 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-26 00:56:51,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:51,341 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-26 00:56:51,470 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-03-26 00:56:51,470 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-03-26 00:56:51,470 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-03-26 00:56:51,470 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-03-26 00:56:51,470 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-03-26 00:56:51,470 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-03-26 00:56:51,470 [ scc.git] DEBUG Auto-merging setup.py
2025-03-26 00:56:51,470 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-03-26 00:56:51,470 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-26 00:56:51,470 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-26 00:56:51,477 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-26 00:56:51,484 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-03-26 00:56:51,487 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:51,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:56:51,768 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-26 00:56:51,775 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-26 00:56:51,781 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#367](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/urls.py
- omero_signup/views.py
- setup.py
--conflicts
2025-03-26 00:56:51,786 [ scc.config] DEBUG Found github.token
2025-03-26 00:56:51,786 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-03-26 00:56:51,786 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-26 00:56:51,828 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:51,829 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:51,834 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-26 00:56:51,875 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-26 00:56:51,882 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efcec73cfd0> has no local changes
2025-03-26 00:56:51,883 [ 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#367 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/)'
2025-03-26 00:56:51,892 [ scc.git] DEBUG [detached HEAD 02e6085] merge master -Dorg -Ssuccess-only
2025-03-26 00:56:51,892 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:56:51,893 [ scc.repo] DEBUG ## PRs found:
2025-03-26 00:56:52,020 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:52,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-03-26 00:56:52,561 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:52,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-03-26 00:56:53,069 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:53,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-03-26 00:56:53,586 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:54,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-03-26 00:56:54,306 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:54,554 [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-03-26 00:56:54,806 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:55,018 [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-03-26 00:56:55,271 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:55,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-03-26 00:56:55,791 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:56,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-03-26 00:56:56,307 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:56,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-03-26 00:56:56,794 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:56,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-03-26 00:56:57,250 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:57,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-26 00:56:57,789 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:57,983 [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-03-26 00:56:58,236 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:58,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-26 00:56:58,761 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:58,937 [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-03-26 00:56:58,937 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-26 00:56:58,938 [ scc.repo] DEBUG ## Branches found:
2025-03-26 00:56:58,938 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-26 00:56:58,938 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:58,938 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:58,944 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-26 00:56:58,949 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-26 00:56:58,949 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-26 00:56:58,955 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-26 00:56:58,960 [ scc.git] DEBUG Already up to date.
2025-03-26 00:56:58,961 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-03-26 00:56:59,339 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-03-26 00:56:59,339 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-03-26 00:56:59,344 [ scc.git] DEBUG ## Unique users: []
2025-03-26 00:56:59,344 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:59,344 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:59,350 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-03-26 00:56:59,357 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:59,362 [ 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-03-26 00:56:59,377 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-26 00:56:59,381 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-03-26 00:56:59,381 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-03-26 00:56:59,381 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-03-26 00:56:59,381 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-03-26 00:56:59,381 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-03-26 00:56:59,381 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-03-26 00:56:59,381 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-03-26 00:56:59,381 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-03-26 00:56:59,382 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-03-26 00:56:59,382 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-03-26 00:56:59,384 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:59,384 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-03-26 00:56:59,384 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-03-26 00:56:59,384 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-03-26 00:56:59,384 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-03-26 00:56:59,384 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-03-26 00:56:59,384 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-03-26 00:56:59,384 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-03-26 00:56:59,384 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-03-26 00:56:59,384 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-03-26 00:56:59,384 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-03-26 00:56:59,384 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-03-26 00:56:59,384 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-03-26 00:56:59,384 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-03-26 00:56:59,384 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-03-26 00:56:59,384 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-03-26 00:56:59,384 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-03-26 00:56:59,384 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-03-26 00:56:59,385 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-03-26 00:56:59,385 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-03-26 00:56:59,385 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-03-26 00:56:59,385 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-03-26 00:56:59,385 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-03-26 00:56:59,385 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-03-26 00:56:59,385 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-03-26 00:56:59,385 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-03-26 00:56:59,385 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-03-26 00:56:59,385 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-03-26 00:56:59,385 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-03-26 00:56:59,385 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-03-26 00:56:59,385 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-03-26 00:56:59,385 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-03-26 00:56:59,385 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-03-26 00:56:59,385 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-03-26 00:56:59,385 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-03-26 00:56:59,385 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-03-26 00:56:59,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:56:59,550 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-26 00:56:59,595 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:59,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:59,600 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-26 00:56:59,645 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-26 00:56:59,652 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efcec785ca0> has no local changes
2025-03-26 00:56:59,653 [ 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#367 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/)'
2025-03-26 00:56:59,663 [ scc.git] DEBUG [detached HEAD 3733b41] merge master -Dorg -Ssuccess-only
2025-03-26 00:56:59,663 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:56:59,664 [ scc.repo] DEBUG ## PRs found:
2025-03-26 00:56:59,802 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:56:59,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-03-26 00:56:59,981 [ scc.repo] DEBUG ## Branches found:
2025-03-26 00:56:59,981 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-26 00:56:59,981 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:56:59,981 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:56:59,987 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-26 00:56:59,992 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-26 00:56:59,992 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-26 00:56:59,997 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-26 00:57:00,003 [ scc.git] DEBUG Already up to date.
2025-03-26 00:57:00,003 [ scc.git] DEBUG ## Unique users: []
2025-03-26 00:57:00,004 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:57:00,004 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:00,008 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-26 00:57:00,050 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:57:00,051 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:00,056 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-26 00:57:00,097 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-26 00:57:00,104 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efcec6db0d0> has no local changes
2025-03-26 00:57:00,104 [ 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#367 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/)'
2025-03-26 00:57:00,114 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:00,114 [ scc.git] DEBUG [detached HEAD 000774c] merge master -Dorg -Ssuccess-only
2025-03-26 00:57:00,114 [ scc.repo] DEBUG ## PRs found:
2025-03-26 00:57:00,233 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:00,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-03-26 00:57:00,757 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:01,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-03-26 00:57:01,401 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:01,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-03-26 00:57:01,926 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:02,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-26 00:57:02,488 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:02,755 [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-03-26 00:57:03,008 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:03,294 [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-03-26 00:57:03,547 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:03,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-26 00:57:04,074 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:04,253 [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-03-26 00:57:04,254 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-03-26 00:57:04,254 [ scc.repo] DEBUG ## Branches found:
2025-03-26 00:57:04,254 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-26 00:57:04,254 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:57:04,254 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:04,260 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-26 00:57:04,265 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-26 00:57:04,265 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-26 00:57:04,271 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-26 00:57:04,277 [ scc.git] DEBUG Already up to date.
2025-03-26 00:57:04,278 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-03-26 00:57:04,909 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-03-26 00:57:04,909 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-03-26 00:57:04,914 [ scc.git] DEBUG ## Unique users: []
2025-03-26 00:57:04,914 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:57:04,914 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:04,920 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-03-26 00:57:04,926 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:04,931 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-03-26 00:57:04,941 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-26 00:57:04,944 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-03-26 00:57:04,944 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-03-26 00:57:04,944 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-03-26 00:57:04,944 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-03-26 00:57:04,944 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-03-26 00:57:04,947 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:05,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:05,126 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-26 00:57:05,169 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:57:05,170 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:05,175 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-26 00:57:05,217 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-26 00:57:05,224 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efcec785d30> has no local changes
2025-03-26 00:57:05,224 [ 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#367 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/)'
2025-03-26 00:57:05,233 [ scc.git] DEBUG [detached HEAD 97e975c] merge master -Dorg -Ssuccess-only
2025-03-26 00:57:05,233 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:05,233 [ scc.git] INFO Overriding base-branch from master to main
2025-03-26 00:57:05,234 [ scc.repo] DEBUG ## PRs found:
2025-03-26 00:57:05,378 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:05,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-03-26 00:57:05,965 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:06,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-03-26 00:57:06,605 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:06,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-03-26 00:57:07,093 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:07,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-03-26 00:57:07,658 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:08,082 [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-03-26 00:57:08,334 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:08,677 [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-03-26 00:57:08,929 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:09,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-03-26 00:57:09,460 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:09,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-03-26 00:57:09,972 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:10,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-03-26 00:57:10,461 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:10,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-26 00:57:10,987 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:11,239 [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-03-26 00:57:11,492 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:11,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-26 00:57:11,934 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:12,129 [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-03-26 00:57:12,129 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-26 00:57:12,130 [ scc.repo] DEBUG ## Branches found:
2025-03-26 00:57:12,130 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-26 00:57:12,130 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:57:12,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:12,136 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-03-26 00:57:12,142 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-26 00:57:12,142 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-03-26 00:57:12,150 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-03-26 00:57:12,156 [ scc.git] DEBUG Already up to date.
2025-03-26 00:57:12,156 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-03-26 00:57:12,743 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-03-26 00:57:12,743 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-03-26 00:57:12,748 [ scc.git] DEBUG ## Unique users: []
2025-03-26 00:57:12,748 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:57:12,748 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:12,754 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-26 00:57:12,760 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:12,765 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-26 00:57:12,917 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-03-26 00:57:12,917 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-03-26 00:57:12,917 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-26 00:57:12,917 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-26 00:57:12,924 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-26 00:57:12,931 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-03-26 00:57:12,934 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:13,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:13,100 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-26 00:57:13,106 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-26 00:57:13,112 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#367](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-03-26 00:57:13,117 [ scc.config] DEBUG Found github.token
2025-03-26 00:57:13,117 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-03-26 00:57:13,117 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-26 00:57:13,161 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:57:13,161 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:13,167 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-26 00:57:13,210 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-26 00:57:13,218 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efcec6ec940> has no local changes
2025-03-26 00:57:13,218 [ 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#367 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/)'
2025-03-26 00:57:13,227 [ scc.git] DEBUG [detached HEAD 46db82f] merge master -Dorg -Ssuccess-only
2025-03-26 00:57:13,227 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:13,227 [ scc.repo] DEBUG ## PRs found:
2025-03-26 00:57:13,352 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:13,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-03-26 00:57:13,564 [ scc.repo] DEBUG ## Branches found:
2025-03-26 00:57:13,564 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-26 00:57:13,564 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:57:13,564 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:13,570 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-26 00:57:13,575 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-26 00:57:13,575 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-26 00:57:13,581 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-26 00:57:13,587 [ scc.git] DEBUG Already up to date.
2025-03-26 00:57:13,588 [ scc.git] DEBUG ## Unique users: []
2025-03-26 00:57:13,588 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:57:13,588 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:13,594 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-26 00:57:13,636 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:57:13,636 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:13,641 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-26 00:57:13,683 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-26 00:57:13,689 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efcec6245b0> has no local changes
2025-03-26 00:57:13,689 [ 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#367 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/)'
2025-03-26 00:57:13,698 [ scc.git] DEBUG [detached HEAD a8791c0] merge master -Dorg -Ssuccess-only
2025-03-26 00:57:13,698 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:13,698 [ scc.repo] DEBUG ## PRs found:
2025-03-26 00:57:13,816 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:14,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-03-26 00:57:14,029 [ scc.repo] DEBUG ## Branches found:
2025-03-26 00:57:14,029 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-26 00:57:14,029 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:57:14,030 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:14,035 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-26 00:57:14,040 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-26 00:57:14,041 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-26 00:57:14,047 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-26 00:57:14,053 [ scc.git] DEBUG Already up to date.
2025-03-26 00:57:14,053 [ scc.git] DEBUG ## Unique users: []
2025-03-26 00:57:14,053 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:57:14,053 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:14,058 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-26 00:57:14,101 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:57:14,102 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:14,107 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-26 00:57:14,149 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-26 00:57:14,156 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efcec6e7520> has no local changes
2025-03-26 00:57:14,156 [ 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#367 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/)'
2025-03-26 00:57:14,165 [ scc.git] DEBUG [detached HEAD 946d99e] merge master -Dorg -Ssuccess-only
2025-03-26 00:57:14,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:14,166 [ scc.repo] DEBUG ## PRs found:
2025-03-26 00:57:14,282 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:14,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-03-26 00:57:14,820 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:15,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-03-26 00:57:15,326 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:15,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-03-26 00:57:15,833 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:16,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-26 00:57:16,387 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:16,611 [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-03-26 00:57:16,863 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:17,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-26 00:57:17,425 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:17,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-03-26 00:57:17,617 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-03-26 00:57:17,617 [ scc.repo] DEBUG ## Branches found:
2025-03-26 00:57:17,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-26 00:57:17,617 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:57:17,617 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:17,623 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-26 00:57:17,630 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-26 00:57:17,630 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-26 00:57:17,637 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-26 00:57:17,642 [ scc.git] DEBUG Already up to date.
2025-03-26 00:57:17,642 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-03-26 00:57:18,143 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-03-26 00:57:18,144 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-03-26 00:57:18,148 [ scc.git] DEBUG ## Unique users: []
2025-03-26 00:57:18,149 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:57:18,149 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:18,154 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-26 00:57:18,160 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:18,165 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-26 00:57:18,219 [ scc.git] DEBUG Auto-merging Dockerfile
2025-03-26 00:57:18,219 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-03-26 00:57:18,220 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-26 00:57:18,220 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-26 00:57:18,227 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-26 00:57:18,235 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-03-26 00:57:18,237 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:18,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:18,427 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-26 00:57:18,433 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-26 00:57:18,438 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#367](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-03-26 00:57:18,443 [ scc.config] DEBUG Found github.token
2025-03-26 00:57:18,443 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-03-26 00:57:18,444 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-26 00:57:18,486 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:57:18,487 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:18,493 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-26 00:57:18,533 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-26 00:57:18,541 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efcec624610> has no local changes
2025-03-26 00:57:18,542 [ 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#367 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/)'
2025-03-26 00:57:18,552 [ scc.git] DEBUG [detached HEAD 0d0c603] merge master -Dorg -Ssuccess-only
2025-03-26 00:57:18,552 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:18,552 [ scc.git] INFO Overriding base-branch from master to develop
2025-03-26 00:57:18,552 [ scc.repo] DEBUG ## PRs found:
2025-03-26 00:57:18,679 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:19,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-03-26 00:57:19,314 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:19,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-03-26 00:57:19,813 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:20,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-03-26 00:57:20,292 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:20,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-26 00:57:20,729 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:21,181 [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-03-26 00:57:21,433 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:21,739 [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-03-26 00:57:21,991 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:22,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-26 00:57:22,521 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:22,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-03-26 00:57:22,709 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-26 00:57:22,960 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:23,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-03-26 00:57:23,456 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:23,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-03-26 00:57:23,937 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:24,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-26 00:57:24,407 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:24,617 [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-03-26 00:57:24,870 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:25,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-26 00:57:25,331 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:25,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-03-26 00:57:25,556 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-26 00:57:25,807 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:26,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-03-26 00:57:26,349 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:26,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-03-26 00:57:26,919 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:27,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-03-26 00:57:27,408 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:27,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-03-26 00:57:27,700 [ scc.repo] DEBUG ## Branches found:
2025-03-26 00:57:27,701 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-26 00:57:27,701 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:57:27,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:27,707 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-03-26 00:57:27,712 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-26 00:57:27,712 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-03-26 00:57:27,718 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-03-26 00:57:27,729 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-03-26 00:57:27,952 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:28,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-03-26 00:57:28,372 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-03-26 00:57:29,166 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-26 00:57:29,166 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-03-26 00:57:29,171 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-03-26 00:57:29,811 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-26 00:57:29,811 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-03-26 00:57:29,816 [ scc.git] DEBUG ## Unique users: []
2025-03-26 00:57:29,816 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:57:29,816 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:29,822 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-26 00:57:29,830 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:29,835 [ 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-03-26 00:57:29,860 [ 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-03-26 00:57:29,860 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-26 00:57:29,860 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-26 00:57:29,866 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-03-26 00:57:29,873 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-03-26 00:57:29,876 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:30,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:30,048 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-26 00:57:30,057 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-03-26 00:57:30,065 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#367](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-03-26 00:57:30,070 [ scc.config] DEBUG Found github.token
2025-03-26 00:57:30,071 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-03-26 00:57:30,071 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-26 00:57:30,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:30,083 [ 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-03-26 00:57:30,095 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-26 00:57:30,099 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-03-26 00:57:30,099 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-03-26 00:57:30,300 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:30,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:30,469 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-26 00:57:30,514 [ scc.git] DEBUG Get sha1 of %s
2025-03-26 00:57:30,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-26 00:57:30,520 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-26 00:57:30,563 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-26 00:57:30,571 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efcec6620d0> has no local changes
2025-03-26 00:57:30,571 [ 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#367 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/)'
2025-03-26 00:57:30,580 [ scc.git] DEBUG [detached HEAD 84c32b6] merge master -Dorg -Ssuccess-only
2025-03-26 00:57:30,581 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:30,581 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-26 00:57:30,668 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-03-26 00:57:30,721 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:30,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:30,894 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-03-26 00:57:30,899 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-03-26 00:57:31,135 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:31,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:31,313 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-03-26 00:57:31,319 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-03-26 00:57:31,553 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:31,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:31,739 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-03-26 00:57:31,744 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-03-26 00:57:31,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:32,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:32,170 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-03-26 00:57:32,405 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:32,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:32,604 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-03-26 00:57:32,609 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-03-26 00:57:32,846 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:33,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:33,026 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-03-26 00:57:33,032 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-03-26 00:57:33,268 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:33,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:33,444 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-03-26 00:57:33,449 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-03-26 00:57:33,686 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:33,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:33,867 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-03-26 00:57:33,871 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-03-26 00:57:34,109 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:34,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:34,296 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-03-26 00:57:34,301 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-03-26 00:57:34,538 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:34,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:34,724 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-03-26 00:57:34,730 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-03-26 00:57:34,965 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:35,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:35,141 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-03-26 00:57:35,146 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-03-26 00:57:35,381 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:35,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:35,558 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-03-26 00:57:35,563 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-03-26 00:57:35,799 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:35,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:35,994 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-03-26 00:57:36,228 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:36,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:36,407 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-03-26 00:57:36,642 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:36,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:36,938 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-03-26 00:57:36,943 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-03-26 00:57:37,180 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:37,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:37,364 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-03-26 00:57:37,600 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:37,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:37,781 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-03-26 00:57:38,017 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:38,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:38,209 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-03-26 00:57:38,215 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-03-26 00:57:38,449 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:38,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:38,649 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-03-26 00:57:38,654 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-03-26 00:57:38,891 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:39,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:39,063 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-03-26 00:57:39,067 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-03-26 00:57:39,304 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:39,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:39,483 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-03-26 00:57:39,488 [ scc.config] DEBUG Found submodule.scripts.url
2025-03-26 00:57:39,725 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-26 00:57:39,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-26 00:57:39,903 [ scc.config] DEBUG Found submodule.scripts.branch
2025-03-26 00:57:39,903 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-26 00:57:40,000 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7efceeb66ca0> has local changes
2025-03-26 00:57:40,000 [ 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 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 600 Rdornier 'Label on rois' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- 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'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
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)
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'
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'
Repository: ome/omero-metadata
Already up to date.
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'
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#367 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/367/)'
2025-03-26 00:57:40,018 [ scc.git] DEBUG [detached HEAD ecbfb5c] merge master -Dorg -Ssuccess-only
2025-03-26 00:57:40,018 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-03-26 00:57:40,018 [ scc.merge] INFO Repository: ome/omero-plugins
2025-03-26 00:57:40,018 [ scc.merge] INFO Already up to date.
2025-03-26 00:57:40,019 [ scc.merge] INFO
2025-03-26 00:57:40,019 [ scc.merge] INFO Merged PRs:
2025-03-26 00:57:40,019 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-03-26 00:57:40,019 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-03-26 00:57:40,019 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-03-26 00:57:40,019 [ scc.merge] INFO
2025-03-26 00:57:40,019 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-03-26 00:57:40,019 [ scc.merge] INFO Already up to date.
2025-03-26 00:57:40,019 [ scc.merge] INFO
2025-03-26 00:57:40,019 [ scc.merge] INFO
2025-03-26 00:57:40,019 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-03-26 00:57:40,019 [ scc.merge] INFO Excluded PRs:
2025-03-26 00:57:40,019 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-03-26 00:57:40,019 [ scc.merge] INFO Already up to date.
2025-03-26 00:57:40,019 [ scc.merge] INFO
2025-03-26 00:57:40,019 [ scc.merge] INFO
2025-03-26 00:57:40,019 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-03-26 00:57:40,019 [ scc.merge] INFO Excluded PRs:
2025-03-26 00:57:40,019 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-03-26 00:57:40,019 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-03-26 00:57:40,019 [ scc.merge] INFO Already up to date.
2025-03-26 00:57:40,019 [ scc.merge] INFO
2025-03-26 00:57:40,019 [ scc.merge] INFO Merged PRs:
2025-03-26 00:57:40,019 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-03-26 00:57:40,019 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-03-26 00:57:40,019 [ scc.merge] INFO
2025-03-26 00:57:40,019 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-03-26 00:57:40,019 [ scc.merge] INFO Excluded PRs:
2025-03-26 00:57:40,019 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-03-26 00:57:40,019 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-26 00:57:40,019 [ scc.merge] INFO Already up to date.
2025-03-26 00:57:40,020 [ scc.merge] INFO
2025-03-26 00:57:40,020 [ scc.merge] INFO Merged PRs:
2025-03-26 00:57:40,020 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-03-26 00:57:40,020 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-03-26 00:57:40,020 [ scc.merge] INFO
2025-03-26 00:57:40,020 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-26 00:57:40,020 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-03-26 00:57:40,020 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-03-26 00:57:40,020 [ scc.merge] INFO
2025-03-26 00:57:40,020 [ scc.merge] INFO Repository: ome/omero-figure
2025-03-26 00:57:40,020 [ scc.merge] INFO Excluded PRs:
2025-03-26 00:57:40,020 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-03-26 00:57:40,020 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (stage: draft)
2025-03-26 00:57:40,020 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-03-26 00:57:40,020 [ scc.merge] INFO Already up to date.
2025-03-26 00:57:40,020 [ scc.merge] INFO
2025-03-26 00:57:40,020 [ scc.merge] INFO Merged PRs:
2025-03-26 00:57:40,020 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-03-26 00:57:40,020 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-03-26 00:57:40,020 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-03-26 00:57:40,020 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-03-26 00:57:40,020 [ scc.merge] INFO
2025-03-26 00:57:40,020 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-26 00:57:40,020 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-03-26 00:57:40,020 [ scc.merge] INFO
2025-03-26 00:57:40,020 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-03-26 00:57:40,020 [ scc.merge] INFO Already up to date.
2025-03-26 00:57:40,020 [ scc.merge] INFO
2025-03-26 00:57:40,020 [ scc.merge] INFO Merged PRs:
2025-03-26 00:57:40,020 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-03-26 00:57:40,020 [ scc.merge] INFO
2025-03-26 00:57:40,021 [ scc.merge] INFO Repository: ome/omero-gallery
2025-03-26 00:57:40,021 [ scc.merge] INFO Already up to date.
2025-03-26 00:57:40,021 [ scc.merge] INFO
2025-03-26 00:57:40,021 [ scc.merge] INFO Merged PRs:
2025-03-26 00:57:40,021 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-03-26 00:57:40,021 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-03-26 00:57:40,021 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-03-26 00:57:40,021 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-03-26 00:57:40,021 [ scc.merge] INFO
2025-03-26 00:57:40,021 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-26 00:57:40,021 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-03-26 00:57:40,021 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-03-26 00:57:40,021 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-03-26 00:57:40,021 [ scc.merge] INFO
2025-03-26 00:57:40,021 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-03-26 00:57:40,021 [ scc.merge] INFO Excluded PRs:
2025-03-26 00:57:40,021 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-03-26 00:57:40,021 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-03-26 00:57:40,021 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-03-26 00:57:40,021 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-03-26 00:57:40,021 [ scc.merge] INFO Already up to date.
2025-03-26 00:57:40,021 [ scc.merge] INFO
2025-03-26 00:57:40,021 [ scc.merge] INFO Merged PRs:
2025-03-26 00:57:40,021 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-03-26 00:57:40,021 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-03-26 00:57:40,021 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-26 00:57:40,021 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-26 00:57:40,021 [ scc.merge] INFO
2025-03-26 00:57:40,021 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-26 00:57:40,021 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-26 00:57:40,021 [ scc.merge] INFO
2025-03-26 00:57:40,021 [ scc.merge] INFO Repository: ome/omero-mapr
2025-03-26 00:57:40,022 [ scc.merge] INFO Excluded PRs:
2025-03-26 00:57:40,022 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-03-26 00:57:40,022 [ scc.merge] INFO Already up to date.
2025-03-26 00:57:40,022 [ scc.merge] INFO
2025-03-26 00:57:40,022 [ scc.merge] INFO Merged PRs:
2025-03-26 00:57:40,022 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-03-26 00:57:40,022 [ scc.merge] INFO
2025-03-26 00:57:40,022 [ scc.merge] INFO Repository: ome/omero-metadata
2025-03-26 00:57:40,022 [ scc.merge] INFO Already up to date.
2025-03-26 00:57:40,022 [ scc.merge] INFO
2025-03-26 00:57:40,022 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-26 00:57:40,022 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-26 00:57:40,022 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-26 00:57:40,022 [ scc.merge] INFO
2025-03-26 00:57:40,022 [ scc.merge] INFO Repository: ome/omero-parade
2025-03-26 00:57:40,022 [ scc.merge] INFO Excluded PRs:
2025-03-26 00:57:40,022 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-03-26 00:57:40,022 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-03-26 00:57:40,022 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-03-26 00:57:40,022 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-03-26 00:57:40,022 [ scc.merge] INFO Already up to date.
2025-03-26 00:57:40,022 [ scc.merge] INFO
2025-03-26 00:57:40,022 [ scc.merge] INFO Merged PRs:
2025-03-26 00:57:40,022 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-26 00:57:40,022 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-26 00:57:40,022 [ scc.merge] INFO
2025-03-26 00:57:40,022 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-03-26 00:57:40,022 [ scc.merge] INFO Already up to date.
2025-03-26 00:57:40,022 [ scc.merge] INFO
2025-03-26 00:57:40,022 [ scc.merge] INFO
2025-03-26 00:57:40,022 [ scc.merge] INFO Repository: ome/omero-rois
2025-03-26 00:57:40,022 [ scc.merge] INFO Excluded PRs:
2025-03-26 00:57:40,023 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-03-26 00:57:40,023 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-26 00:57:40,023 [ scc.merge] INFO Already up to date.
2025-03-26 00:57:40,023 [ scc.merge] INFO
2025-03-26 00:57:40,023 [ scc.merge] INFO
2025-03-26 00:57:40,023 [ scc.merge] INFO Repository: ome/omero-signup
2025-03-26 00:57:40,023 [ scc.merge] INFO Already up to date.
2025-03-26 00:57:40,023 [ scc.merge] INFO
2025-03-26 00:57:40,023 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-26 00:57:40,023 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-26 00:57:40,023 [ scc.merge] INFO
2025-03-26 00:57:40,023 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-03-26 00:57:40,023 [ scc.merge] INFO Excluded PRs:
2025-03-26 00:57:40,023 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-03-26 00:57:40,023 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-03-26 00:57:40,023 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-03-26 00:57:40,023 [ scc.merge] INFO Already up to date.
2025-03-26 00:57:40,023 [ scc.merge] INFO
2025-03-26 00:57:40,023 [ scc.merge] INFO Merged PRs:
2025-03-26 00:57:40,023 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-26 00:57:40,023 [ scc.merge] INFO
2025-03-26 00:57:40,023 [ scc.merge] INFO Repository: ome/omero-upload
2025-03-26 00:57:40,023 [ scc.merge] INFO Already up to date.
2025-03-26 00:57:40,023 [ scc.merge] INFO
2025-03-26 00:57:40,023 [ scc.merge] INFO
2025-03-26 00:57:40,023 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-03-26 00:57:40,023 [ scc.merge] INFO Already up to date.
2025-03-26 00:57:40,023 [ scc.merge] INFO
2025-03-26 00:57:40,023 [ scc.merge] INFO Merged PRs:
2025-03-26 00:57:40,023 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-03-26 00:57:40,023 [ scc.merge] INFO
2025-03-26 00:57:40,023 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-03-26 00:57:40,024 [ scc.merge] INFO Excluded PRs:
2025-03-26 00:57:40,024 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-03-26 00:57:40,024 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-03-26 00:57:40,024 [ scc.merge] INFO Already up to date.
2025-03-26 00:57:40,024 [ scc.merge] INFO
2025-03-26 00:57:40,024 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-26 00:57:40,024 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-26 00:57:40,024 [ scc.merge] INFO
2025-03-26 00:57:40,024 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-03-26 00:57:40,024 [ scc.merge] INFO Already up to date.
2025-03-26 00:57:40,024 [ scc.merge] INFO
2025-03-26 00:57:40,024 [ scc.merge] INFO
2025-03-26 00:57:40,024 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-03-26 00:57:40,024 [ scc.merge] INFO Already up to date.
2025-03-26 00:57:40,024 [ scc.merge] INFO
2025-03-26 00:57:40,024 [ scc.merge] INFO
2025-03-26 00:57:40,024 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-03-26 00:57:40,024 [ scc.merge] INFO Already up to date.
2025-03-26 00:57:40,024 [ scc.merge] INFO
2025-03-26 00:57:40,024 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-26 00:57:40,024 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-03-26 00:57:40,024 [ scc.merge] INFO
2025-03-26 00:57:40,024 [ scc.merge] INFO Repository: ome/scripts
2025-03-26 00:57:40,024 [ scc.merge] INFO Excluded PRs:
2025-03-26 00:57:40,024 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-03-26 00:57:40,024 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-03-26 00:57:40,024 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-03-26 00:57:40,024 [ scc.merge] INFO Previously merged:
2025-03-26 00:57:40,024 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-03-26 00:57:40,024 [ scc.merge] INFO
2025-03-26 00:57:40,024 [ scc.merge] INFO Merged PRs:
2025-03-26 00:57:40,024 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-26 00:57:40,025 [ scc.merge] INFO
2025-03-26 00:57:40,025 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-26 00:57:40,025 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-26 00:57:40,025 [ scc.merge] INFO
2025-03-26 00:57:40,025 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-03-26 00:57:40,025 [ scc.git] DEBUG Calling 'git remote'
2025-03-26 00:57:40,031 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-03-26 00:57:40,031 [ scc.git] DEBUG Calling 'git remote'
2025-03-26 00:57:40,035 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:40,035 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-03-26 00:57:40,036 [ scc.git] DEBUG Calling 'git remote'
2025-03-26 00:57:40,040 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:40,040 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-03-26 00:57:40,040 [ scc.git] DEBUG Calling 'git remote'
2025-03-26 00:57:40,045 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:40,045 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-03-26 00:57:40,046 [ scc.git] DEBUG Calling 'git remote'
2025-03-26 00:57:40,050 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:40,051 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-03-26 00:57:40,051 [ scc.git] DEBUG Calling 'git remote'
2025-03-26 00:57:40,055 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:40,056 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-03-26 00:57:40,056 [ scc.git] DEBUG Calling 'git remote'
2025-03-26 00:57:40,060 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:40,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-03-26 00:57:40,061 [ scc.git] DEBUG Calling 'git remote'
2025-03-26 00:57:40,066 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:40,066 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-26 00:57:40,066 [ scc.git] DEBUG Calling 'git remote'
2025-03-26 00:57:40,070 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:40,071 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-26 00:57:40,071 [ scc.git] DEBUG Calling 'git remote'
2025-03-26 00:57:40,075 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:40,076 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-26 00:57:40,076 [ scc.git] DEBUG Calling 'git remote'
2025-03-26 00:57:40,081 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:40,081 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-26 00:57:40,081 [ scc.git] DEBUG Calling 'git remote'
2025-03-26 00:57:40,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:40,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-26 00:57:40,086 [ scc.git] DEBUG Calling 'git remote'
2025-03-26 00:57:40,091 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:40,091 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-26 00:57:40,091 [ scc.git] DEBUG Calling 'git remote'
2025-03-26 00:57:40,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:40,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-26 00:57:40,096 [ scc.git] DEBUG Calling 'git remote'
2025-03-26 00:57:40,101 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:40,101 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-26 00:57:40,101 [ scc.git] DEBUG Calling 'git remote'
2025-03-26 00:57:40,106 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:40,106 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-26 00:57:40,106 [ scc.git] DEBUG Calling 'git remote'
2025-03-26 00:57:40,111 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:40,111 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-26 00:57:40,111 [ scc.git] DEBUG Calling 'git remote'
2025-03-26 00:57:40,116 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:40,116 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-26 00:57:40,116 [ scc.git] DEBUG Calling 'git remote'
2025-03-26 00:57:40,121 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:40,121 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-26 00:57:40,121 [ scc.git] DEBUG Calling 'git remote'
2025-03-26 00:57:40,126 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:40,126 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-26 00:57:40,126 [ scc.git] DEBUG Calling 'git remote'
2025-03-26 00:57:40,131 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:40,131 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-26 00:57:40,131 [ scc.git] DEBUG Calling 'git remote'
2025-03-26 00:57:40,136 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-26 00:57:40,136 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-26 00:57:40,136 [ scc.git] DEBUG Calling 'git remote'
2025-03-26 00:57:40,141 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/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
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: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.9/site-packages/setuptools/dist.py:466: 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.9/site-packages/setuptools/dist.py:466: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/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
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
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3: 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
python3: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3: 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.2-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 7bbf53c] 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 9578d87] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-03-26 00:58:29,835 [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-03-26 00:58:39,548 [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-03-26 00:58:42,172 [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-03-26 00:58:47,403 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-03-26 00:59:31,709 [ 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/f8f0d1dd/images/svgs/logo.svg){kind=logo}
