Skipping 192 KB..
Full Log2025-03-21 09:12:51,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-21 09:12:51,426 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:12:51,749 [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-21 09:12:52,001 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:12:52,287 [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-21 09:12:52,540 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:12:52,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-03-21 09:12:53,237 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:12:53,405 [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-21 09:12:53,406 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-21 09:12:53,657 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:12:53,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-03-21 09:12:54,157 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:12:54,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-03-21 09:12:54,626 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:12:54,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-03-21 09:12:55,133 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:12:55,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-03-21 09:12:55,624 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:12:55,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-21 09:12:56,122 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:12:56,352 [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-21 09:12:56,604 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:12:56,837 [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-21 09:12:57,090 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:12:57,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-03-21 09:12:57,610 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:12:57,787 [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-21 09:12:57,788 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-21 09:12:58,040 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:12:58,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-03-21 09:12:58,535 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:12:58,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-03-21 09:12:59,094 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:12:59,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-21 09:12:59,638 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:12:59,890 [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-21 09:13:00,143 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:00,413 [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-21 09:13:00,665 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:00,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-03-21 09:13:01,145 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:01,323 [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-21 09:13:01,324 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-03-21 09:13:01,576 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:01,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-03-21 09:13:02,117 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:02,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-03-21 09:13:02,607 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:02,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-21 09:13:03,117 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:03,325 [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-21 09:13:03,578 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:03,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-03-21 09:13:04,099 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:04,278 [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-21 09:13:04,279 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-03-21 09:13:04,279 [ scc.repo] DEBUG ## Branches found:
2025-03-21 09:13:04,279 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-21 09:13:04,279 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:04,279 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:04,285 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-21 09:13:04,290 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-21 09:13:04,290 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-21 09:13:04,295 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-21 09:13:04,301 [ scc.git] DEBUG Already up to date.
2025-03-21 09:13:04,301 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-03-21 09:13:07,029 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-21 09:13:07,029 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-03-21 09:13:07,034 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-03-21 09:13:07,868 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-21 09:13:07,868 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-03-21 09:13:07,873 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-03-21 09:13:08,176 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-21 09:13:08,176 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-03-21 09:13:08,181 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-03-21 09:13:08,469 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-21 09:13:08,469 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-03-21 09:13:08,474 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-03-21 09:13:08,766 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-03-21 09:13:08,766 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-03-21 09:13:08,770 [ scc.git] DEBUG ## Unique users: []
2025-03-21 09:13:08,771 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:08,771 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:08,778 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-21 09:13:08,785 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:08,790 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-03-21 09:13:08,977 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-03-21 09:13:08,977 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-03-21 09:13:08,978 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-21 09:13:08,981 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-03-21 09:13:08,981 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-03-21 09:13:08,981 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-03-21 09:13:08,984 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:09,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:13:09,152 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-21 09:13:09,162 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:09,167 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-03-21 09:13:09,394 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-03-21 09:13:09,395 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-03-21 09:13:09,395 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-03-21 09:13:09,395 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-03-21 09:13:09,395 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-21 09:13:09,400 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-03-21 09:13:09,400 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-03-21 09:13:09,400 [ scc.git] DEBUG src/app/header.html | 5 +
2025-03-21 09:13:09,400 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-03-21 09:13:09,400 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-03-21 09:13:09,400 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-03-21 09:13:09,400 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-03-21 09:13:09,400 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-03-21 09:13:09,404 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:09,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:13:09,566 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-21 09:13:09,575 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:09,580 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-03-21 09:13:09,652 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-03-21 09:13:09,653 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-21 09:13:09,656 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-03-21 09:13:09,656 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-03-21 09:13:09,656 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-03-21 09:13:09,818 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:09,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:13:09,975 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-21 09:13:10,029 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:10,035 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-03-21 09:13:10,052 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-21 09:13:10,062 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-03-21 09:13:10,062 [ scc.git] DEBUG package.json | 2 +-
2025-03-21 09:13:10,062 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-03-21 09:13:10,227 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:10,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:13:10,411 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-21 09:13:10,476 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:10,481 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-21 09:13:10,657 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-21 09:13:10,657 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-03-21 09:13:10,657 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-21 09:13:10,657 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-21 09:13:10,664 [ scc.git] DEBUG Calling 'git reset --hard bae7e48c8ab2a2a90fd27bbfd4d987a118d8d5cd'
2025-03-21 09:13:10,673 [ scc.git] DEBUG HEAD is now at bae7e48 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-03-21 09:13:10,676 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:10,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:13:10,866 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-03-21 09:13:10,872 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-03-21 09:13:10,877 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#362](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-03-21 09:13:10,882 [ scc.config] DEBUG Found github.token
2025-03-21 09:13:10,882 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-03-21 09:13:10,882 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-21 09:13:10,921 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:10,921 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:10,926 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-21 09:13:10,965 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-21 09:13:10,974 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f42543b3520> has no local changes
2025-03-21 09:13:10,975 [ 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#362 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/)'
2025-03-21 09:13:10,986 [ scc.git] DEBUG [detached HEAD 82831d5] merge master -Dorg -Ssuccess-only
2025-03-21 09:13:10,986 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:13:10,986 [ scc.repo] DEBUG ## PRs found:
2025-03-21 09:13:11,118 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:11,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-03-21 09:13:11,651 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:11,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-03-21 09:13:12,161 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:12,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-03-21 09:13:12,698 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:12,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-21 09:13:13,232 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:13,509 [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-21 09:13:13,762 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:14,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-03-21 09:13:14,295 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:14,468 [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-21 09:13:14,468 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-03-21 09:13:14,469 [ scc.repo] DEBUG ## Branches found:
2025-03-21 09:13:14,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-21 09:13:14,469 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:14,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:14,475 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-21 09:13:14,480 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-21 09:13:14,480 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-21 09:13:14,486 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-21 09:13:14,491 [ scc.git] DEBUG Already up to date.
2025-03-21 09:13:14,491 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-03-21 09:13:15,365 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-03-21 09:13:15,365 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-03-21 09:13:15,370 [ scc.git] DEBUG ## Unique users: []
2025-03-21 09:13:15,370 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:15,370 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:15,376 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-21 09:13:15,382 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:15,386 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-03-21 09:13:15,396 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-21 09:13:15,399 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-03-21 09:13:15,399 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-03-21 09:13:15,399 [ scc.git] DEBUG requirements.txt | 2 +-
2025-03-21 09:13:15,399 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-03-21 09:13:15,399 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-03-21 09:13:15,399 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-03-21 09:13:15,402 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:15,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:13:15,590 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-21 09:13:15,630 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:15,631 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:15,636 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-21 09:13:15,674 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-21 09:13:15,680 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f425644b8e0> has no local changes
2025-03-21 09:13:15,681 [ 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#362 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/)'
2025-03-21 09:13:15,688 [ scc.git] DEBUG [detached HEAD e5b7bf8] merge master -Dorg -Ssuccess-only
2025-03-21 09:13:15,689 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:13:15,689 [ scc.repo] DEBUG ## PRs found:
2025-03-21 09:13:15,843 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:16,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-03-21 09:13:16,413 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:16,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-03-21 09:13:16,944 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:17,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-03-21 09:13:17,517 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:17,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-21 09:13:18,058 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:18,259 [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-21 09:13:18,512 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:18,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-03-21 09:13:19,036 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:19,220 [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-21 09:13:19,220 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-21 09:13:19,472 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:19,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-03-21 09:13:19,962 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:20,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-03-21 09:13:20,487 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:20,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-21 09:13:20,996 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:21,225 [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-21 09:13:21,478 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:21,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-03-21 09:13:21,950 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:22,148 [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-21 09:13:22,148 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-21 09:13:22,148 [ scc.repo] DEBUG ## Branches found:
2025-03-21 09:13:22,148 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-21 09:13:22,149 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:22,149 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:22,155 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-21 09:13:22,159 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-21 09:13:22,159 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-21 09:13:22,164 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-21 09:13:22,169 [ scc.git] DEBUG Already up to date.
2025-03-21 09:13:22,170 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-03-21 09:13:22,681 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-21 09:13:22,682 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-03-21 09:13:22,686 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-03-21 09:13:23,502 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-03-21 09:13:23,503 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-03-21 09:13:23,507 [ scc.git] DEBUG ## Unique users: []
2025-03-21 09:13:23,507 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:23,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:23,512 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-21 09:13:23,519 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:23,524 [ 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-21 09:13:23,727 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-03-21 09:13:23,727 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-03-21 09:13:23,727 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-21 09:13:23,727 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-21 09:13:23,728 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-21 09:13:23,728 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-21 09:13:23,734 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-21 09:13:23,741 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-21 09:13:23,743 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:23,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:13:23,900 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-03-21 09:13:23,908 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-21 09:13:23,913 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#362](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-03-21 09:13:23,918 [ scc.config] DEBUG Found github.token
2025-03-21 09:13:23,918 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-03-21 09:13:23,918 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-21 09:13:23,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:23,929 [ 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-21 09:13:24,054 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-03-21 09:13:24,055 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-03-21 09:13:24,055 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-03-21 09:13:24,055 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-21 09:13:24,056 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-21 09:13:24,063 [ scc.git] DEBUG Calling 'git reset --hard 3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-21 09:13:24,071 [ scc.git] DEBUG HEAD is now at 3cd120c Merge pull request #89 from jburel/build
2025-03-21 09:13:24,152 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:24,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:13:24,353 [ scc.git] DEBUG Calling 'git merge-base 3cd120cf6f10f71421a4db91fa87baba865c7997 78e55539b68e351ed5ef202854718b49a37729a7'
2025-03-21 09:13:24,362 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..3cd120cf6f10f71421a4db91fa87baba865c7997'
2025-03-21 09:13:24,367 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#362](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/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-21 09:13:24,372 [ scc.config] DEBUG Found github.token
2025-03-21 09:13:24,372 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-03-21 09:13:24,372 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-21 09:13:24,411 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:24,411 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:24,417 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-21 09:13:24,454 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-21 09:13:24,460 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f425439d250> has no local changes
2025-03-21 09:13:24,461 [ 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#362 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/)'
2025-03-21 09:13:24,469 [ scc.git] DEBUG [detached HEAD f2fa697] merge master -Dorg -Ssuccess-only
2025-03-21 09:13:24,469 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:13:24,470 [ scc.repo] DEBUG ## PRs found:
2025-03-21 09:13:24,605 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:24,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-03-21 09:13:25,219 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:25,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-03-21 09:13:25,478 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-21 09:13:25,729 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:26,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-21 09:13:26,337 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:26,648 [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-21 09:13:26,900 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:27,267 [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-21 09:13:27,520 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:27,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-03-21 09:13:28,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:28,268 [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-21 09:13:28,269 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-21 09:13:28,521 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:28,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-03-21 09:13:28,755 [ scc.repo] DEBUG # ... Include label: dependencies
2025-03-21 09:13:29,006 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:29,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-21 09:13:29,585 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:29,844 [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-21 09:13:30,096 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:30,402 [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-21 09:13:30,655 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:30,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-03-21 09:13:31,239 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:31,412 [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-21 09:13:31,412 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-21 09:13:31,664 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:31,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-03-21 09:13:32,199 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:32,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-03-21 09:13:32,700 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:32,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-03-21 09:13:33,191 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:33,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-03-21 09:13:33,689 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:33,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-03-21 09:13:34,219 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:34,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-03-21 09:13:34,737 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:35,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-03-21 09:13:35,129 [ scc.repo] DEBUG ## Branches found:
2025-03-21 09:13:35,129 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-21 09:13:35,129 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:35,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:35,135 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-21 09:13:35,140 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-21 09:13:35,140 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-21 09:13:35,145 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-21 09:13:35,151 [ scc.git] DEBUG Already up to date.
2025-03-21 09:13:35,151 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-03-21 09:13:35,489 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-21 09:13:35,489 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-03-21 09:13:35,493 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-03-21 09:13:35,800 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-03-21 09:13:35,801 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-03-21 09:13:35,805 [ scc.git] DEBUG ## Unique users: []
2025-03-21 09:13:35,805 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:35,805 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:35,811 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-03-21 09:13:35,872 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:35,878 [ 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-21 09:13:36,031 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-21 09:13:36,034 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-03-21 09:13:36,034 [ scc.git] DEBUG package.json | 2 +-
2025-03-21 09:13:36,035 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-03-21 09:13:36,037 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:36,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:13:36,197 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-03-21 09:13:36,265 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:36,270 [ 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-21 09:13:36,327 [ scc.git] DEBUG Auto-merging package-lock.json
2025-03-21 09:13:36,327 [ scc.git] DEBUG Auto-merging package.json
2025-03-21 09:13:36,327 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-21 09:13:36,330 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-03-21 09:13:36,330 [ scc.git] DEBUG package.json | 2 +-
2025-03-21 09:13:36,330 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-03-21 09:13:36,449 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:36,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:13:36,611 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-21 09:13:36,651 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:36,651 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:36,656 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-21 09:13:36,695 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-21 09:13:36,702 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f42553fff10> has no local changes
2025-03-21 09:13:36,702 [ 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#362 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/)'
2025-03-21 09:13:36,710 [ scc.git] DEBUG [detached HEAD db4318c] merge master -Dorg -Ssuccess-only
2025-03-21 09:13:36,710 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:13:36,710 [ scc.repo] DEBUG ## PRs found:
2025-03-21 09:13:36,863 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:37,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-03-21 09:13:37,056 [ scc.repo] DEBUG ## Branches found:
2025-03-21 09:13:37,056 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-21 09:13:37,056 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:37,056 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:37,062 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-21 09:13:37,067 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-21 09:13:37,067 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-21 09:13:37,072 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-21 09:13:37,077 [ scc.git] DEBUG Already up to date.
2025-03-21 09:13:37,077 [ scc.git] DEBUG ## Unique users: []
2025-03-21 09:13:37,077 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:37,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:37,082 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-21 09:13:37,120 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:37,120 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:37,125 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-21 09:13:37,164 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-21 09:13:37,171 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f42554078e0> has no local changes
2025-03-21 09:13:37,171 [ 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#362 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/)'
2025-03-21 09:13:37,180 [ scc.git] DEBUG [detached HEAD 0102d86] merge master -Dorg -Ssuccess-only
2025-03-21 09:13:37,180 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:13:37,180 [ scc.repo] DEBUG ## PRs found:
2025-03-21 09:13:37,308 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:37,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-03-21 09:13:37,833 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:38,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-03-21 09:13:38,340 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:38,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-03-21 09:13:38,824 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:39,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-03-21 09:13:39,059 [ scc.repo] DEBUG ## Branches found:
2025-03-21 09:13:39,060 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-21 09:13:39,060 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:39,060 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:39,065 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-21 09:13:39,070 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-21 09:13:39,070 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-21 09:13:39,076 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-21 09:13:39,081 [ scc.git] DEBUG Already up to date.
2025-03-21 09:13:39,081 [ scc.git] DEBUG ## Unique users: []
2025-03-21 09:13:39,081 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:39,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:39,085 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-21 09:13:39,124 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:39,124 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:39,129 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-21 09:13:39,167 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-21 09:13:39,173 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4254398280> has no local changes
2025-03-21 09:13:39,173 [ 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#362 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/)'
2025-03-21 09:13:39,181 [ scc.git] DEBUG [detached HEAD 089fda1] merge master -Dorg -Ssuccess-only
2025-03-21 09:13:39,181 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:13:39,182 [ scc.repo] DEBUG ## PRs found:
2025-03-21 09:13:39,311 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:39,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-03-21 09:13:39,950 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:40,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-03-21 09:13:40,446 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:40,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-03-21 09:13:40,931 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:41,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-21 09:13:41,506 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:41,736 [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-21 09:13:41,989 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:42,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-03-21 09:13:42,474 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:42,658 [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-21 09:13:42,659 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-21 09:13:42,659 [ scc.repo] DEBUG ## Branches found:
2025-03-21 09:13:42,659 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-21 09:13:42,660 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:42,660 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:42,666 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-21 09:13:42,670 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-21 09:13:42,670 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-21 09:13:42,675 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-21 09:13:42,681 [ scc.git] DEBUG Already up to date.
2025-03-21 09:13:42,681 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-03-21 09:13:43,144 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-03-21 09:13:43,145 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-03-21 09:13:43,149 [ scc.git] DEBUG ## Unique users: []
2025-03-21 09:13:43,149 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:43,150 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:43,155 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-21 09:13:43,160 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:43,165 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-21 09:13:43,345 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-03-21 09:13:43,346 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-03-21 09:13:43,346 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-03-21 09:13:43,346 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-03-21 09:13:43,346 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-03-21 09:13:43,346 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-03-21 09:13:43,346 [ scc.git] DEBUG Auto-merging setup.py
2025-03-21 09:13:43,346 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-03-21 09:13:43,346 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-21 09:13:43,346 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-21 09:13:43,352 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-21 09:13:43,358 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-03-21 09:13:43,361 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:43,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:13:43,520 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-03-21 09:13:43,526 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-03-21 09:13:43,532 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#362](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
- omero_signup/urls.py
--conflicts
2025-03-21 09:13:43,536 [ scc.config] DEBUG Found github.token
2025-03-21 09:13:43,537 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-03-21 09:13:43,537 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-21 09:13:43,576 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:43,577 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:43,582 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-21 09:13:43,621 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-21 09:13:43,628 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f42543b7ca0> has no local changes
2025-03-21 09:13:43,628 [ 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#362 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/)'
2025-03-21 09:13:43,636 [ scc.git] DEBUG [detached HEAD e4b585d] merge master -Dorg -Ssuccess-only
2025-03-21 09:13:43,636 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:13:43,636 [ scc.repo] DEBUG ## PRs found:
2025-03-21 09:13:43,772 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:44,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-03-21 09:13:44,340 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:44,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-03-21 09:13:44,844 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:45,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-03-21 09:13:45,394 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:45,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-03-21 09:13:45,938 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:46,178 [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-21 09:13:46,431 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:46,647 [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-21 09:13:46,900 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:47,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-03-21 09:13:47,437 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:47,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-03-21 09:13:47,911 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:48,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-03-21 09:13:48,394 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:48,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-03-21 09:13:48,863 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:49,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-21 09:13:49,400 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:49,610 [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-21 09:13:49,862 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:50,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-03-21 09:13:50,384 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:50,561 [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-21 09:13:50,561 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-21 09:13:50,562 [ scc.repo] DEBUG ## Branches found:
2025-03-21 09:13:50,562 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-21 09:13:50,562 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:50,562 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:50,568 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-21 09:13:50,572 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-21 09:13:50,572 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-21 09:13:50,578 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-21 09:13:50,583 [ scc.git] DEBUG Already up to date.
2025-03-21 09:13:50,583 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-03-21 09:13:50,953 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-03-21 09:13:50,953 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-03-21 09:13:50,958 [ scc.git] DEBUG ## Unique users: []
2025-03-21 09:13:50,958 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:50,959 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:50,964 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-03-21 09:13:50,970 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:50,975 [ 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-21 09:13:50,987 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-21 09:13:50,990 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-03-21 09:13:50,990 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-03-21 09:13:50,990 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-03-21 09:13:50,990 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-03-21 09:13:50,990 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-03-21 09:13:50,990 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-03-21 09:13:50,990 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-03-21 09:13:50,990 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-03-21 09:13:50,990 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-03-21 09:13:50,991 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-03-21 09:13:50,991 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-03-21 09:13:50,991 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-03-21 09:13:50,993 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:50,993 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-03-21 09:13:50,993 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-03-21 09:13:50,993 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-03-21 09:13:50,993 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-03-21 09:13:50,993 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-03-21 09:13:50,993 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-03-21 09:13:50,993 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-03-21 09:13:50,993 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-03-21 09:13:50,993 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-03-21 09:13:50,993 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-03-21 09:13:50,993 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-03-21 09:13:50,993 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-03-21 09:13:50,993 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-03-21 09:13:50,993 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-03-21 09:13:50,993 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-03-21 09:13:50,994 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-03-21 09:13:50,994 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-03-21 09:13:50,994 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-03-21 09:13:50,994 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-03-21 09:13:50,994 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-03-21 09:13:50,994 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-03-21 09:13:50,994 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-03-21 09:13:50,994 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-03-21 09:13:50,994 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-03-21 09:13:50,994 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-03-21 09:13:50,994 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-03-21 09:13:50,994 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-03-21 09:13:50,994 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-03-21 09:13:50,994 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-03-21 09:13:50,994 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-03-21 09:13:50,994 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-03-21 09:13:50,994 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-03-21 09:13:50,994 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-03-21 09:13:51,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:13:51,164 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-21 09:13:51,204 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:51,204 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:51,209 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-21 09:13:51,248 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-21 09:13:51,255 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f42543a6ac0> has no local changes
2025-03-21 09:13:51,255 [ 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#362 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/)'
2025-03-21 09:13:51,263 [ scc.git] DEBUG [detached HEAD 77613b3] merge master -Dorg -Ssuccess-only
2025-03-21 09:13:51,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:13:51,264 [ scc.repo] DEBUG ## PRs found:
2025-03-21 09:13:51,416 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:51,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-03-21 09:13:51,636 [ scc.repo] DEBUG ## Branches found:
2025-03-21 09:13:51,636 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-21 09:13:51,636 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:51,636 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:51,642 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-21 09:13:51,647 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-21 09:13:51,647 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-21 09:13:51,652 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-21 09:13:51,657 [ scc.git] DEBUG Already up to date.
2025-03-21 09:13:51,657 [ scc.git] DEBUG ## Unique users: []
2025-03-21 09:13:51,657 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:51,657 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:51,662 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-21 09:13:51,700 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:51,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:51,706 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-21 09:13:51,744 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-21 09:13:51,750 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4254395160> has no local changes
2025-03-21 09:13:51,750 [ 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#362 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/)'
2025-03-21 09:13:51,758 [ scc.git] DEBUG [detached HEAD fe266f1] merge master -Dorg -Ssuccess-only
2025-03-21 09:13:51,758 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:13:51,759 [ scc.repo] DEBUG ## PRs found:
2025-03-21 09:13:51,888 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:52,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-03-21 09:13:52,438 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:52,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-03-21 09:13:52,928 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:53,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-03-21 09:13:53,393 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:53,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-21 09:13:53,976 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:54,245 [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-21 09:13:54,498 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:54,741 [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-21 09:13:54,994 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:55,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-03-21 09:13:55,450 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:55,637 [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-21 09:13:55,638 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-03-21 09:13:55,638 [ scc.repo] DEBUG ## Branches found:
2025-03-21 09:13:55,638 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-21 09:13:55,638 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:55,638 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:55,644 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-21 09:13:55,649 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-21 09:13:55,649 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-21 09:13:55,654 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-21 09:13:55,660 [ scc.git] DEBUG Already up to date.
2025-03-21 09:13:55,660 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-03-21 09:13:56,349 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-03-21 09:13:56,350 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-03-21 09:13:56,354 [ scc.git] DEBUG ## Unique users: []
2025-03-21 09:13:56,354 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:56,354 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:56,360 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-03-21 09:13:56,366 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:56,370 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-03-21 09:13:56,379 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-21 09:13:56,382 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-03-21 09:13:56,382 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-03-21 09:13:56,382 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-03-21 09:13:56,382 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-03-21 09:13:56,382 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-03-21 09:13:56,384 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:56,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:13:56,556 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-21 09:13:56,597 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:13:56,597 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:13:56,603 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-21 09:13:56,642 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-21 09:13:56,649 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f42543a6fa0> has no local changes
2025-03-21 09:13:56,649 [ 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#362 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/)'
2025-03-21 09:13:56,657 [ scc.git] DEBUG [detached HEAD 28e7992] merge master -Dorg -Ssuccess-only
2025-03-21 09:13:56,657 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:13:56,657 [ scc.git] INFO Overriding base-branch from master to main
2025-03-21 09:13:56,657 [ scc.repo] DEBUG ## PRs found:
2025-03-21 09:13:56,808 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:57,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-03-21 09:13:57,356 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:57,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-03-21 09:13:57,906 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:58,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-03-21 09:13:58,401 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:58,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-03-21 09:13:58,954 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:59,249 [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-21 09:13:59,501 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:13:59,775 [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-21 09:14:00,028 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:00,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-03-21 09:14:00,555 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:00,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-03-21 09:14:01,035 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:01,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-03-21 09:14:01,516 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:01,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-21 09:14:02,062 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:02,304 [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-21 09:14:02,557 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:02,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-03-21 09:14:03,007 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:03,207 [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-21 09:14:03,208 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-21 09:14:03,208 [ scc.repo] DEBUG ## Branches found:
2025-03-21 09:14:03,208 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-21 09:14:03,208 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:14:03,208 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:14:03,215 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-03-21 09:14:03,220 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-21 09:14:03,221 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-03-21 09:14:03,227 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-03-21 09:14:03,233 [ scc.git] DEBUG Already up to date.
2025-03-21 09:14:03,233 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-03-21 09:14:03,783 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-03-21 09:14:03,784 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-03-21 09:14:03,788 [ scc.git] DEBUG ## Unique users: []
2025-03-21 09:14:03,788 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:14:03,789 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:14:03,795 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-21 09:14:03,801 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:14:03,806 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-21 09:14:03,990 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-03-21 09:14:03,990 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-03-21 09:14:03,990 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-21 09:14:03,990 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-21 09:14:03,997 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-21 09:14:04,003 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-03-21 09:14:04,005 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:04,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:04,171 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-03-21 09:14:04,178 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-03-21 09:14:04,184 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#362](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-03-21 09:14:04,189 [ scc.config] DEBUG Found github.token
2025-03-21 09:14:04,189 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-03-21 09:14:04,189 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-21 09:14:04,227 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:14:04,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:14:04,233 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-21 09:14:04,271 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-21 09:14:04,277 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4254376310> has no local changes
2025-03-21 09:14:04,278 [ 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#362 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/)'
2025-03-21 09:14:04,285 [ scc.git] DEBUG [detached HEAD fc8c254] merge master -Dorg -Ssuccess-only
2025-03-21 09:14:04,286 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:04,286 [ scc.repo] DEBUG ## PRs found:
2025-03-21 09:14:04,423 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:04,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-03-21 09:14:04,633 [ scc.repo] DEBUG ## Branches found:
2025-03-21 09:14:04,633 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-21 09:14:04,634 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:14:04,634 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:14:04,639 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-21 09:14:04,644 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-21 09:14:04,644 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-21 09:14:04,649 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-21 09:14:04,655 [ scc.git] DEBUG Already up to date.
2025-03-21 09:14:04,655 [ scc.git] DEBUG ## Unique users: []
2025-03-21 09:14:04,655 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:14:04,655 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:14:04,660 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-21 09:14:04,699 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:14:04,700 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:14:04,705 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-21 09:14:04,743 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-21 09:14:04,749 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f42542945b0> has no local changes
2025-03-21 09:14:04,749 [ 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#362 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/)'
2025-03-21 09:14:04,757 [ scc.git] DEBUG [detached HEAD 3c78ddc] merge master -Dorg -Ssuccess-only
2025-03-21 09:14:04,758 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:04,758 [ scc.repo] DEBUG ## PRs found:
2025-03-21 09:14:04,885 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:05,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-03-21 09:14:05,095 [ scc.repo] DEBUG ## Branches found:
2025-03-21 09:14:05,095 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-21 09:14:05,095 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:14:05,095 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:14:05,101 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-21 09:14:05,105 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-21 09:14:05,105 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-21 09:14:05,110 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-21 09:14:05,116 [ scc.git] DEBUG Already up to date.
2025-03-21 09:14:05,116 [ scc.git] DEBUG ## Unique users: []
2025-03-21 09:14:05,116 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:14:05,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:14:05,120 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-21 09:14:05,159 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:14:05,159 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:14:05,164 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-21 09:14:05,204 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-21 09:14:05,211 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4254376100> has no local changes
2025-03-21 09:14:05,211 [ 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#362 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/)'
2025-03-21 09:14:05,220 [ scc.git] DEBUG [detached HEAD 536f20e] merge master -Dorg -Ssuccess-only
2025-03-21 09:14:05,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:05,221 [ scc.repo] DEBUG ## PRs found:
2025-03-21 09:14:05,347 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:05,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-03-21 09:14:05,923 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:06,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-03-21 09:14:06,425 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:06,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-03-21 09:14:06,888 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:07,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-21 09:14:07,413 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:07,661 [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-21 09:14:07,913 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:08,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-03-21 09:14:08,440 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:08,617 [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-21 09:14:08,618 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-03-21 09:14:08,618 [ scc.repo] DEBUG ## Branches found:
2025-03-21 09:14:08,618 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-21 09:14:08,618 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:14:08,618 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:14:08,624 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-03-21 09:14:08,629 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-21 09:14:08,629 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-03-21 09:14:08,634 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-03-21 09:14:08,639 [ scc.git] DEBUG Already up to date.
2025-03-21 09:14:08,639 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-03-21 09:14:09,027 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-03-21 09:14:09,027 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-03-21 09:14:09,032 [ scc.git] DEBUG ## Unique users: []
2025-03-21 09:14:09,032 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:14:09,032 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:14:09,037 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-21 09:14:09,043 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:14:09,048 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-21 09:14:09,168 [ scc.git] DEBUG Auto-merging Dockerfile
2025-03-21 09:14:09,168 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-03-21 09:14:09,168 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-21 09:14:09,169 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-21 09:14:09,175 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-21 09:14:09,181 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-03-21 09:14:09,184 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:09,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:09,360 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-03-21 09:14:09,366 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-03-21 09:14:09,371 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#362](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-03-21 09:14:09,376 [ scc.config] DEBUG Found github.token
2025-03-21 09:14:09,376 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-03-21 09:14:09,376 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-21 09:14:09,415 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:14:09,415 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:14:09,421 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-21 09:14:09,459 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-21 09:14:09,466 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4254294610> has no local changes
2025-03-21 09:14:09,466 [ 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#362 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/)'
2025-03-21 09:14:09,474 [ scc.git] DEBUG [detached HEAD a9343cb] merge master -Dorg -Ssuccess-only
2025-03-21 09:14:09,475 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:09,475 [ scc.git] INFO Overriding base-branch from master to develop
2025-03-21 09:14:09,475 [ scc.repo] DEBUG ## PRs found:
2025-03-21 09:14:09,612 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:09,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-03-21 09:14:10,209 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:10,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-03-21 09:14:10,687 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:10,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-03-21 09:14:11,194 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:11,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-21 09:14:11,648 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:11,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-03-21 09:14:12,162 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:12,387 [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-21 09:14:12,640 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:12,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-03-21 09:14:13,125 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:13,317 [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-21 09:14:13,318 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-21 09:14:13,569 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:13,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-03-21 09:14:14,067 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:14,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-03-21 09:14:14,544 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:14,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-21 09:14:14,996 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:15,203 [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-21 09:14:15,455 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:15,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-03-21 09:14:15,992 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:16,181 [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-21 09:14:16,182 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-21 09:14:16,434 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:16,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-03-21 09:14:16,914 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:17,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-03-21 09:14:17,520 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:17,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-03-21 09:14:18,058 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:18,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-03-21 09:14:18,397 [ scc.repo] DEBUG ## Branches found:
2025-03-21 09:14:18,397 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-21 09:14:18,397 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:14:18,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:14:18,404 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-03-21 09:14:18,410 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-03-21 09:14:18,410 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-03-21 09:14:18,416 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-03-21 09:14:18,427 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-03-21 09:14:18,648 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:19,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-03-21 09:14:19,011 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-03-21 09:14:19,441 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-21 09:14:19,441 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-03-21 09:14:19,446 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-03-21 09:14:20,033 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-03-21 09:14:20,033 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-03-21 09:14:20,038 [ scc.git] DEBUG ## Unique users: []
2025-03-21 09:14:20,038 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:14:20,038 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:14:20,044 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-21 09:14:20,051 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:14:20,056 [ 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-21 09:14:20,131 [ 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-21 09:14:20,131 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-03-21 09:14:20,132 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-03-21 09:14:20,138 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-03-21 09:14:20,144 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-03-21 09:14:20,146 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:20,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:20,323 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-03-21 09:14:20,332 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-03-21 09:14:20,338 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#362](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-03-21 09:14:20,343 [ scc.config] DEBUG Found github.token
2025-03-21 09:14:20,343 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-03-21 09:14:20,343 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-03-21 09:14:20,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:14:20,354 [ 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-21 09:14:20,365 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-03-21 09:14:20,367 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-03-21 09:14:20,368 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-03-21 09:14:20,575 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:20,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:20,828 [ scc.git] DEBUG Calling 'git submodule update'
2025-03-21 09:14:20,869 [ scc.git] DEBUG Get sha1 of %s
2025-03-21 09:14:20,870 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-03-21 09:14:20,876 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-21 09:14:20,915 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-21 09:14:20,922 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f425431e580> has no local changes
2025-03-21 09:14:20,922 [ 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#362 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/)'
2025-03-21 09:14:20,930 [ scc.git] DEBUG [detached HEAD 5c86c75] merge master -Dorg -Ssuccess-only
2025-03-21 09:14:20,930 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:20,930 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-03-21 09:14:21,005 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-03-21 09:14:21,080 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:21,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:21,256 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-03-21 09:14:21,261 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-03-21 09:14:21,498 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:21,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:21,673 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-03-21 09:14:21,678 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-03-21 09:14:21,914 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:22,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:22,097 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-03-21 09:14:22,102 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-03-21 09:14:22,338 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:22,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:22,509 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-03-21 09:14:22,747 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:22,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:22,928 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-03-21 09:14:22,933 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-03-21 09:14:23,168 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:23,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:23,352 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-03-21 09:14:23,356 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-03-21 09:14:23,592 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:23,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:23,804 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-03-21 09:14:23,808 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-03-21 09:14:24,046 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:24,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:24,224 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-03-21 09:14:24,229 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-03-21 09:14:24,466 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:24,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:24,638 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-03-21 09:14:24,643 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-03-21 09:14:24,880 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:25,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:25,074 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-03-21 09:14:25,079 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-03-21 09:14:25,314 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:25,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:25,519 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-03-21 09:14:25,524 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-03-21 09:14:25,762 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:25,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:25,939 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-03-21 09:14:25,943 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-03-21 09:14:26,181 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:26,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:26,361 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-03-21 09:14:26,597 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:26,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:26,779 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-03-21 09:14:27,015 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:27,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:27,189 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-03-21 09:14:27,194 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-03-21 09:14:27,430 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:27,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:27,625 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-03-21 09:14:27,863 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:28,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:28,049 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-03-21 09:14:28,285 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:28,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:28,485 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-03-21 09:14:28,490 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-03-21 09:14:28,726 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:28,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:28,905 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-03-21 09:14:28,909 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-03-21 09:14:29,147 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:29,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:29,326 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-03-21 09:14:29,331 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-03-21 09:14:29,567 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:29,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:29,749 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-03-21 09:14:29,753 [ scc.config] DEBUG Found submodule.scripts.url
2025-03-21 09:14:29,989 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-03-21 09:14:30,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-03-21 09:14:30,171 [ scc.config] DEBUG Found submodule.scripts.branch
2025-03-21 09:14:30,172 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-03-21 09:14:30,252 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f42599a8f10> has local changes
2025-03-21 09:14:30,252 [ 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#362 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/362/)'
2025-03-21 09:14:30,266 [ scc.git] DEBUG [detached HEAD bc6b550] merge master -Dorg -Ssuccess-only
2025-03-21 09:14:30,266 [ scc.merge] INFO Repository: ome/omero-plugins
2025-03-21 09:14:30,267 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-03-21 09:14:30,267 [ scc.merge] INFO Already up to date.
2025-03-21 09:14:30,267 [ scc.merge] INFO
2025-03-21 09:14:30,267 [ scc.merge] INFO Merged PRs:
2025-03-21 09:14:30,267 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-03-21 09:14:30,267 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-03-21 09:14:30,267 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-03-21 09:14:30,267 [ scc.merge] INFO
2025-03-21 09:14:30,267 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-03-21 09:14:30,267 [ scc.merge] INFO Already up to date.
2025-03-21 09:14:30,267 [ scc.merge] INFO
2025-03-21 09:14:30,267 [ scc.merge] INFO
2025-03-21 09:14:30,267 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-03-21 09:14:30,267 [ scc.merge] INFO Excluded PRs:
2025-03-21 09:14:30,267 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-03-21 09:14:30,267 [ scc.merge] INFO Already up to date.
2025-03-21 09:14:30,267 [ scc.merge] INFO
2025-03-21 09:14:30,267 [ scc.merge] INFO
2025-03-21 09:14:30,267 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-03-21 09:14:30,267 [ scc.merge] INFO Excluded PRs:
2025-03-21 09:14:30,267 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-03-21 09:14:30,267 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-03-21 09:14:30,267 [ scc.merge] INFO Already up to date.
2025-03-21 09:14:30,267 [ scc.merge] INFO
2025-03-21 09:14:30,267 [ scc.merge] INFO Merged PRs:
2025-03-21 09:14:30,267 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-03-21 09:14:30,267 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-03-21 09:14:30,267 [ scc.merge] INFO
2025-03-21 09:14:30,267 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-03-21 09:14:30,267 [ scc.merge] INFO Excluded PRs:
2025-03-21 09:14:30,267 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-03-21 09:14:30,268 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-21 09:14:30,268 [ scc.merge] INFO Already up to date.
2025-03-21 09:14:30,268 [ scc.merge] INFO
2025-03-21 09:14:30,268 [ scc.merge] INFO Merged PRs:
2025-03-21 09:14:30,268 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-03-21 09:14:30,268 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-03-21 09:14:30,268 [ scc.merge] INFO
2025-03-21 09:14:30,268 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-21 09:14:30,268 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2025-03-21 09:14:30,268 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2025-03-21 09:14:30,268 [ scc.merge] INFO
2025-03-21 09:14:30,268 [ scc.merge] INFO Repository: ome/omero-figure
2025-03-21 09:14:30,268 [ scc.merge] INFO Excluded PRs:
2025-03-21 09:14:30,268 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-03-21 09:14:30,268 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois' (stage: draft)
2025-03-21 09:14:30,268 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-03-21 09:14:30,268 [ scc.merge] INFO Already up to date.
2025-03-21 09:14:30,268 [ scc.merge] INFO
2025-03-21 09:14:30,268 [ scc.merge] INFO Merged PRs:
2025-03-21 09:14:30,268 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-03-21 09:14:30,268 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-03-21 09:14:30,268 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-03-21 09:14:30,268 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-03-21 09:14:30,268 [ scc.merge] INFO
2025-03-21 09:14:30,268 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-21 09:14:30,268 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-03-21 09:14:30,268 [ scc.merge] INFO
2025-03-21 09:14:30,268 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-03-21 09:14:30,268 [ scc.merge] INFO Already up to date.
2025-03-21 09:14:30,268 [ scc.merge] INFO
2025-03-21 09:14:30,268 [ scc.merge] INFO Merged PRs:
2025-03-21 09:14:30,268 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-03-21 09:14:30,268 [ scc.merge] INFO
2025-03-21 09:14:30,268 [ scc.merge] INFO Repository: ome/omero-gallery
2025-03-21 09:14:30,268 [ scc.merge] INFO Already up to date.
2025-03-21 09:14:30,268 [ scc.merge] INFO
2025-03-21 09:14:30,268 [ scc.merge] INFO Merged PRs:
2025-03-21 09:14:30,268 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-03-21 09:14:30,268 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-03-21 09:14:30,269 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-03-21 09:14:30,269 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-03-21 09:14:30,269 [ scc.merge] INFO
2025-03-21 09:14:30,269 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-21 09:14:30,269 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-03-21 09:14:30,269 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-03-21 09:14:30,269 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-03-21 09:14:30,269 [ scc.merge] INFO
2025-03-21 09:14:30,269 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-03-21 09:14:30,269 [ scc.merge] INFO Excluded PRs:
2025-03-21 09:14:30,269 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-03-21 09:14:30,269 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-03-21 09:14:30,269 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-03-21 09:14:30,269 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-03-21 09:14:30,269 [ scc.merge] INFO Already up to date.
2025-03-21 09:14:30,269 [ scc.merge] INFO
2025-03-21 09:14:30,269 [ scc.merge] INFO Merged PRs:
2025-03-21 09:14:30,269 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-03-21 09:14:30,269 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-03-21 09:14:30,269 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-03-21 09:14:30,269 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-03-21 09:14:30,269 [ scc.merge] INFO
2025-03-21 09:14:30,269 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-21 09:14:30,269 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-03-21 09:14:30,269 [ scc.merge] INFO
2025-03-21 09:14:30,269 [ scc.merge] INFO Repository: ome/omero-mapr
2025-03-21 09:14:30,269 [ scc.merge] INFO Excluded PRs:
2025-03-21 09:14:30,269 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-03-21 09:14:30,269 [ scc.merge] INFO Already up to date.
2025-03-21 09:14:30,269 [ scc.merge] INFO
2025-03-21 09:14:30,269 [ scc.merge] INFO Merged PRs:
2025-03-21 09:14:30,269 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-03-21 09:14:30,269 [ scc.merge] INFO
2025-03-21 09:14:30,269 [ scc.merge] INFO Repository: ome/omero-metadata
2025-03-21 09:14:30,269 [ scc.merge] INFO Already up to date.
2025-03-21 09:14:30,269 [ scc.merge] INFO
2025-03-21 09:14:30,269 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-21 09:14:30,269 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-03-21 09:14:30,269 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-03-21 09:14:30,270 [ scc.merge] INFO
2025-03-21 09:14:30,270 [ scc.merge] INFO Repository: ome/omero-parade
2025-03-21 09:14:30,270 [ scc.merge] INFO Excluded PRs:
2025-03-21 09:14:30,270 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-03-21 09:14:30,270 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-03-21 09:14:30,270 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-03-21 09:14:30,270 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-03-21 09:14:30,270 [ scc.merge] INFO Already up to date.
2025-03-21 09:14:30,270 [ scc.merge] INFO
2025-03-21 09:14:30,270 [ scc.merge] INFO Merged PRs:
2025-03-21 09:14:30,270 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-03-21 09:14:30,270 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-03-21 09:14:30,270 [ scc.merge] INFO
2025-03-21 09:14:30,270 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-03-21 09:14:30,270 [ scc.merge] INFO Already up to date.
2025-03-21 09:14:30,270 [ scc.merge] INFO
2025-03-21 09:14:30,270 [ scc.merge] INFO
2025-03-21 09:14:30,270 [ scc.merge] INFO Repository: ome/omero-rois
2025-03-21 09:14:30,270 [ scc.merge] INFO Excluded PRs:
2025-03-21 09:14:30,270 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-03-21 09:14:30,270 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-03-21 09:14:30,270 [ scc.merge] INFO Already up to date.
2025-03-21 09:14:30,270 [ scc.merge] INFO
2025-03-21 09:14:30,270 [ scc.merge] INFO
2025-03-21 09:14:30,270 [ scc.merge] INFO Repository: ome/omero-signup
2025-03-21 09:14:30,270 [ scc.merge] INFO Already up to date.
2025-03-21 09:14:30,270 [ scc.merge] INFO
2025-03-21 09:14:30,270 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-21 09:14:30,270 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-03-21 09:14:30,270 [ scc.merge] INFO
2025-03-21 09:14:30,270 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-03-21 09:14:30,270 [ scc.merge] INFO Excluded PRs:
2025-03-21 09:14:30,270 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-03-21 09:14:30,270 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-03-21 09:14:30,270 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-03-21 09:14:30,270 [ scc.merge] INFO Already up to date.
2025-03-21 09:14:30,270 [ scc.merge] INFO
2025-03-21 09:14:30,270 [ scc.merge] INFO Merged PRs:
2025-03-21 09:14:30,270 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-03-21 09:14:30,271 [ scc.merge] INFO
2025-03-21 09:14:30,271 [ scc.merge] INFO Repository: ome/omero-upload
2025-03-21 09:14:30,271 [ scc.merge] INFO Already up to date.
2025-03-21 09:14:30,271 [ scc.merge] INFO
2025-03-21 09:14:30,271 [ scc.merge] INFO
2025-03-21 09:14:30,271 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-03-21 09:14:30,271 [ scc.merge] INFO Already up to date.
2025-03-21 09:14:30,271 [ scc.merge] INFO
2025-03-21 09:14:30,271 [ scc.merge] INFO Merged PRs:
2025-03-21 09:14:30,271 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-03-21 09:14:30,271 [ scc.merge] INFO
2025-03-21 09:14:30,271 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-03-21 09:14:30,271 [ scc.merge] INFO Excluded PRs:
2025-03-21 09:14:30,271 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-03-21 09:14:30,271 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-03-21 09:14:30,271 [ scc.merge] INFO Already up to date.
2025-03-21 09:14:30,271 [ scc.merge] INFO
2025-03-21 09:14:30,271 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-21 09:14:30,271 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-03-21 09:14:30,271 [ scc.merge] INFO
2025-03-21 09:14:30,271 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-03-21 09:14:30,271 [ scc.merge] INFO Already up to date.
2025-03-21 09:14:30,271 [ scc.merge] INFO
2025-03-21 09:14:30,271 [ scc.merge] INFO
2025-03-21 09:14:30,271 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-03-21 09:14:30,271 [ scc.merge] INFO Already up to date.
2025-03-21 09:14:30,271 [ scc.merge] INFO
2025-03-21 09:14:30,271 [ scc.merge] INFO
2025-03-21 09:14:30,271 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-03-21 09:14:30,271 [ scc.merge] INFO Already up to date.
2025-03-21 09:14:30,271 [ scc.merge] INFO
2025-03-21 09:14:30,271 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-21 09:14:30,271 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-03-21 09:14:30,271 [ scc.merge] INFO
2025-03-21 09:14:30,271 [ scc.merge] INFO Repository: ome/scripts
2025-03-21 09:14:30,271 [ scc.merge] INFO Excluded PRs:
2025-03-21 09:14:30,271 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-03-21 09:14:30,271 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-03-21 09:14:30,271 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-03-21 09:14:30,271 [ scc.merge] INFO Previously merged:
2025-03-21 09:14:30,272 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-03-21 09:14:30,272 [ scc.merge] INFO
2025-03-21 09:14:30,272 [ scc.merge] INFO Merged PRs:
2025-03-21 09:14:30,272 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-03-21 09:14:30,272 [ scc.merge] INFO
2025-03-21 09:14:30,272 [ scc.merge] INFO Conflicting PRs (not included):
2025-03-21 09:14:30,272 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-03-21 09:14:30,272 [ scc.merge] INFO
2025-03-21 09:14:30,272 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-03-21 09:14:30,272 [ scc.git] DEBUG Calling 'git remote'
2025-03-21 09:14:30,277 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-03-21 09:14:30,277 [ scc.git] DEBUG Calling 'git remote'
2025-03-21 09:14:30,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:30,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-03-21 09:14:30,282 [ scc.git] DEBUG Calling 'git remote'
2025-03-21 09:14:30,287 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:30,287 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-03-21 09:14:30,287 [ scc.git] DEBUG Calling 'git remote'
2025-03-21 09:14:30,291 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:30,292 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-03-21 09:14:30,292 [ scc.git] DEBUG Calling 'git remote'
2025-03-21 09:14:30,296 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:30,296 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-03-21 09:14:30,296 [ scc.git] DEBUG Calling 'git remote'
2025-03-21 09:14:30,301 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:30,301 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-03-21 09:14:30,301 [ scc.git] DEBUG Calling 'git remote'
2025-03-21 09:14:30,306 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:30,306 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-03-21 09:14:30,306 [ scc.git] DEBUG Calling 'git remote'
2025-03-21 09:14:30,311 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:30,311 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-03-21 09:14:30,311 [ scc.git] DEBUG Calling 'git remote'
2025-03-21 09:14:30,316 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:30,316 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-03-21 09:14:30,316 [ scc.git] DEBUG Calling 'git remote'
2025-03-21 09:14:30,320 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:30,320 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-03-21 09:14:30,321 [ scc.git] DEBUG Calling 'git remote'
2025-03-21 09:14:30,325 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:30,325 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-03-21 09:14:30,325 [ scc.git] DEBUG Calling 'git remote'
2025-03-21 09:14:30,330 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:30,330 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-03-21 09:14:30,330 [ scc.git] DEBUG Calling 'git remote'
2025-03-21 09:14:30,335 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:30,335 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-03-21 09:14:30,335 [ scc.git] DEBUG Calling 'git remote'
2025-03-21 09:14:30,339 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:30,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-03-21 09:14:30,340 [ scc.git] DEBUG Calling 'git remote'
2025-03-21 09:14:30,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:30,344 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-03-21 09:14:30,344 [ scc.git] DEBUG Calling 'git remote'
2025-03-21 09:14:30,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:30,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-03-21 09:14:30,349 [ scc.git] DEBUG Calling 'git remote'
2025-03-21 09:14:30,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:30,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-03-21 09:14:30,354 [ scc.git] DEBUG Calling 'git remote'
2025-03-21 09:14:30,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:30,359 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-03-21 09:14:30,359 [ scc.git] DEBUG Calling 'git remote'
2025-03-21 09:14:30,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:30,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-03-21 09:14:30,363 [ scc.git] DEBUG Calling 'git remote'
2025-03-21 09:14:30,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:30,368 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-03-21 09:14:30,368 [ scc.git] DEBUG Calling 'git remote'
2025-03-21 09:14:30,373 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:30,373 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-03-21 09:14:30,373 [ scc.git] DEBUG Calling 'git remote'
2025-03-21 09:14:30,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-03-21 09:14:30,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-03-21 09:14:30,378 [ scc.git] DEBUG Calling 'git remote'
2025-03-21 09:14:30,382 [ 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 5f19745] 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 c755bd0] 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-21 09:15:18,211 [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-21 09:15:28,059 [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-21 09:15:30,564 [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-21 09:15:35,489 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-03-21 09:16:17,169 [ 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/3d58bc78/images/svgs/logo.svg){kind=logo}
