Console Output
Skipping 100 KB..
Full Logset --hard 2bbbe7a60c60f924aef8361ef56d1644542e4a19'
2024-09-07 00:43:05,072 [ scc.git] DEBUG HEAD is now at 2bbbe7a6 merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py)
2024-09-07 00:43:05,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:43:05,299 [ scc.git] DEBUG Calling 'git merge-base f9a321ddfb64f6b82c281aad0fbbcb134ce6eb53 46dbf915ab2295b6f74c772a4168d6b29d78dd37'
2024-09-07 00:43:05,311 [ scc.git] DEBUG Calling 'git diff --name-only 5f623996a1906632e0ff91ce399a733d139a59d7..f9a321ddfb64f6b82c281aad0fbbcb134ce6eb53'
2024-09-07 00:43:05,320 [ scc.git] INFO - PR 578 Rdornier 'Image outline'
Conflicting PR. Removed from build [OMERO-plugins-push#177](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/templates/rois_form.template.html
--conflicts
2024-09-07 00:43:05,325 [ scc.config] DEBUG Found github.token
2024-09-07 00:43:05,326 [ scc.git] DEBUG Adding comment to issue #578.
2024-09-07 00:43:06,510 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-figure/issues/578/comments HTTP/1.1" 201 1976
2024-09-07 00:43:06,511 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b47792851e0427c1d5fc7ba778783b8e09e21f47'
2024-09-07 00:43:06,521 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:06,527 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 583 (Add Hilo Checkbox for LUT Toggling in Channel Slider View) b47792851e0427c1d5fc7ba778783b8e09e21f47'
2024-09-07 00:43:06,611 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-09-07 00:43:06,611 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:43:06,616 [ scc.git] DEBUG src/js/models/panel_model.js | 10 +++++++++
2024-09-07 00:43:06,616 [ scc.git] DEBUG src/js/models/undo.js | 3 ++-
2024-09-07 00:43:06,616 [ scc.git] DEBUG src/js/views/channel_slider_view.js | 42 +++++++++++++++++++++++++++++++++---
2024-09-07 00:43:06,616 [ scc.git] DEBUG src/templates/checkbox_template.html | 4 ++++
2024-09-07 00:43:06,616 [ scc.git] DEBUG 4 files changed, 55 insertions(+), 4 deletions(-)
2024-09-07 00:43:06,616 [ scc.git] DEBUG create mode 100644 src/templates/checkbox_template.html
2024-09-07 00:43:06,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:43:06,900 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dfac0847f63cbc67445c85263c311e6b22e78c56'
2024-09-07 00:43:06,912 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:06,920 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 584 (Link url to image) dfac0847f63cbc67445c85263c311e6b22e78c56'
2024-09-07 00:43:06,992 [ scc.git] DEBUG Auto-merging src/js/models/figure_model.js
2024-09-07 00:43:06,992 [ scc.git] DEBUG Auto-merging src/js/views/figure_view.js
2024-09-07 00:43:06,992 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:43:06,997 [ scc.git] DEBUG .gitignore | 2 +
2024-09-07 00:43:06,997 [ scc.git] DEBUG omero_figure/views.py | 130 ++++++++++++++++++++++++++++++++++++------
2024-09-07 00:43:06,997 [ scc.git] DEBUG src/js/models/figure_model.js | 10 ++--
2024-09-07 00:43:06,997 [ scc.git] DEBUG src/js/views/figure_view.js | 10 ++--
2024-09-07 00:43:06,997 [ scc.git] DEBUG 4 files changed, 126 insertions(+), 26 deletions(-)
2024-09-07 00:43:07,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:43:07,295 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:43:07,340 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:43:07,341 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:07,348 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:43:07,394 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:43:07,405 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9c901a90> has no local changes
2024-09-07 00:43:07,406 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 5f623996..f9a321dd
Previously merged:
- PR 549 will-moore 'Inset feature'
Merged PRs:
- PR 555 will-moore 'Points in shape editor'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
- PR 584 Rdornier 'Link url to image'
Conflicting PRs (not included):
- PR 577 Rdornier 'Fill rois'
- PR 578 Rdornier 'Image outline'
Generated by OMERO-plugins-push#177 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/)'
2024-09-07 00:43:07,419 [ scc.git] DEBUG [detached HEAD 25d640d0] merge master -Dorg -Ssuccess-only
2024-09-07 00:43:07,420 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:43:07,420 [ scc.repo] DEBUG ## PRs found:
2024-09-07 00:43:07,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-09-07 00:43:08,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-09-07 00:43:08,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-09-07 00:43:09,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-09-07 00:43:09,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-07 00:43:10,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-09-07 00:43:10,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-09-07 00:43:10,537 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-09-07 00:43:10,537 [ scc.repo] DEBUG ## Branches found:
2024-09-07 00:43:10,537 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-09-07 00:43:10,538 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:43:10,538 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:10,545 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-07 00:43:10,550 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-07 00:43:10,551 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-07 00:43:10,556 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-07 00:43:10,562 [ scc.git] DEBUG Already up to date.
2024-09-07 00:43:10,562 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-09-07 00:43:10,913 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-09-07 00:43:10,913 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-09-07 00:43:10,918 [ scc.git] DEBUG ## Unique users: []
2024-09-07 00:43:10,918 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:43:10,918 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:10,924 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-09-07 00:43:10,931 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:10,937 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-09-07 00:43:10,973 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-09-07 00:43:10,973 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:43:10,976 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-09-07 00:43:10,976 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-09-07 00:43:11,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:43:11,112 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:43:11,153 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:43:11,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:11,159 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:43:11,199 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:43:11,206 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9e958ee0> has no local changes
2024-09-07 00:43:11,206 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Generated by OMERO-plugins-push#177 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/)'
2024-09-07 00:43:11,215 [ scc.git] DEBUG [detached HEAD b61fbf0] merge master -Dorg -Ssuccess-only
2024-09-07 00:43:11,215 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:43:11,215 [ scc.repo] DEBUG ## PRs found:
2024-09-07 00:43:11,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-09-07 00:43:12,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-09-07 00:43:12,018 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-07 00:43:12,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-09-07 00:43:13,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-07 00:43:13,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-07 00:43:14,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-09-07 00:43:14,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-09-07 00:43:14,451 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-09-07 00:43:14,451 [ scc.repo] DEBUG ## Branches found:
2024-09-07 00:43:14,451 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-09-07 00:43:14,451 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:43:14,451 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:14,458 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-07 00:43:14,463 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-07 00:43:14,464 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-07 00:43:14,470 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-07 00:43:14,476 [ scc.git] DEBUG Already up to date.
2024-09-07 00:43:14,476 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-09-07 00:43:14,776 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-09-07 00:43:14,776 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-09-07 00:43:14,780 [ scc.git] DEBUG ## Unique users: []
2024-09-07 00:43:14,780 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:43:14,780 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:14,786 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-09-07 00:43:14,793 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:14,798 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 111 (Bump semver from 5.7.0 to 5.7.2) 37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-09-07 00:43:14,810 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:43:14,814 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-09-07 00:43:14,814 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-09-07 00:43:14,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:43:14,947 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:43:14,987 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:43:14,987 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:14,992 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:43:15,031 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:43:15,038 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9c901bb0> has no local changes
2024-09-07 00:43:15,038 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Generated by OMERO-plugins-push#177 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/)'
2024-09-07 00:43:15,045 [ scc.git] DEBUG [detached HEAD d8e2c4d] merge master -Dorg -Ssuccess-only
2024-09-07 00:43:15,046 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:43:15,046 [ scc.repo] DEBUG ## PRs found:
2024-09-07 00:43:15,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-09-07 00:43:16,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/483 HTTP/1.1" 200 None
2024-09-07 00:43:16,013 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-07 00:43:16,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-09-07 00:43:17,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-07 00:43:17,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-07 00:43:18,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/384771c9fd794e2b472a35dca65e6ed96be98c4d HTTP/1.1" 200 None
2024-09-07 00:43:18,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/384771c9fd794e2b472a35dca65e6ed96be98c4d?per_page=1 HTTP/1.1" 200 2
2024-09-07 00:43:18,569 [ scc.repo] DEBUG - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-09-07 00:43:19,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482 HTTP/1.1" 200 None
2024-09-07 00:43:19,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/482/comments HTTP/1.1" 200 None
2024-09-07 00:43:19,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-09-07 00:43:20,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-07 00:43:20,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-07 00:43:21,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b HTTP/1.1" 200 None
2024-09-07 00:43:21,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b?per_page=1 HTTP/1.1" 200 2
2024-09-07 00:43:21,906 [ scc.repo] DEBUG - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-09-07 00:43:22,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/481 HTTP/1.1" 200 None
2024-09-07 00:43:22,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/478 HTTP/1.1" 200 None
2024-09-07 00:43:22,847 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-07 00:43:23,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-09-07 00:43:23,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-07 00:43:24,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-07 00:43:24,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/91cd18bb57d92337a1fb0c60a10824e5d057ee11 HTTP/1.1" 200 None
2024-09-07 00:43:25,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/91cd18bb57d92337a1fb0c60a10824e5d057ee11?per_page=1 HTTP/1.1" 200 2
2024-09-07 00:43:25,414 [ scc.repo] DEBUG - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-09-07 00:43:25,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/477 HTTP/1.1" 200 None
2024-09-07 00:43:25,863 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-07 00:43:26,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-09-07 00:43:26,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-07 00:43:27,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-07 00:43:27,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5 HTTP/1.1" 200 None
2024-09-07 00:43:28,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/274749c0dfc8162eaf89cdb16a9ef23195d5d5b5?per_page=1 HTTP/1.1" 200 2
2024-09-07 00:43:28,302 [ scc.repo] DEBUG - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-09-07 00:43:28,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-09-07 00:43:29,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-09-07 00:43:29,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-09-07 00:43:30,119 [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
2024-09-07 00:43:30,560 [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
2024-09-07 00:43:31,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-09-07 00:43:31,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-09-07 00:43:31,486 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-09-07 00:43:31,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-09-07 00:43:32,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-09-07 00:43:32,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-09-07 00:43:33,325 [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
2024-09-07 00:43:33,758 [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
2024-09-07 00:43:34,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-09-07 00:43:34,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-09-07 00:43:34,575 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-09-07 00:43:35,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-09-07 00:43:35,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-09-07 00:43:35,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-09-07 00:43:36,446 [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
2024-09-07 00:43:36,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-09-07 00:43:37,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-09-07 00:43:37,355 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-09-07 00:43:37,355 [ scc.repo] DEBUG ## Branches found:
2024-09-07 00:43:37,355 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-09-07 00:43:37,355 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:43:37,355 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:37,365 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-07 00:43:37,375 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-07 00:43:37,375 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-07 00:43:37,403 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-07 00:43:37,411 [ scc.git] DEBUG Already up to date.
2024-09-07 00:43:37,411 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-09-07 00:43:37,951 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-07 00:43:37,951 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-09-07 00:43:37,957 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-09-07 00:43:38,871 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-07 00:43:38,871 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-09-07 00:43:38,877 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-09-07 00:43:39,211 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-07 00:43:39,211 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-09-07 00:43:39,216 [ scc.git] DEBUG Calling 'git fetch origin pull/477/head'
2024-09-07 00:43:39,499 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-07 00:43:39,499 [ scc.git] DEBUG * branch refs/pull/477/head -> FETCH_HEAD
2024-09-07 00:43:39,504 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2024-09-07 00:43:39,787 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-07 00:43:39,787 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2024-09-07 00:43:39,792 [ scc.git] DEBUG Calling 'git fetch origin pull/482/head'
2024-09-07 00:43:40,178 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-07 00:43:40,179 [ scc.git] DEBUG * branch refs/pull/482/head -> FETCH_HEAD
2024-09-07 00:43:40,183 [ scc.git] DEBUG Calling 'git fetch origin pull/483/head'
2024-09-07 00:43:40,458 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-09-07 00:43:40,459 [ scc.git] DEBUG * branch refs/pull/483/head -> FETCH_HEAD
2024-09-07 00:43:40,463 [ scc.git] DEBUG ## Unique users: []
2024-09-07 00:43:40,463 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:43:40,463 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:40,468 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-09-07 00:43:40,474 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:40,478 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-09-07 00:43:40,509 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-09-07 00:43:40,510 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:43:40,513 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-09-07 00:43:40,513 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-09-07 00:43:40,513 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-09-07 00:43:40,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:43:40,642 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-09-07 00:43:40,649 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:40,654 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-09-07 00:43:40,808 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-09-07 00:43:40,809 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-09-07 00:43:40,809 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-09-07 00:43:40,809 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-09-07 00:43:40,809 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:43:40,813 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-09-07 00:43:40,814 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-09-07 00:43:40,814 [ scc.git] DEBUG src/app/header.html | 5 +
2024-09-07 00:43:40,814 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-09-07 00:43:40,814 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-09-07 00:43:40,814 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-09-07 00:43:40,814 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-09-07 00:43:40,814 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-09-07 00:43:41,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:43:41,075 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-09-07 00:43:41,082 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:41,088 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-09-07 00:43:41,100 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-09-07 00:43:41,101 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:43:41,104 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-09-07 00:43:41,104 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-09-07 00:43:41,104 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-09-07 00:43:41,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:43:41,465 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-09-07 00:43:41,473 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:41,477 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 477 (Bump ws and socket.io) 274749c0dfc8162eaf89cdb16a9ef23195d5d5b5'
2024-09-07 00:43:41,492 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:43:41,501 [ scc.git] DEBUG package-lock.json | 108 ++++++++++++++++++++++++++++++++++--------------------
2024-09-07 00:43:41,501 [ scc.git] DEBUG 1 file changed, 68 insertions(+), 40 deletions(-)
2024-09-07 00:43:41,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:43:41,863 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-09-07 00:43:41,871 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:41,877 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Bump socket.io from 4.6.1 to 4.7.5) 91cd18bb57d92337a1fb0c60a10824e5d057ee11'
2024-09-07 00:43:41,925 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-07 00:43:41,926 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:43:42,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:43:42,238 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-09-07 00:43:42,248 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:42,254 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 482 (Support ?collapse_left/right and ?full_page=true) 7e1dd40572c8cc9a1bdc4cb1ff58c82367c89b1b'
2024-09-07 00:43:42,362 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-09-07 00:43:42,362 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-09-07 00:43:42,362 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-09-07 00:43:42,362 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:43:42,367 [ scc.git] DEBUG src/app/context.js | 12 +++++++++++
2024-09-07 00:43:42,368 [ scc.git] DEBUG src/app/index.js | 5 +----
2024-09-07 00:43:42,368 [ scc.git] DEBUG src/model/image_info.js | 1 -
2024-09-07 00:43:42,368 [ scc.git] DEBUG src/utils/constants.js | 5 ++++-
2024-09-07 00:43:42,368 [ scc.git] DEBUG src/utils/ui.js | 44 ++++++++++++++++++++++----------------
2024-09-07 00:43:42,368 [ scc.git] DEBUG src/viewers/viewer/source/Image.js | 1 -
2024-09-07 00:43:42,368 [ scc.git] DEBUG 6 files changed, 42 insertions(+), 26 deletions(-)
2024-09-07 00:43:42,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:43:42,624 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-09-07 00:43:42,632 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:42,638 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 483 (Bump webpack from 5.82.0 to 5.94.0) 384771c9fd794e2b472a35dca65e6ed96be98c4d'
2024-09-07 00:43:42,673 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-07 00:43:42,673 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:43:42,683 [ scc.git] DEBUG package-lock.json | 686 ++++++++++++++++++++++++++----------------------------
2024-09-07 00:43:42,683 [ scc.git] DEBUG package.json | 2 +-
2024-09-07 00:43:42,683 [ scc.git] DEBUG 2 files changed, 329 insertions(+), 359 deletions(-)
2024-09-07 00:43:43,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:43:43,004 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:43:43,047 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:43:43,048 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:43,054 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:43:43,098 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:43:43,111 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9c925be0> has no local changes
2024-09-07 00:43:43,111 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- 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 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
- PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
- PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
Generated by OMERO-plugins-push#177 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/)'
2024-09-07 00:43:43,123 [ scc.git] DEBUG [detached HEAD 04197a0] merge master -Dorg -Ssuccess-only
2024-09-07 00:43:43,124 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:43:43,124 [ scc.repo] DEBUG ## PRs found:
2024-09-07 00:43:43,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-09-07 00:43:43,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-09-07 00:43:44,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-09-07 00:43:44,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-09-07 00:43:45,413 [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
2024-09-07 00:43:45,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-07 00:43:46,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-09-07 00:43:46,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-09-07 00:43:46,674 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-09-07 00:43:46,674 [ scc.repo] DEBUG ## Branches found:
2024-09-07 00:43:46,675 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-09-07 00:43:46,675 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:43:46,675 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:46,682 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-07 00:43:46,688 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-07 00:43:46,688 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-07 00:43:46,694 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-07 00:43:46,700 [ scc.git] DEBUG Already up to date.
2024-09-07 00:43:46,701 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-09-07 00:43:47,037 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-09-07 00:43:47,037 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-09-07 00:43:47,042 [ scc.git] DEBUG ## Unique users: []
2024-09-07 00:43:47,042 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:43:47,042 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:47,049 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-09-07 00:43:47,057 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:47,066 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-09-07 00:43:47,079 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:43:47,082 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-09-07 00:43:47,082 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-09-07 00:43:47,082 [ scc.git] DEBUG requirements.txt | 2 +-
2024-09-07 00:43:47,082 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-09-07 00:43:47,082 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-09-07 00:43:47,082 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-09-07 00:43:47,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:43:47,223 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:43:47,270 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:43:47,270 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:47,281 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:43:47,333 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:43:47,345 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9c0cc7f0> has no local changes
2024-09-07 00:43:47,346 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Generated by OMERO-plugins-push#177 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/)'
2024-09-07 00:43:47,360 [ scc.git] DEBUG [detached HEAD 45853f0] merge master -Dorg -Ssuccess-only
2024-09-07 00:43:47,361 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:43:47,361 [ scc.repo] DEBUG ## PRs found:
2024-09-07 00:43:47,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-09-07 00:43:48,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86 HTTP/1.1" 200 None
2024-09-07 00:43:48,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/86/comments HTTP/1.1" 200 None
2024-09-07 00:43:49,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-09-07 00:43:49,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-07 00:43:50,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/d222577494040c63f4ce3c1a266d43257c9f1c61 HTTP/1.1" 200 None
2024-09-07 00:43:50,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/d222577494040c63f4ce3c1a266d43257c9f1c61?per_page=1 HTTP/1.1" 200 2
2024-09-07 00:43:50,409 [ scc.repo] DEBUG - PR 86 dominikl 'Add tablename option'
2024-09-07 00:43:50,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-09-07 00:43:51,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-09-07 00:43:51,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-09-07 00:43:52,317 [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
2024-09-07 00:43:52,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-09-07 00:43:53,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-09-07 00:43:53,262 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-09-07 00:43:53,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-09-07 00:43:54,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-09-07 00:43:54,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-09-07 00:43:55,072 [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
2024-09-07 00:43:55,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-09-07 00:43:56,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-09-07 00:43:56,009 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-09-07 00:43:56,009 [ scc.repo] DEBUG ## Branches found:
2024-09-07 00:43:56,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-09-07 00:43:56,009 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:43:56,009 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:56,015 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-07 00:43:56,020 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-07 00:43:56,020 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-07 00:43:56,025 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-07 00:43:56,030 [ scc.git] DEBUG Already up to date.
2024-09-07 00:43:56,030 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-09-07 00:43:56,517 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-09-07 00:43:56,517 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-09-07 00:43:56,522 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-09-07 00:43:56,968 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-09-07 00:43:56,968 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-09-07 00:43:56,975 [ scc.git] DEBUG Calling 'git fetch origin pull/86/head'
2024-09-07 00:43:57,257 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-09-07 00:43:57,257 [ scc.git] DEBUG * branch refs/pull/86/head -> FETCH_HEAD
2024-09-07 00:43:57,261 [ scc.git] DEBUG ## Unique users: []
2024-09-07 00:43:57,262 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:43:57,262 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:57,268 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-09-07 00:43:57,276 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:57,282 [ 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'
2024-09-07 00:43:57,332 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-09-07 00:43:57,332 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-09-07 00:43:57,332 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-09-07 00:43:57,333 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-09-07 00:43:57,333 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-07 00:43:57,334 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-07 00:43:57,340 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-07 00:43:57,348 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-09-07 00:43:57,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:43:57,482 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-09-07 00:43:57,489 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-07 00:43:57,496 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#177](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2024-09-07 00:43:57,501 [ scc.config] DEBUG Found github.token
2024-09-07 00:43:57,501 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-09-07 00:43:57,501 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-09-07 00:43:57,508 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:57,513 [ 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'
2024-09-07 00:43:57,546 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-09-07 00:43:57,546 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-09-07 00:43:57,546 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-09-07 00:43:57,546 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-07 00:43:57,547 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-07 00:43:57,555 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-07 00:43:57,564 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-09-07 00:43:57,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:43:57,877 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-09-07 00:43:57,884 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-09-07 00:43:57,891 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#177](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/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
2024-09-07 00:43:57,899 [ scc.config] DEBUG Found github.token
2024-09-07 00:43:57,899 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-09-07 00:43:57,900 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-09-07 00:43:57,906 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:57,912 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 86 (Add tablename option) d222577494040c63f4ce3c1a266d43257c9f1c61'
2024-09-07 00:43:57,924 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:43:57,927 [ scc.git] DEBUG src/omero_metadata/cli.py | 10 ++++++++--
2024-09-07 00:43:57,927 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 2 deletions(-)
2024-09-07 00:43:58,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:43:58,257 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:43:58,301 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:43:58,302 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:43:58,308 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:43:58,349 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:43:58,356 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9c0cc580> has no local changes
2024-09-07 00:43:58,357 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Already up to date.
Merged PRs:
- PR 86 dominikl 'Add tablename option'
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#177 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/)'
2024-09-07 00:43:58,365 [ scc.git] DEBUG [detached HEAD ef0a3e5] merge master -Dorg -Ssuccess-only
2024-09-07 00:43:58,366 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:43:58,366 [ scc.repo] DEBUG ## PRs found:
2024-09-07 00:43:58,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-09-07 00:43:59,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-09-07 00:43:59,263 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-07 00:43:59,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-09-07 00:44:00,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-07 00:44:00,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-07 00:44:01,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-09-07 00:44:01,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-09-07 00:44:01,661 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-09-07 00:44:02,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-09-07 00:44:02,115 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-07 00:44:02,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-09-07 00:44:03,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-07 00:44:03,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-07 00:44:04,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-09-07 00:44:04,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-09-07 00:44:04,640 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-09-07 00:44:05,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-09-07 00:44:05,084 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-07 00:44:05,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-09-07 00:44:06,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-07 00:44:06,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-07 00:44:07,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-09-07 00:44:07,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-09-07 00:44:07,463 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-09-07 00:44:07,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-09-07 00:44:08,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-09-07 00:44:08,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-09-07 00:44:09,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-09-07 00:44:09,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-09-07 00:44:10,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-09-07 00:44:10,307 [ scc.repo] DEBUG ## Branches found:
2024-09-07 00:44:10,307 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-09-07 00:44:10,307 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:10,307 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:10,314 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-07 00:44:10,321 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-07 00:44:10,321 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-07 00:44:10,327 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-07 00:44:10,336 [ scc.git] DEBUG Already up to date.
2024-09-07 00:44:10,336 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-09-07 00:44:10,667 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-09-07 00:44:10,667 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-09-07 00:44:10,672 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-09-07 00:44:10,975 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-09-07 00:44:10,975 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-09-07 00:44:10,981 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-09-07 00:44:11,260 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-09-07 00:44:11,261 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-09-07 00:44:11,267 [ scc.git] DEBUG ## Unique users: []
2024-09-07 00:44:11,267 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:11,267 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:11,274 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-09-07 00:44:11,281 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:11,287 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 128 (Bump postcss from 8.4.21 to 8.4.31) 55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-09-07 00:44:11,297 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:44:11,300 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-09-07 00:44:11,300 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-09-07 00:44:11,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:11,441 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-09-07 00:44:11,448 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:11,453 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 129 (Bump @babel/traverse from 7.21.4 to 7.23.2) 733f52703019d4b6d7e375c121a25c107b64dbec'
2024-09-07 00:44:11,466 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-07 00:44:11,475 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:44:11,478 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-09-07 00:44:11,478 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-09-07 00:44:11,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:11,836 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-09-07 00:44:11,844 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:11,850 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (Bump axios from 1.3.5 to 1.6.0) a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-09-07 00:44:11,863 [ scc.git] DEBUG Auto-merging package-lock.json
2024-09-07 00:44:11,863 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:44:11,867 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-09-07 00:44:11,867 [ scc.git] DEBUG package.json | 2 +-
2024-09-07 00:44:11,867 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-09-07 00:44:12,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:12,226 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:44:12,266 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:12,267 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:12,272 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:44:12,313 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:44:12,320 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9c931c70> has no local changes
2024-09-07 00:44:12,321 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- 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 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Generated by OMERO-plugins-push#177 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/)'
2024-09-07 00:44:12,329 [ scc.git] DEBUG [detached HEAD c7ad672] merge master -Dorg -Ssuccess-only
2024-09-07 00:44:12,329 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:12,329 [ scc.repo] DEBUG ## PRs found:
2024-09-07 00:44:12,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-09-07 00:44:13,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-09-07 00:44:13,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-09-07 00:44:14,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-07 00:44:14,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-09-07 00:44:15,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/fb7700b8eb4b753884260b7921e65b58b29f954e?per_page=1 HTTP/1.1" 200 2
2024-09-07 00:44:15,026 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-09-07 00:44:15,026 [ scc.repo] DEBUG ## Branches found:
2024-09-07 00:44:15,026 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-09-07 00:44:15,026 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:15,026 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:15,032 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-07 00:44:15,038 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-07 00:44:15,038 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-07 00:44:15,044 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-07 00:44:15,050 [ scc.git] DEBUG Already up to date.
2024-09-07 00:44:15,050 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-09-07 00:44:15,359 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-09-07 00:44:15,360 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-09-07 00:44:15,364 [ scc.git] DEBUG ## Unique users: []
2024-09-07 00:44:15,365 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:15,365 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:15,371 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-09-07 00:44:15,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:15,383 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-09-07 00:44:15,393 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:44:15,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:15,525 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:44:15,568 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:15,568 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:15,574 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:44:15,614 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:44:15,620 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9c929e20> has no local changes
2024-09-07 00:44:15,621 [ 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.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Generated by OMERO-plugins-push#177 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/)'
2024-09-07 00:44:15,628 [ scc.git] DEBUG [detached HEAD 68d5255] merge master -Dorg -Ssuccess-only
2024-09-07 00:44:15,628 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:15,628 [ scc.repo] DEBUG ## PRs found:
2024-09-07 00:44:16,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-09-07 00:44:16,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-09-07 00:44:16,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-09-07 00:44:17,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-09-07 00:44:17,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-09-07 00:44:18,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-07 00:44:19,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-09-07 00:44:19,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-09-07 00:44:19,438 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-09-07 00:44:19,438 [ scc.repo] DEBUG ## Branches found:
2024-09-07 00:44:19,438 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-09-07 00:44:19,438 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:19,438 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:19,445 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-07 00:44:19,451 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-07 00:44:19,452 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-07 00:44:19,458 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-07 00:44:19,464 [ scc.git] DEBUG Already up to date.
2024-09-07 00:44:19,464 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-09-07 00:44:19,823 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-09-07 00:44:19,823 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-09-07 00:44:19,828 [ scc.git] DEBUG ## Unique users: []
2024-09-07 00:44:19,828 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:19,828 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:19,835 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-09-07 00:44:19,842 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:19,848 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 6 (Add method to create masks grouped by label id) 20757563a49aa42b99a0c43176f6ef747e965b61'
2024-09-07 00:44:19,858 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-09-07 00:44:19,859 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:44:19,862 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-09-07 00:44:19,862 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-09-07 00:44:19,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:19,994 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:44:20,041 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:20,041 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:20,048 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:44:20,090 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:44:20,097 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9c92aa60> has no local changes
2024-09-07 00:44:20,097 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
Generated by OMERO-plugins-push#177 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/)'
2024-09-07 00:44:20,106 [ scc.git] DEBUG [detached HEAD 330c80d] merge master -Dorg -Ssuccess-only
2024-09-07 00:44:20,107 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:20,107 [ scc.repo] DEBUG ## PRs found:
2024-09-07 00:44:20,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-09-07 00:44:20,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-09-07 00:44:21,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-09-07 00:44:21,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-09-07 00:44:22,336 [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
2024-09-07 00:44:22,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-09-07 00:44:23,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-09-07 00:44:23,283 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-09-07 00:44:23,283 [ scc.repo] DEBUG ## Branches found:
2024-09-07 00:44:23,283 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-09-07 00:44:23,283 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:23,283 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:23,290 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-07 00:44:23,296 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-07 00:44:23,296 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-07 00:44:23,302 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-07 00:44:23,308 [ scc.git] DEBUG Already up to date.
2024-09-07 00:44:23,309 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-09-07 00:44:23,693 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-09-07 00:44:23,693 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-09-07 00:44:23,698 [ scc.git] DEBUG ## Unique users: []
2024-09-07 00:44:23,698 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:23,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:23,704 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-09-07 00:44:23,710 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:23,715 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-09-07 00:44:23,779 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-09-07 00:44:23,779 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-09-07 00:44:23,779 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-09-07 00:44:23,779 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-09-07 00:44:23,779 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-09-07 00:44:23,779 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-09-07 00:44:23,779 [ scc.git] DEBUG Auto-merging setup.py
2024-09-07 00:44:23,779 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-09-07 00:44:23,779 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-07 00:44:23,780 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-07 00:44:23,786 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-09-07 00:44:23,792 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-09-07 00:44:23,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:23,923 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-09-07 00:44:23,929 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-09-07 00:44:23,935 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#177](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- setup.py
- omero_signup/views.py
- omero_signup/urls.py
--conflicts
2024-09-07 00:44:23,940 [ scc.config] DEBUG Found github.token
2024-09-07 00:44:23,941 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-09-07 00:44:23,941 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:44:23,979 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:23,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:23,985 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:44:24,024 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:44:24,031 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9c0934c0> has no local changes
2024-09-07 00:44:24,031 [ 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#177 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/)'
2024-09-07 00:44:24,039 [ scc.git] DEBUG [detached HEAD 514406d] merge master -Dorg -Ssuccess-only
2024-09-07 00:44:24,039 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:24,039 [ scc.repo] DEBUG ## PRs found:
2024-09-07 00:44:24,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-09-07 00:44:24,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-09-07 00:44:25,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-09-07 00:44:25,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-09-07 00:44:26,225 [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
2024-09-07 00:44:26,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-09-07 00:44:27,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2024-09-07 00:44:27,148 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-09-07 00:44:27,148 [ scc.repo] DEBUG ## Branches found:
2024-09-07 00:44:27,148 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-09-07 00:44:27,148 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:27,149 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:27,156 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-07 00:44:27,161 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-07 00:44:27,161 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-07 00:44:27,166 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-07 00:44:27,171 [ scc.git] DEBUG Already up to date.
2024-09-07 00:44:27,172 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-09-07 00:44:27,541 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-09-07 00:44:27,542 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-09-07 00:44:27,547 [ scc.git] DEBUG ## Unique users: []
2024-09-07 00:44:27,548 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:27,548 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:27,554 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-09-07 00:44:27,562 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:27,569 [ 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'
2024-09-07 00:44:27,616 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:44:27,619 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-09-07 00:44:27,619 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-09-07 00:44:27,619 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-09-07 00:44:27,620 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-09-07 00:44:27,620 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-09-07 00:44:27,620 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-09-07 00:44:27,620 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-09-07 00:44:27,620 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-09-07 00:44:27,620 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-09-07 00:44:27,620 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-09-07 00:44:27,622 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-09-07 00:44:27,622 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-09-07 00:44:27,622 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-09-07 00:44:27,622 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-09-07 00:44:27,622 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-09-07 00:44:27,622 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-09-07 00:44:27,622 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-09-07 00:44:27,622 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-09-07 00:44:27,622 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-09-07 00:44:27,622 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-09-07 00:44:27,622 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-09-07 00:44:27,622 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-09-07 00:44:27,622 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-09-07 00:44:27,622 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-09-07 00:44:27,622 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-09-07 00:44:27,622 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-09-07 00:44:27,623 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-09-07 00:44:27,623 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-09-07 00:44:27,623 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-09-07 00:44:27,623 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-09-07 00:44:27,623 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-09-07 00:44:27,623 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-09-07 00:44:27,623 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-09-07 00:44:27,623 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-09-07 00:44:27,623 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-09-07 00:44:27,623 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-09-07 00:44:27,623 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-09-07 00:44:27,623 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-09-07 00:44:27,623 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-09-07 00:44:27,623 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-09-07 00:44:27,623 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-09-07 00:44:27,623 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-09-07 00:44:27,623 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-09-07 00:44:27,623 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-09-07 00:44:27,623 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-09-07 00:44:27,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:27,763 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:44:27,806 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:27,807 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:27,812 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:44:27,858 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:44:27,867 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9c0f1f40> has no local changes
2024-09-07 00:44:27,867 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
Generated by OMERO-plugins-push#177 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/)'
2024-09-07 00:44:27,879 [ scc.git] DEBUG [detached HEAD 06864ef] merge master -Dorg -Ssuccess-only
2024-09-07 00:44:27,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:27,880 [ scc.repo] DEBUG ## PRs found:
2024-09-07 00:44:28,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-09-07 00:44:28,163 [ scc.repo] DEBUG ## Branches found:
2024-09-07 00:44:28,163 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-09-07 00:44:28,163 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:28,164 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:28,169 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-07 00:44:28,174 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-07 00:44:28,174 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-07 00:44:28,180 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-07 00:44:28,186 [ scc.git] DEBUG Already up to date.
2024-09-07 00:44:28,186 [ scc.git] DEBUG ## Unique users: []
2024-09-07 00:44:28,186 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:28,186 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:28,193 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:44:28,238 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:28,238 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:28,244 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:44:28,287 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:44:28,293 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9c07df10> has no local changes
2024-09-07 00:44:28,294 [ 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#177 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/)'
2024-09-07 00:44:28,302 [ scc.git] DEBUG [detached HEAD 5c46810] merge master -Dorg -Ssuccess-only
2024-09-07 00:44:28,302 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:28,302 [ scc.repo] DEBUG ## PRs found:
2024-09-07 00:44:28,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-09-07 00:44:28,574 [ scc.repo] DEBUG ## Branches found:
2024-09-07 00:44:28,574 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-09-07 00:44:28,574 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:28,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:28,581 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-07 00:44:28,586 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-07 00:44:28,586 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-07 00:44:28,592 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-07 00:44:28,598 [ scc.git] DEBUG Already up to date.
2024-09-07 00:44:28,598 [ scc.git] DEBUG ## Unique users: []
2024-09-07 00:44:28,598 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:28,598 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:28,604 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:44:28,644 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:28,644 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:28,651 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:44:28,696 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:44:28,703 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9c039940> has no local changes
2024-09-07 00:44:28,704 [ 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.
Generated by OMERO-plugins-push#177 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/)'
2024-09-07 00:44:28,713 [ scc.git] DEBUG [detached HEAD 1532a8c] merge master -Dorg -Ssuccess-only
2024-09-07 00:44:28,714 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:28,714 [ scc.git] INFO Overriding base-branch from master to main
2024-09-07 00:44:28,714 [ scc.repo] DEBUG ## PRs found:
2024-09-07 00:44:29,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-09-07 00:44:29,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-09-07 00:44:29,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-09-07 00:44:30,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-09-07 00:44:30,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-09-07 00:44:31,289 [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
2024-09-07 00:44:31,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-09-07 00:44:32,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2024-09-07 00:44:32,212 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-09-07 00:44:32,212 [ scc.repo] DEBUG ## Branches found:
2024-09-07 00:44:32,212 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-09-07 00:44:32,212 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:32,213 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:32,227 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-09-07 00:44:32,236 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-07 00:44:32,237 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-09-07 00:44:32,244 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-09-07 00:44:32,249 [ scc.git] DEBUG Already up to date.
2024-09-07 00:44:32,249 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-09-07 00:44:32,632 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-09-07 00:44:32,632 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-09-07 00:44:32,637 [ scc.git] DEBUG ## Unique users: []
2024-09-07 00:44:32,637 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:32,637 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:32,649 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-09-07 00:44:32,656 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:32,661 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-09-07 00:44:32,681 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-09-07 00:44:32,681 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-09-07 00:44:32,681 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-07 00:44:32,682 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-07 00:44:32,689 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-09-07 00:44:32,696 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-09-07 00:44:32,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:32,827 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-09-07 00:44:32,835 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-09-07 00:44:32,842 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#177](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-09-07 00:44:32,849 [ scc.config] DEBUG Found github.token
2024-09-07 00:44:32,850 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-09-07 00:44:32,850 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:44:32,893 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:32,894 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:32,901 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:44:32,947 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:44:32,956 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9c06c670> has no local changes
2024-09-07 00:44:32,957 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web-zarr
Excluded PRs:
- 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#177 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/)'
2024-09-07 00:44:32,971 [ scc.git] DEBUG [detached HEAD d8d522c] merge master -Dorg -Ssuccess-only
2024-09-07 00:44:32,972 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:32,972 [ scc.repo] DEBUG ## PRs found:
2024-09-07 00:44:33,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-09-07 00:44:33,259 [ scc.repo] DEBUG ## Branches found:
2024-09-07 00:44:33,260 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-09-07 00:44:33,260 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:33,260 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:33,266 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-07 00:44:33,274 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-07 00:44:33,275 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-07 00:44:33,283 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-07 00:44:33,291 [ scc.git] DEBUG Already up to date.
2024-09-07 00:44:33,291 [ scc.git] DEBUG ## Unique users: []
2024-09-07 00:44:33,291 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:33,291 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:33,299 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:44:33,349 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:33,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:33,357 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:44:33,400 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:44:33,408 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9c040e80> has no local changes
2024-09-07 00:44:33,408 [ 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#177 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/)'
2024-09-07 00:44:33,418 [ scc.git] DEBUG [detached HEAD b69a95f] merge master -Dorg -Ssuccess-only
2024-09-07 00:44:33,418 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:33,418 [ scc.repo] DEBUG ## PRs found:
2024-09-07 00:44:33,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-09-07 00:44:33,667 [ scc.repo] DEBUG ## Branches found:
2024-09-07 00:44:33,667 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-09-07 00:44:33,667 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:33,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:33,675 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-07 00:44:33,681 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-07 00:44:33,681 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-07 00:44:33,688 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-07 00:44:33,696 [ scc.git] DEBUG Already up to date.
2024-09-07 00:44:33,696 [ scc.git] DEBUG ## Unique users: []
2024-09-07 00:44:33,696 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:33,696 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:33,704 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:44:33,754 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:33,755 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:33,763 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:44:33,813 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:44:33,822 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf7c7d2640> has no local changes
2024-09-07 00:44:33,822 [ 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#177 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/)'
2024-09-07 00:44:33,831 [ scc.git] DEBUG [detached HEAD 2a03c44] merge master -Dorg -Ssuccess-only
2024-09-07 00:44:33,832 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:33,832 [ scc.repo] DEBUG ## PRs found:
2024-09-07 00:44:34,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-09-07 00:44:34,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-09-07 00:44:35,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-09-07 00:44:35,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-09-07 00:44:36,077 [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
2024-09-07 00:44:36,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-09-07 00:44:36,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-09-07 00:44:36,891 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-09-07 00:44:36,891 [ scc.repo] DEBUG ## Branches found:
2024-09-07 00:44:36,891 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-09-07 00:44:36,891 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:36,891 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:36,899 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-07 00:44:36,905 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-07 00:44:36,905 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-07 00:44:36,910 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-07 00:44:36,916 [ scc.git] DEBUG Already up to date.
2024-09-07 00:44:36,916 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-09-07 00:44:37,273 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-09-07 00:44:37,274 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-09-07 00:44:37,280 [ scc.git] DEBUG ## Unique users: []
2024-09-07 00:44:37,281 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:37,281 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:37,288 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-09-07 00:44:37,296 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:37,305 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-09-07 00:44:37,370 [ scc.git] DEBUG Auto-merging Dockerfile
2024-09-07 00:44:37,370 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-09-07 00:44:37,370 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-07 00:44:37,372 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-07 00:44:37,381 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-09-07 00:44:37,391 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-09-07 00:44:37,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:37,533 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-09-07 00:44:37,539 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-09-07 00:44:37,545 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#177](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-09-07 00:44:37,550 [ scc.config] DEBUG Found github.token
2024-09-07 00:44:37,551 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-09-07 00:44:37,551 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:44:37,590 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:37,590 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:37,596 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:44:37,634 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:44:37,641 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf7c7e3d90> has no local changes
2024-09-07 00:44:37,641 [ 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#177 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/)'
2024-09-07 00:44:37,652 [ scc.git] DEBUG [detached HEAD 4fc85f0] merge master -Dorg -Ssuccess-only
2024-09-07 00:44:37,652 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:37,653 [ scc.git] INFO Overriding base-branch from master to develop
2024-09-07 00:44:37,653 [ scc.repo] DEBUG ## PRs found:
2024-09-07 00:44:38,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-09-07 00:44:38,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-09-07 00:44:39,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-09-07 00:44:39,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-09-07 00:44:39,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-09-07 00:44:40,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-09-07 00:44:40,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-09-07 00:44:41,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-07 00:44:41,781 [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
2024-09-07 00:44:42,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-07 00:44:42,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-09-07 00:44:42,640 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-07 00:44:43,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-09-07 00:44:43,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-09-07 00:44:43,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-09-07 00:44:44,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-09-07 00:44:44,477 [ scc.repo] DEBUG ## Branches found:
2024-09-07 00:44:44,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-09-07 00:44:44,477 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:44,478 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:44,488 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-09-07 00:44:44,497 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-07 00:44:44,497 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-09-07 00:44:44,507 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-09-07 00:44:44,520 [ scc.git] DEBUG Already up to date.
2024-09-07 00:44:44,520 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-09-07 00:44:44,966 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-09-07 00:44:44,967 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-09-07 00:44:44,973 [ scc.git] DEBUG ## Unique users: []
2024-09-07 00:44:44,974 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:44,974 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:44,980 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-07 00:44:44,988 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:44,994 [ 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'
2024-09-07 00:44:45,070 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-09-07 00:44:45,071 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-09-07 00:44:45,071 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-07 00:44:45,072 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-07 00:44:45,086 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-07 00:44:45,108 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-09-07 00:44:45,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:45,241 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-07 00:44:45,251 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-07 00:44:45,261 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#177](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-09-07 00:44:45,269 [ scc.config] DEBUG Found github.token
2024-09-07 00:44:45,270 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-09-07 00:44:45,270 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:44:45,321 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:44:45,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:44:45,328 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:44:45,370 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:44:45,377 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcf9c044e20> has no local changes
2024-09-07 00:44:45,377 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- 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)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#177 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/)'
2024-09-07 00:44:45,387 [ scc.git] DEBUG [detached HEAD 382c591] merge master -Dorg -Ssuccess-only
2024-09-07 00:44:45,387 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:45,388 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:44:45,467 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-09-07 00:44:45,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:45,637 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-09-07 00:44:45,642 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-09-07 00:44:46,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:46,014 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-09-07 00:44:46,020 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-09-07 00:44:46,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:46,424 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-09-07 00:44:46,432 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-09-07 00:44:46,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:46,800 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-09-07 00:44:47,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:47,178 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-09-07 00:44:47,183 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-09-07 00:44:47,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:47,569 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-09-07 00:44:47,576 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-09-07 00:44:47,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:47,951 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-09-07 00:44:47,956 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-09-07 00:44:48,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:48,336 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-09-07 00:44:48,343 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-09-07 00:44:48,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:48,718 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-09-07 00:44:48,725 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-09-07 00:44:49,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:49,094 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-09-07 00:44:49,102 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-09-07 00:44:49,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:49,525 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-09-07 00:44:49,543 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-09-07 00:44:49,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:49,884 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-09-07 00:44:49,892 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-09-07 00:44:50,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:50,266 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-09-07 00:44:50,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:50,653 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-09-07 00:44:51,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:51,031 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-09-07 00:44:51,038 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-09-07 00:44:51,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:51,420 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-09-07 00:44:51,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:51,804 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-09-07 00:44:52,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:52,188 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-09-07 00:44:52,195 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-09-07 00:44:52,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:52,610 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-09-07 00:44:52,615 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-09-07 00:44:53,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:53,025 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-09-07 00:44:53,030 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-09-07 00:44:53,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:53,409 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-09-07 00:44:53,414 [ scc.config] DEBUG Found submodule.scripts.url
2024-09-07 00:44:53,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:44:53,794 [ scc.config] DEBUG Found submodule.scripts.branch
2024-09-07 00:44:53,794 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:44:53,874 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcfa0756e20> has local changes
2024-09-07 00:44:53,874 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Repository: ome/minimal-omero-client
Already up to date.
Merged PRs:
- PR 66 jburel 'Gateway 5 9 2'
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.
Merged PRs:
- PR 25 jburel 'review message'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
- PR 54 dominikl 'Change rendering settings spec' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
- PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
Repository: ome/omero-cli-zarr
Excluded PRs:
- 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'
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 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 5f623996..f9a321dd
Previously merged:
- PR 549 will-moore 'Inset feature'
Merged PRs:
- PR 555 will-moore 'Points in shape editor'
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
- PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
- PR 584 Rdornier 'Link url to image'
Conflicting PRs (not included):
- PR 577 Rdornier 'Fill rois'
- PR 578 Rdornier 'Image outline'
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 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
- 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 477 dependabot[bot] 'Bump ws and socket.io'
- PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
- PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
- PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
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.
Merged PRs:
- PR 86 dominikl 'Add tablename option'
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 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 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
- PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
- PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
Repository: ome/omero-prometheus-tools
Already up to date.
Merged PRs:
- PR 14 jburel 'use conda-forge channel'
Repository: ome/omero-rois
Excluded PRs:
- PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 6 dominikl 'Add method to create masks grouped by label id'
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
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.
Repository: ome/omero-web-zarr
Excluded PRs:
- 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 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- 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)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#177 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/177/)'
2024-09-07 00:44:53,889 [ scc.git] DEBUG [detached HEAD b7c617e] merge master -Dorg -Ssuccess-only
2024-09-07 00:44:53,889 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-09-07 00:44:53,889 [ scc.merge] INFO Repository: ome/omero-plugins
2024-09-07 00:44:53,889 [ scc.merge] INFO Already up to date.
2024-09-07 00:44:53,889 [ scc.merge] INFO
2024-09-07 00:44:53,889 [ scc.merge] INFO
2024-09-07 00:44:53,889 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-09-07 00:44:53,890 [ scc.merge] INFO Already up to date.
2024-09-07 00:44:53,890 [ scc.merge] INFO
2024-09-07 00:44:53,890 [ scc.merge] INFO Merged PRs:
2024-09-07 00:44:53,890 [ scc.merge] INFO - PR 66 jburel 'Gateway 5 9 2'
2024-09-07 00:44:53,890 [ scc.merge] INFO
2024-09-07 00:44:53,890 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-09-07 00:44:53,890 [ scc.merge] INFO Excluded PRs:
2024-09-07 00:44:53,890 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-09-07 00:44:53,890 [ scc.merge] INFO Already up to date.
2024-09-07 00:44:53,890 [ scc.merge] INFO
2024-09-07 00:44:53,890 [ scc.merge] INFO Merged PRs:
2024-09-07 00:44:53,890 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-09-07 00:44:53,890 [ scc.merge] INFO
2024-09-07 00:44:53,890 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-09-07 00:44:53,890 [ scc.merge] INFO Excluded PRs:
2024-09-07 00:44:53,890 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-09-07 00:44:53,890 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-09-07 00:44:53,891 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-09-07 00:44:53,891 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-09-07 00:44:53,891 [ scc.merge] INFO Already up to date.
2024-09-07 00:44:53,891 [ scc.merge] INFO
2024-09-07 00:44:53,891 [ scc.merge] INFO Merged PRs:
2024-09-07 00:44:53,891 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-09-07 00:44:53,891 [ scc.merge] INFO
2024-09-07 00:44:53,891 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-09-07 00:44:53,891 [ scc.merge] INFO Excluded PRs:
2024-09-07 00:44:53,891 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-09-07 00:44:53,891 [ scc.merge] INFO Already up to date.
2024-09-07 00:44:53,891 [ scc.merge] INFO
2024-09-07 00:44:53,891 [ scc.merge] INFO Merged PRs:
2024-09-07 00:44:53,891 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-09-07 00:44:53,891 [ scc.merge] INFO
2024-09-07 00:44:53,891 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-07 00:44:53,891 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-09-07 00:44:53,891 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-09-07 00:44:53,891 [ scc.merge] INFO
2024-09-07 00:44:53,891 [ scc.merge] INFO Repository: ome/omero-figure
2024-09-07 00:44:53,892 [ scc.merge] INFO Excluded PRs:
2024-09-07 00:44:53,892 [ scc.merge] INFO - PR 579 Tom-TBT 'Perceptibly uniform luts for OMERO.figure' (user: Tom-TBT)
2024-09-07 00:44:53,892 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-09-07 00:44:53,892 [ scc.merge] INFO Updating 5f623996..f9a321dd
2024-09-07 00:44:53,892 [ scc.merge] INFO Previously merged:
2024-09-07 00:44:53,892 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-09-07 00:44:53,892 [ scc.merge] INFO
2024-09-07 00:44:53,892 [ scc.merge] INFO Merged PRs:
2024-09-07 00:44:53,892 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-09-07 00:44:53,892 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-09-07 00:44:53,892 [ scc.merge] INFO - PR 583 MinaEnayat 'Add Hilo Checkbox for LUT Toggling in Channel Slider View'
2024-09-07 00:44:53,892 [ scc.merge] INFO - PR 584 Rdornier 'Link url to image'
2024-09-07 00:44:53,892 [ scc.merge] INFO
2024-09-07 00:44:53,892 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-07 00:44:53,892 [ scc.merge] INFO - PR 577 Rdornier 'Fill rois'
2024-09-07 00:44:53,892 [ scc.merge] INFO - PR 578 Rdornier 'Image outline'
2024-09-07 00:44:53,892 [ scc.merge] INFO
2024-09-07 00:44:53,892 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-09-07 00:44:53,892 [ scc.merge] INFO Already up to date.
2024-09-07 00:44:53,892 [ scc.merge] INFO
2024-09-07 00:44:53,892 [ scc.merge] INFO Merged PRs:
2024-09-07 00:44:53,892 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-09-07 00:44:53,892 [ scc.merge] INFO
2024-09-07 00:44:53,892 [ scc.merge] INFO Repository: ome/omero-gallery
2024-09-07 00:44:53,892 [ scc.merge] INFO Already up to date.
2024-09-07 00:44:53,892 [ scc.merge] INFO
2024-09-07 00:44:53,892 [ scc.merge] INFO Merged PRs:
2024-09-07 00:44:53,892 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-09-07 00:44:53,892 [ scc.merge] INFO
2024-09-07 00:44:53,892 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-09-07 00:44:53,892 [ scc.merge] INFO Excluded PRs:
2024-09-07 00:44:53,892 [ scc.merge] INFO - PR 481 Tom-TBT 'Perceptibly uniform luts for OMERO.iviewer' (user: Tom-TBT)
2024-09-07 00:44:53,892 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-09-07 00:44:53,892 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-09-07 00:44:53,892 [ scc.merge] INFO Already up to date.
2024-09-07 00:44:53,892 [ scc.merge] INFO
2024-09-07 00:44:53,892 [ scc.merge] INFO Merged PRs:
2024-09-07 00:44:53,893 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-09-07 00:44:53,893 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-09-07 00:44:53,893 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-09-07 00:44:53,893 [ scc.merge] INFO - PR 477 dependabot[bot] 'Bump ws and socket.io'
2024-09-07 00:44:53,893 [ scc.merge] INFO - PR 478 dependabot[bot] 'Bump socket.io from 4.6.1 to 4.7.5'
2024-09-07 00:44:53,893 [ scc.merge] INFO - PR 482 will-moore 'Support ?collapse_left/right and ?full_page=true'
2024-09-07 00:44:53,893 [ scc.merge] INFO - PR 483 dependabot[bot] 'Bump webpack from 5.82.0 to 5.94.0'
2024-09-07 00:44:53,893 [ scc.merge] INFO
2024-09-07 00:44:53,893 [ scc.merge] INFO Repository: ome/omero-mapr
2024-09-07 00:44:53,893 [ scc.merge] INFO Excluded PRs:
2024-09-07 00:44:53,893 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-09-07 00:44:53,893 [ scc.merge] INFO Already up to date.
2024-09-07 00:44:53,893 [ scc.merge] INFO
2024-09-07 00:44:53,893 [ scc.merge] INFO Merged PRs:
2024-09-07 00:44:53,893 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-09-07 00:44:53,893 [ scc.merge] INFO
2024-09-07 00:44:53,893 [ scc.merge] INFO Repository: ome/omero-metadata
2024-09-07 00:44:53,893 [ scc.merge] INFO Already up to date.
2024-09-07 00:44:53,893 [ scc.merge] INFO
2024-09-07 00:44:53,893 [ scc.merge] INFO Merged PRs:
2024-09-07 00:44:53,893 [ scc.merge] INFO - PR 86 dominikl 'Add tablename option'
2024-09-07 00:44:53,893 [ scc.merge] INFO
2024-09-07 00:44:53,893 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-07 00:44:53,893 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-09-07 00:44:53,894 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-09-07 00:44:53,894 [ scc.merge] INFO
2024-09-07 00:44:53,894 [ scc.merge] INFO Repository: ome/omero-parade
2024-09-07 00:44:53,894 [ scc.merge] INFO Excluded PRs:
2024-09-07 00:44:53,894 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-09-07 00:44:53,894 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-09-07 00:44:53,894 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-09-07 00:44:53,894 [ scc.merge] INFO Already up to date.
2024-09-07 00:44:53,894 [ scc.merge] INFO
2024-09-07 00:44:53,894 [ scc.merge] INFO Merged PRs:
2024-09-07 00:44:53,894 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-09-07 00:44:53,894 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-09-07 00:44:53,894 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-09-07 00:44:53,894 [ scc.merge] INFO
2024-09-07 00:44:53,894 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-09-07 00:44:53,894 [ scc.merge] INFO Already up to date.
2024-09-07 00:44:53,894 [ scc.merge] INFO
2024-09-07 00:44:53,894 [ scc.merge] INFO Merged PRs:
2024-09-07 00:44:53,894 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-09-07 00:44:53,894 [ scc.merge] INFO
2024-09-07 00:44:53,894 [ scc.merge] INFO Repository: ome/omero-rois
2024-09-07 00:44:53,894 [ scc.merge] INFO Excluded PRs:
2024-09-07 00:44:53,894 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-09-07 00:44:53,894 [ scc.merge] INFO Already up to date.
2024-09-07 00:44:53,894 [ scc.merge] INFO
2024-09-07 00:44:53,894 [ scc.merge] INFO Merged PRs:
2024-09-07 00:44:53,894 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-09-07 00:44:53,894 [ scc.merge] INFO
2024-09-07 00:44:53,894 [ scc.merge] INFO Repository: ome/omero-signup
2024-09-07 00:44:53,894 [ scc.merge] INFO Already up to date.
2024-09-07 00:44:53,894 [ scc.merge] INFO
2024-09-07 00:44:53,894 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-07 00:44:53,894 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-09-07 00:44:53,895 [ scc.merge] INFO
2024-09-07 00:44:53,895 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-09-07 00:44:53,895 [ scc.merge] INFO Already up to date.
2024-09-07 00:44:53,895 [ scc.merge] INFO
2024-09-07 00:44:53,895 [ scc.merge] INFO Merged PRs:
2024-09-07 00:44:53,895 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-09-07 00:44:53,895 [ scc.merge] INFO
2024-09-07 00:44:53,895 [ scc.merge] INFO Repository: ome/omero-upload
2024-09-07 00:44:53,895 [ scc.merge] INFO Already up to date.
2024-09-07 00:44:53,895 [ scc.merge] INFO
2024-09-07 00:44:53,895 [ scc.merge] INFO
2024-09-07 00:44:53,895 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-09-07 00:44:53,895 [ scc.merge] INFO Already up to date.
2024-09-07 00:44:53,895 [ scc.merge] INFO
2024-09-07 00:44:53,895 [ scc.merge] INFO
2024-09-07 00:44:53,895 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-09-07 00:44:53,895 [ scc.merge] INFO Excluded PRs:
2024-09-07 00:44:53,895 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-09-07 00:44:53,895 [ scc.merge] INFO Already up to date.
2024-09-07 00:44:53,895 [ scc.merge] INFO
2024-09-07 00:44:53,895 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-07 00:44:53,895 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-09-07 00:44:53,895 [ scc.merge] INFO
2024-09-07 00:44:53,895 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-09-07 00:44:53,895 [ scc.merge] INFO Already up to date.
2024-09-07 00:44:53,895 [ scc.merge] INFO
2024-09-07 00:44:53,895 [ scc.merge] INFO
2024-09-07 00:44:53,895 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-09-07 00:44:53,895 [ scc.merge] INFO Already up to date.
2024-09-07 00:44:53,895 [ scc.merge] INFO
2024-09-07 00:44:53,895 [ scc.merge] INFO
2024-09-07 00:44:53,895 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-09-07 00:44:53,895 [ scc.merge] INFO Already up to date.
2024-09-07 00:44:53,895 [ scc.merge] INFO
2024-09-07 00:44:53,895 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-07 00:44:53,895 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-09-07 00:44:53,895 [ scc.merge] INFO
2024-09-07 00:44:53,896 [ scc.merge] INFO Repository: ome/scripts
2024-09-07 00:44:53,896 [ scc.merge] INFO Excluded PRs:
2024-09-07 00:44:53,896 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-09-07 00:44:53,896 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-09-07 00:44:53,896 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-09-07 00:44:53,896 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-09-07 00:44:53,896 [ scc.merge] INFO Already up to date.
2024-09-07 00:44:53,896 [ scc.merge] INFO
2024-09-07 00:44:53,896 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-07 00:44:53,896 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-07 00:44:53,896 [ scc.merge] INFO
2024-09-07 00:44:53,896 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-07 00:44:53,896 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:44:53,902 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-09-07 00:44:53,902 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:44:53,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:53,908 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-09-07 00:44:53,908 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:44:53,913 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:53,914 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-09-07 00:44:53,914 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:44:53,919 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:53,920 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-09-07 00:44:53,920 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:44:53,926 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:53,926 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-09-07 00:44:53,926 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:44:53,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:53,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-09-07 00:44:53,932 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:44:53,937 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:53,937 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-09-07 00:44:53,938 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:44:53,943 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:53,944 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-09-07 00:44:53,944 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:44:53,949 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:53,949 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-09-07 00:44:53,949 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:44:53,954 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:53,954 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-09-07 00:44:53,954 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:44:53,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:53,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-09-07 00:44:53,960 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:44:53,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:53,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-09-07 00:44:53,966 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:44:53,971 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:53,972 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-09-07 00:44:53,972 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:44:53,977 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:53,977 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-09-07 00:44:53,977 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:44:53,981 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:53,982 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-09-07 00:44:53,982 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:44:53,986 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:53,986 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-09-07 00:44:53,986 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:44:53,992 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:53,992 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-09-07 00:44:53,993 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:44:53,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:53,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-09-07 00:44:53,999 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:44:54,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:54,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-09-07 00:44:54,005 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:44:54,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:54,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-09-07 00:44:54,010 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:44:54,015 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:54,016 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-09-07 00:44:54,016 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:44:54,020 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-09-07 00:44:54,020 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-09-07 00:44:54,020 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:44:54,025 [ 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.9.2 to 5.9.4-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 32d5dbe] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 027b3e6
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from 173cac0
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 9b73dd9
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 5f623996
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from e5b3ca3
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 56f4435
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from a8f380f
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 9631b15
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from e2fc5ec
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from 5d441c2
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from 18bccb6
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from 5c752d5
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from c8610db
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 aca9e9c
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 67bb245
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from adfa132
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 8da48e1
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
[detached HEAD 21c8e5a] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-09-07 00:45:39,662 [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
2024-09-07 00:45:48,311 [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
2024-09-07 00:45:50,550 [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
2024-09-07 00:45:54,960 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-09-07 00:46:34,928 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/f5fa13f0/images/svgs/logo.svg){kind=logo}
