Console Output
Skipping 90 KB..
Full Logt merge-base 2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473 553b35f498764274f8dc882fb54c7e0a30fb6737'
2024-06-18 00:43:40,597 [ scc.git] DEBUG Calling 'git diff --name-only eff38d0408f9d50de13b28dfe09e4382965e203f..2ca566b8cd1b2f3787ce5c8017ef8d4d4ac39473'
2024-06-18 00:43:40,604 [ scc.git] INFO - PR 123 will-moore 'Support export of Fileset:ID'
Conflicting PR. Removed from build [OMERO-plugins-push#99](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/consoleText) for more details.
Possible conflicts:
- PR #102 will-moore 'Zarr export tests'
- src/omero_zarr/raw_pixels.py
- Upstream changes
- .isort.cfg
- src/omero_zarr/raw_pixels.py
--conflicts
2024-06-18 00:43:40,610 [ scc.config] DEBUG Found github.token
2024-06-18 00:43:40,610 [ scc.git] DEBUG Not adding comment to issue #123, already --conflicts.
2024-06-18 00:43:40,610 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-18 00:43:40,618 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:43:40,623 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2024-06-18 00:43:40,680 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2024-06-18 00:43:40,680 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2024-06-18 00:43:40,680 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 00:43:40,684 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2024-06-18 00:43:40,684 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2024-06-18 00:43:40,684 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2024-06-18 00:43:40,684 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2024-06-18 00:43:40,684 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2024-06-18 00:43:40,685 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2024-06-18 00:43:41,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:43:41,015 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 00:43:41,055 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:43:41,056 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:43:41,061 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 00:43:41,099 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 00:43:41,106 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f713e8e4970> has no local changes
2024-06-18 00:43:41,106 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
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'
Generated by OMERO-plugins-push#99 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/)'
2024-06-18 00:43:41,114 [ scc.git] DEBUG [detached HEAD 5ecf5b8] merge master -Dorg -Ssuccess-only
2024-06-18 00:43:41,114 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:43:41,114 [ scc.repo] DEBUG ## PRs found:
2024-06-18 00:43:41,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2024-06-18 00:43:42,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/568 HTTP/1.1" 200 None
2024-06-18 00:43:42,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6 HTTP/1.1" 200 None
2024-06-18 00:43:43,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-18 00:43:43,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-18 00:43:44,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6 HTTP/1.1" 200 None
2024-06-18 00:43:44,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6?per_page=1 HTTP/1.1" 200 2
2024-06-18 00:43:44,467 [ scc.repo] DEBUG - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-06-18 00:43:44,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/567 HTTP/1.1" 200 None
2024-06-18 00:43:45,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/97071073bfa3c305af12472d3414e4772446d369 HTTP/1.1" 200 None
2024-06-18 00:43:45,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/97071073bfa3c305af12472d3414e4772446d369/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-18 00:43:46,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/97071073bfa3c305af12472d3414e4772446d369/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-18 00:43:46,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/97071073bfa3c305af12472d3414e4772446d369 HTTP/1.1" 200 None
2024-06-18 00:43:47,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/97071073bfa3c305af12472d3414e4772446d369?per_page=1 HTTP/1.1" 200 2
2024-06-18 00:43:47,320 [ scc.repo] DEBUG - PR 567 jburel 'cap numpy to less than 2'
2024-06-18 00:43:47,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555 HTTP/1.1" 200 None
2024-06-18 00:43:48,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/555/comments HTTP/1.1" 200 None
2024-06-18 00:43:48,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-18 00:43:49,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-18 00:43:49,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-18 00:43:50,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/3179811fd0a1d65e2dc5f56013cf92e086da24ab HTTP/1.1" 200 None
2024-06-18 00:43:50,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/3179811fd0a1d65e2dc5f56013cf92e086da24ab?per_page=1 HTTP/1.1" 200 2
2024-06-18 00:43:50,525 [ scc.repo] DEBUG - PR 555 will-moore 'Points in shape editor'
2024-06-18 00:43:51,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/549 HTTP/1.1" 200 None
2024-06-18 00:43:51,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-18 00:43:52,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-18 00:43:52,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-18 00:43:52,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24 HTTP/1.1" 200 None
2024-06-18 00:43:53,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24?per_page=1 HTTP/1.1" 200 2
2024-06-18 00:43:53,400 [ scc.repo] DEBUG - PR 549 will-moore 'Inset feature'
2024-06-18 00:43:53,400 [ scc.repo] DEBUG ## Branches found:
2024-06-18 00:43:53,400 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-18 00:43:53,401 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:43:53,401 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:43:53,409 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 00:43:53,415 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 00:43:53,415 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 00:43:53,422 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 00:43:53,428 [ scc.git] DEBUG Already up to date.
2024-06-18 00:43:53,428 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-06-18 00:43:54,332 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-18 00:43:54,332 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-06-18 00:43:54,337 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-06-18 00:43:54,878 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-18 00:43:54,878 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-06-18 00:43:54,885 [ scc.git] DEBUG Calling 'git fetch origin pull/567/head'
2024-06-18 00:43:55,448 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-18 00:43:55,448 [ scc.git] DEBUG * branch refs/pull/567/head -> FETCH_HEAD
2024-06-18 00:43:55,452 [ scc.git] DEBUG Calling 'git fetch origin pull/568/head'
2024-06-18 00:43:56,221 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2024-06-18 00:43:56,221 [ scc.git] DEBUG * branch refs/pull/568/head -> FETCH_HEAD
2024-06-18 00:43:56,224 [ scc.git] DEBUG ## Unique users: []
2024-06-18 00:43:56,225 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:43:56,225 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:43:56,232 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-18 00:43:56,241 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:43:56,249 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Inset feature) 6b34dcc58aee2bb7adb2a2f1a2fb1259944f9c24'
2024-06-18 00:43:56,486 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 00:43:56,494 [ scc.git] DEBUG src/js/models/figure_model.js | 8 +++-
2024-06-18 00:43:56,494 [ scc.git] DEBUG src/js/models/panel_model.js | 84 +++++++++++++++++++++++++++++++++++
2024-06-18 00:43:56,494 [ scc.git] DEBUG src/js/shapeEditorTest.js | 7 +++
2024-06-18 00:43:56,494 [ scc.git] DEBUG src/js/shape_editor/rect.js | 33 +++++++++++++-
2024-06-18 00:43:56,495 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 1 +
2024-06-18 00:43:56,495 [ scc.git] DEBUG src/js/views/figure_view.js | 7 ++-
2024-06-18 00:43:56,495 [ scc.git] DEBUG src/js/views/right_panel_view.js | 74 +++++++++++++++++++++++++++++-
2024-06-18 00:43:56,495 [ scc.git] DEBUG src/js/views/util.js | 54 ++++++++++++++++++++++
2024-06-18 00:43:56,495 [ scc.git] DEBUG src/templates/rois_form.template.html | 7 +++
2024-06-18 00:43:56,495 [ scc.git] DEBUG 9 files changed, 270 insertions(+), 5 deletions(-)
2024-06-18 00:43:56,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:43:56,664 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-18 00:43:56,673 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:43:56,680 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Points in shape editor) 3179811fd0a1d65e2dc5f56013cf92e086da24ab'
2024-06-18 00:43:56,715 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2024-06-18 00:43:56,715 [ scc.git] DEBUG Auto-merging src/js/shapeEditorTest.js
2024-06-18 00:43:56,715 [ scc.git] DEBUG Auto-merging src/js/shape_editor/shape_manager.js
2024-06-18 00:43:56,715 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 00:43:56,722 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 8 +-
2024-06-18 00:43:56,722 [ scc.git] DEBUG src/css/figure.css | 4 +
2024-06-18 00:43:56,722 [ scc.git] DEBUG src/images/point-icon-24.png | Bin 0 -> 2477 bytes
2024-06-18 00:43:56,722 [ scc.git] DEBUG src/js/models/panel_model.js | 2 +-
2024-06-18 00:43:56,723 [ scc.git] DEBUG src/js/shapeEditorTest.js | 5 +
2024-06-18 00:43:56,723 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 474 ++++++++++++++++++++-
2024-06-18 00:43:56,723 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 12 +-
2024-06-18 00:43:56,723 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2024-06-18 00:43:56,723 [ scc.git] DEBUG src/shapeEditorTest.html | 4 +-
2024-06-18 00:43:56,723 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 3 +
2024-06-18 00:43:56,723 [ scc.git] DEBUG 10 files changed, 502 insertions(+), 11 deletions(-)
2024-06-18 00:43:56,723 [ scc.git] DEBUG create mode 100644 src/images/point-icon-24.png
2024-06-18 00:43:57,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:43:57,107 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97071073bfa3c305af12472d3414e4772446d369'
2024-06-18 00:43:57,118 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:43:57,128 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 567 (cap numpy to less than 2) 97071073bfa3c305af12472d3414e4772446d369'
2024-06-18 00:43:57,147 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 00:43:57,150 [ scc.git] DEBUG setup.py | 2 +-
2024-06-18 00:43:57,150 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-06-18 00:43:57,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:43:57,510 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-06-18 00:43:57,521 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:43:57,528 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 568 (Remove numpy from tests_require in setup.py) 15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-06-18 00:43:57,543 [ scc.git] DEBUG Auto-merging setup.py
2024-06-18 00:43:57,543 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-06-18 00:43:57,543 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-18 00:43:57,544 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-18 00:43:57,551 [ scc.git] DEBUG Calling 'git reset --hard 382ad24c9ea65bee7a4e1221d225c1756d66956b'
2024-06-18 00:43:57,560 [ scc.git] DEBUG HEAD is now at 382ad24c merge master -Dorg -Ssuccess-only: PR 567 (cap numpy to less than 2)
2024-06-18 00:43:57,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:43:57,927 [ scc.git] DEBUG Calling 'git merge-base ffc7e0758098d2dc59c1db60bece8f7c26b49c5e 15b99b2d9f05bf5bbf62ef90a05cc48fdb5fdef6'
2024-06-18 00:43:57,934 [ scc.git] DEBUG Calling 'git diff --name-only ffc7e0758098d2dc59c1db60bece8f7c26b49c5e..ffc7e0758098d2dc59c1db60bece8f7c26b49c5e'
2024-06-18 00:43:57,941 [ scc.git] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
Conflicting PR. Removed from build [OMERO-plugins-push#99](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/consoleText) for more details.
Possible conflicts:
- PR #567 jburel 'cap numpy to less than 2'
- setup.py
--conflicts
2024-06-18 00:43:57,947 [ scc.config] DEBUG Found github.token
2024-06-18 00:43:57,948 [ scc.git] DEBUG Adding comment to issue #568.
2024-06-18 00:43:58,815 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-figure/issues/568/comments HTTP/1.1" 201 1969
2024-06-18 00:43:58,817 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 00:43:58,861 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:43:58,861 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:43:58,869 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 00:43:58,916 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 00:43:58,925 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f713e89fbb0> has no local changes
2024-06-18 00:43:58,926 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 560 will-moore 'Max projection bytes' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 567 jburel 'cap numpy to less than 2'
Conflicting PRs (not included):
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
Generated by OMERO-plugins-push#99 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/)'
2024-06-18 00:43:58,937 [ scc.git] DEBUG [detached HEAD b829d7ff] merge master -Dorg -Ssuccess-only
2024-06-18 00:43:58,938 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:43:58,938 [ scc.repo] DEBUG ## PRs found:
2024-06-18 00:43:59,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2024-06-18 00:43:59,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2024-06-18 00:44:00,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2024-06-18 00:44:00,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-18 00:44:01,277 [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-06-18 00:44:01,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2024-06-18 00:44:02,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2024-06-18 00:44:02,225 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2024-06-18 00:44:02,225 [ scc.repo] DEBUG ## Branches found:
2024-06-18 00:44:02,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-18 00:44:02,225 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:02,225 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:02,234 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 00:44:02,242 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 00:44:02,242 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 00:44:02,250 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 00:44:02,259 [ scc.git] DEBUG Already up to date.
2024-06-18 00:44:02,259 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2024-06-18 00:44:02,685 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2024-06-18 00:44:02,685 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2024-06-18 00:44:02,690 [ scc.git] DEBUG ## Unique users: []
2024-06-18 00:44:02,690 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:02,690 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:02,696 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-18 00:44:02,702 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:02,708 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2024-06-18 00:44:02,746 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2024-06-18 00:44:02,747 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 00:44:02,750 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2024-06-18 00:44:02,750 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-06-18 00:44:02,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:44:02,916 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 00:44:02,962 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:02,962 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:02,969 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 00:44:03,009 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 00:44:03,017 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f713e90cdf0> has no local changes
2024-06-18 00:44:03,017 [ 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#99 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/)'
2024-06-18 00:44:03,028 [ scc.git] DEBUG [detached HEAD be020d0] merge master -Dorg -Ssuccess-only
2024-06-18 00:44:03,029 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:44:03,029 [ scc.repo] DEBUG ## PRs found:
2024-06-18 00:44:03,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2024-06-18 00:44:03,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/111 HTTP/1.1" 200 None
2024-06-18 00:44:03,908 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-18 00:44:04,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-18 00:44:05,014 [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-06-18 00:44:05,572 [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-06-18 00:44:06,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893 HTTP/1.1" 200 None
2024-06-18 00:44:06,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/37cfaf2f52e78b2cab2f49b0c02c7553d2b57893?per_page=1 HTTP/1.1" 200 2
2024-06-18 00:44:06,547 [ scc.repo] DEBUG - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-18 00:44:06,547 [ scc.repo] DEBUG ## Branches found:
2024-06-18 00:44:06,547 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-18 00:44:06,547 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:06,547 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:06,555 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 00:44:06,563 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 00:44:06,564 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 00:44:06,572 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 00:44:06,581 [ scc.git] DEBUG Already up to date.
2024-06-18 00:44:06,581 [ scc.git] DEBUG Calling 'git fetch origin pull/111/head'
2024-06-18 00:44:06,967 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2024-06-18 00:44:06,967 [ scc.git] DEBUG * branch refs/pull/111/head -> FETCH_HEAD
2024-06-18 00:44:06,974 [ scc.git] DEBUG ## Unique users: []
2024-06-18 00:44:06,975 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:06,975 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:06,982 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...37cfaf2f52e78b2cab2f49b0c02c7553d2b57893'
2024-06-18 00:44:06,988 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:06,993 [ 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-06-18 00:44:07,018 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 00:44:07,022 [ scc.git] DEBUG package-lock.json | 18 ++++++------------
2024-06-18 00:44:07,023 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 12 deletions(-)
2024-06-18 00:44:07,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:44:07,187 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 00:44:07,230 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:07,230 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:07,237 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 00:44:07,278 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 00:44:07,286 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f713e90c340> has no local changes
2024-06-18 00:44:07,286 [ 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#99 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/)'
2024-06-18 00:44:07,296 [ scc.git] DEBUG [detached HEAD 3582089] merge master -Dorg -Ssuccess-only
2024-06-18 00:44:07,297 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:44:07,297 [ scc.repo] DEBUG ## PRs found:
2024-06-18 00:44:07,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2024-06-18 00:44:08,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2024-06-18 00:44:08,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2024-06-18 00:44:09,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-18 00:44:09,607 [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-06-18 00:44:10,072 [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-06-18 00:44:10,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2024-06-18 00:44:11,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2024-06-18 00:44:11,007 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-18 00:44:11,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2024-06-18 00:44:12,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2024-06-18 00:44:12,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-18 00:44:13,019 [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-06-18 00:44:13,484 [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-06-18 00:44:13,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2024-06-18 00:44:14,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2024-06-18 00:44:14,417 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2024-06-18 00:44:14,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2024-06-18 00:44:15,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2024-06-18 00:44:15,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-18 00:44:16,405 [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-06-18 00:44:16,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2024-06-18 00:44:17,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2024-06-18 00:44:17,346 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2024-06-18 00:44:17,346 [ scc.repo] DEBUG ## Branches found:
2024-06-18 00:44:17,346 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-18 00:44:17,347 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:17,347 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:17,354 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 00:44:17,360 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 00:44:17,361 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 00:44:17,367 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 00:44:17,374 [ scc.git] DEBUG Already up to date.
2024-06-18 00:44:17,375 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2024-06-18 00:44:17,792 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-18 00:44:17,792 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2024-06-18 00:44:17,799 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2024-06-18 00:44:18,478 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-18 00:44:18,479 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2024-06-18 00:44:18,485 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2024-06-18 00:44:18,903 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2024-06-18 00:44:18,904 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2024-06-18 00:44:18,910 [ scc.git] DEBUG ## Unique users: []
2024-06-18 00:44:18,911 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:18,911 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:18,918 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-18 00:44:18,928 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:18,936 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2024-06-18 00:44:18,951 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2024-06-18 00:44:18,952 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 00:44:18,956 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2024-06-18 00:44:18,956 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2024-06-18 00:44:18,956 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2024-06-18 00:44:19,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:44:19,144 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-18 00:44:19,155 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:19,163 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2024-06-18 00:44:19,322 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2024-06-18 00:44:19,322 [ scc.git] DEBUG Auto-merging src/app/context.js
2024-06-18 00:44:19,322 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2024-06-18 00:44:19,322 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2024-06-18 00:44:19,323 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 00:44:19,332 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2024-06-18 00:44:19,332 [ scc.git] DEBUG src/app/context.js | 6 +-
2024-06-18 00:44:19,332 [ scc.git] DEBUG src/app/header.html | 5 +
2024-06-18 00:44:19,332 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2024-06-18 00:44:19,332 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2024-06-18 00:44:19,332 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2024-06-18 00:44:19,332 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2024-06-18 00:44:19,332 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2024-06-18 00:44:19,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:44:19,541 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-18 00:44:19,549 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:19,558 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2024-06-18 00:44:19,579 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2024-06-18 00:44:19,580 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 00:44:19,585 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2024-06-18 00:44:19,585 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2024-06-18 00:44:19,585 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2024-06-18 00:44:19,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:44:19,955 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 00:44:19,998 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:19,998 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:20,006 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 00:44:20,052 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 00:44:20,063 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f713e8c78e0> has no local changes
2024-06-18 00:44:20,064 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- 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'
Generated by OMERO-plugins-push#99 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/)'
2024-06-18 00:44:20,075 [ scc.git] DEBUG [detached HEAD d6861f2] merge master -Dorg -Ssuccess-only
2024-06-18 00:44:20,076 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:44:20,076 [ scc.repo] DEBUG ## PRs found:
2024-06-18 00:44:20,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2024-06-18 00:44:20,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2024-06-18 00:44:21,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2024-06-18 00:44:21,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-18 00:44:22,394 [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-06-18 00:44:22,922 [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-06-18 00:44:23,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2024-06-18 00:44:23,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2024-06-18 00:44:23,836 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2024-06-18 00:44:23,837 [ scc.repo] DEBUG ## Branches found:
2024-06-18 00:44:23,837 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-18 00:44:23,837 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:23,837 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:23,843 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 00:44:23,850 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 00:44:23,851 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 00:44:23,858 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 00:44:23,865 [ scc.git] DEBUG Already up to date.
2024-06-18 00:44:23,865 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2024-06-18 00:44:24,292 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2024-06-18 00:44:24,293 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2024-06-18 00:44:24,299 [ scc.git] DEBUG ## Unique users: []
2024-06-18 00:44:24,299 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:24,299 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:24,307 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-18 00:44:24,315 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:24,322 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2024-06-18 00:44:24,337 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 00:44:24,340 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2024-06-18 00:44:24,340 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2024-06-18 00:44:24,340 [ scc.git] DEBUG requirements.txt | 2 +-
2024-06-18 00:44:24,340 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2024-06-18 00:44:24,340 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2024-06-18 00:44:24,340 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2024-06-18 00:44:24,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:44:24,511 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 00:44:24,553 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:24,553 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:24,560 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 00:44:24,611 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 00:44:24,618 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f713c067bb0> has no local changes
2024-06-18 00:44:24,619 [ 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#99 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/)'
2024-06-18 00:44:24,627 [ scc.git] DEBUG [detached HEAD 78c064c] merge master -Dorg -Ssuccess-only
2024-06-18 00:44:24,628 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:44:24,628 [ scc.repo] DEBUG ## PRs found:
2024-06-18 00:44:25,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2024-06-18 00:44:25,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2024-06-18 00:44:26,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2024-06-18 00:44:26,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-18 00:44:26,960 [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-06-18 00:44:27,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2024-06-18 00:44:27,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2024-06-18 00:44:27,820 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-18 00:44:28,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2024-06-18 00:44:28,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2024-06-18 00:44:29,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-18 00:44:29,687 [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-06-18 00:44:30,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2024-06-18 00:44:30,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2024-06-18 00:44:30,586 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-18 00:44:30,587 [ scc.repo] DEBUG ## Branches found:
2024-06-18 00:44:30,587 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-18 00:44:30,587 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:30,587 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:30,594 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 00:44:30,600 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 00:44:30,600 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 00:44:30,608 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 00:44:30,615 [ scc.git] DEBUG Already up to date.
2024-06-18 00:44:30,615 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2024-06-18 00:44:31,029 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-18 00:44:31,029 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2024-06-18 00:44:31,035 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2024-06-18 00:44:31,422 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2024-06-18 00:44:31,422 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2024-06-18 00:44:31,429 [ scc.git] DEBUG ## Unique users: []
2024-06-18 00:44:31,429 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:31,429 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:31,436 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-18 00:44:31,444 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:31,451 [ 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-06-18 00:44:31,482 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2024-06-18 00:44:31,483 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2024-06-18 00:44:31,483 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-18 00:44:31,483 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-18 00:44:31,483 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-18 00:44:31,483 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-18 00:44:31,492 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-18 00:44:31,502 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-18 00:44:31,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:44:31,666 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2024-06-18 00:44:31,675 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-18 00:44:31,694 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#99](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2024-06-18 00:44:31,703 [ scc.config] DEBUG Found github.token
2024-06-18 00:44:31,703 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2024-06-18 00:44:31,704 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-18 00:44:31,715 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:31,724 [ 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-06-18 00:44:31,751 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2024-06-18 00:44:31,752 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2024-06-18 00:44:31,752 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2024-06-18 00:44:31,752 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-18 00:44:31,752 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-18 00:44:31,762 [ scc.git] DEBUG Calling 'git reset --hard e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-18 00:44:31,773 [ scc.git] DEBUG HEAD is now at e2fc5ec Merge pull request #85 from sbesson/pytest_logging
2024-06-18 00:44:32,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:44:32,067 [ scc.git] DEBUG Calling 'git merge-base e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c 78e55539b68e351ed5ef202854718b49a37729a7'
2024-06-18 00:44:32,075 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..e2fc5ec5aeb38953ac2a12cb7c980aeee5bf306c'
2024-06-18 00:44:32,081 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#99](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/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-06-18 00:44:32,087 [ scc.config] DEBUG Found github.token
2024-06-18 00:44:32,087 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2024-06-18 00:44:32,087 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 00:44:32,127 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:32,127 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:32,132 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 00:44:32,171 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 00:44:32,179 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f713e89ad30> has no local changes
2024-06-18 00:44:32,179 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Generated by OMERO-plugins-push#99 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/)'
2024-06-18 00:44:32,188 [ scc.git] DEBUG [detached HEAD 24cd0b4] merge master -Dorg -Ssuccess-only
2024-06-18 00:44:32,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:44:32,189 [ scc.repo] DEBUG ## PRs found:
2024-06-18 00:44:32,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2024-06-18 00:44:33,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/131 HTTP/1.1" 200 None
2024-06-18 00:44:33,097 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-18 00:44:33,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-18 00:44:34,155 [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-06-18 00:44:34,639 [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-06-18 00:44:35,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/a7d2dc0dc9098294c014cb634e1226fea404721f HTTP/1.1" 200 None
2024-06-18 00:44:35,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/a7d2dc0dc9098294c014cb634e1226fea404721f?per_page=1 HTTP/1.1" 200 2
2024-06-18 00:44:35,575 [ scc.repo] DEBUG - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-18 00:44:36,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/129 HTTP/1.1" 200 None
2024-06-18 00:44:36,046 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-18 00:44:36,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-18 00:44:37,117 [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-06-18 00:44:37,602 [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-06-18 00:44:38,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/733f52703019d4b6d7e375c121a25c107b64dbec HTTP/1.1" 200 None
2024-06-18 00:44:38,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/733f52703019d4b6d7e375c121a25c107b64dbec?per_page=1 HTTP/1.1" 200 2
2024-06-18 00:44:38,477 [ scc.repo] DEBUG - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-18 00:44:38,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/128 HTTP/1.1" 200 None
2024-06-18 00:44:38,952 [ scc.repo] DEBUG # ... Include label: dependencies
2024-06-18 00:44:39,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-18 00:44:40,026 [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-06-18 00:44:40,540 [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-06-18 00:44:41,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/55ca13b67cc0254ed6e1a340952b8741cc54d680 HTTP/1.1" 200 None
2024-06-18 00:44:41,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/55ca13b67cc0254ed6e1a340952b8741cc54d680?per_page=1 HTTP/1.1" 200 2
2024-06-18 00:44:41,617 [ scc.repo] DEBUG - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-18 00:44:42,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2024-06-18 00:44:42,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2024-06-18 00:44:42,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2024-06-18 00:44:43,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2024-06-18 00:44:43,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2024-06-18 00:44:44,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2024-06-18 00:44:44,523 [ scc.repo] DEBUG ## Branches found:
2024-06-18 00:44:44,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-18 00:44:44,523 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:44,523 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:44,529 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 00:44:44,535 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 00:44:44,536 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 00:44:44,541 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 00:44:44,548 [ scc.git] DEBUG Already up to date.
2024-06-18 00:44:44,548 [ scc.git] DEBUG Calling 'git fetch origin pull/128/head'
2024-06-18 00:44:44,918 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-18 00:44:44,918 [ scc.git] DEBUG * branch refs/pull/128/head -> FETCH_HEAD
2024-06-18 00:44:44,922 [ scc.git] DEBUG Calling 'git fetch origin pull/129/head'
2024-06-18 00:44:45,336 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-18 00:44:45,336 [ scc.git] DEBUG * branch refs/pull/129/head -> FETCH_HEAD
2024-06-18 00:44:45,341 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-06-18 00:44:45,737 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2024-06-18 00:44:45,737 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-06-18 00:44:45,744 [ scc.git] DEBUG ## Unique users: []
2024-06-18 00:44:45,744 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:45,744 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:45,752 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...55ca13b67cc0254ed6e1a340952b8741cc54d680'
2024-06-18 00:44:45,762 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:45,771 [ 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-06-18 00:44:45,787 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 00:44:45,791 [ scc.git] DEBUG package-lock.json | 12 ++++++++----
2024-06-18 00:44:45,791 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 4 deletions(-)
2024-06-18 00:44:45,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:44:45,955 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...733f52703019d4b6d7e375c121a25c107b64dbec'
2024-06-18 00:44:45,965 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:45,974 [ 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-06-18 00:44:45,991 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-18 00:44:45,992 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 00:44:45,995 [ scc.git] DEBUG package-lock.json | 121 +++++++++++++++++++++++++++---------------------------
2024-06-18 00:44:45,996 [ scc.git] DEBUG 1 file changed, 61 insertions(+), 60 deletions(-)
2024-06-18 00:44:46,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:44:46,358 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a7d2dc0dc9098294c014cb634e1226fea404721f'
2024-06-18 00:44:46,368 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:46,378 [ 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-06-18 00:44:46,413 [ scc.git] DEBUG Auto-merging package-lock.json
2024-06-18 00:44:46,413 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 00:44:46,417 [ scc.git] DEBUG package-lock.json | 8 ++++----
2024-06-18 00:44:46,417 [ scc.git] DEBUG package.json | 2 +-
2024-06-18 00:44:46,417 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2024-06-18 00:44:46,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:44:46,755 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 00:44:46,811 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:46,812 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:46,820 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 00:44:46,870 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 00:44:46,880 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f713c020640> has no local changes
2024-06-18 00:44:46,881 [ 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#99 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/)'
2024-06-18 00:44:46,893 [ scc.git] DEBUG [detached HEAD 91aa431] merge master -Dorg -Ssuccess-only
2024-06-18 00:44:46,894 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:44:46,894 [ scc.repo] DEBUG ## PRs found:
2024-06-18 00:44:47,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2024-06-18 00:44:47,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/14 HTTP/1.1" 200 None
2024-06-18 00:44:48,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-18 00:44:48,726 [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-06-18 00:44:49,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/fb7700b8eb4b753884260b7921e65b58b29f954e HTTP/1.1" 200 None
2024-06-18 00:44:49,565 [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-06-18 00:44:49,566 [ scc.repo] DEBUG - PR 14 jburel 'use conda-forge channel'
2024-06-18 00:44:49,566 [ scc.repo] DEBUG ## Branches found:
2024-06-18 00:44:49,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-18 00:44:49,566 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:49,566 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:49,573 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 00:44:49,579 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 00:44:49,580 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 00:44:49,586 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 00:44:49,593 [ scc.git] DEBUG Already up to date.
2024-06-18 00:44:49,593 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-18 00:44:49,962 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2024-06-18 00:44:49,962 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-18 00:44:49,967 [ scc.git] DEBUG ## Unique users: []
2024-06-18 00:44:49,967 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:49,967 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:49,975 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-18 00:44:49,982 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:49,989 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (use conda-forge channel) fb7700b8eb4b753884260b7921e65b58b29f954e'
2024-06-18 00:44:49,999 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 00:44:50,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:44:50,163 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 00:44:50,216 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:50,216 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:50,222 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 00:44:50,269 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 00:44:50,277 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f713e8cabe0> has no local changes
2024-06-18 00:44:50,278 [ 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#99 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/)'
2024-06-18 00:44:50,289 [ scc.git] DEBUG [detached HEAD 9ed1c0d] merge master -Dorg -Ssuccess-only
2024-06-18 00:44:50,289 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:44:50,290 [ scc.repo] DEBUG ## PRs found:
2024-06-18 00:44:50,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2024-06-18 00:44:51,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/28 HTTP/1.1" 200 None
2024-06-18 00:44:51,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6 HTTP/1.1" 200 None
2024-06-18 00:44:52,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/6/comments HTTP/1.1" 200 None
2024-06-18 00:44:52,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-18 00:44:53,076 [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-06-18 00:44:53,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/20757563a49aa42b99a0c43176f6ef747e965b61 HTTP/1.1" 200 None
2024-06-18 00:44:54,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/20757563a49aa42b99a0c43176f6ef747e965b61?per_page=1 HTTP/1.1" 200 2
2024-06-18 00:44:54,001 [ scc.repo] DEBUG - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-18 00:44:54,001 [ scc.repo] DEBUG ## Branches found:
2024-06-18 00:44:54,001 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-18 00:44:54,002 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:54,002 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:54,008 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 00:44:54,014 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 00:44:54,014 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 00:44:54,019 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 00:44:54,027 [ scc.git] DEBUG Already up to date.
2024-06-18 00:44:54,028 [ scc.git] DEBUG Calling 'git fetch origin pull/6/head'
2024-06-18 00:44:54,490 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2024-06-18 00:44:54,491 [ scc.git] DEBUG * branch refs/pull/6/head -> FETCH_HEAD
2024-06-18 00:44:54,496 [ scc.git] DEBUG ## Unique users: []
2024-06-18 00:44:54,496 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:54,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:54,504 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20757563a49aa42b99a0c43176f6ef747e965b61'
2024-06-18 00:44:54,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:54,522 [ 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-06-18 00:44:54,536 [ scc.git] DEBUG Auto-merging src/omero_rois/library.py
2024-06-18 00:44:54,537 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 00:44:54,540 [ scc.git] DEBUG src/omero_rois/library.py | 33 +++++++++++++++++++++++++++++++++
2024-06-18 00:44:54,540 [ scc.git] DEBUG 1 file changed, 33 insertions(+)
2024-06-18 00:44:54,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:44:54,714 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 00:44:54,773 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:54,773 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:54,781 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 00:44:54,833 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 00:44:54,843 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f711c7c8550> has no local changes
2024-06-18 00:44:54,843 [ 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#99 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/)'
2024-06-18 00:44:54,857 [ scc.git] DEBUG [detached HEAD 24fd7dc] merge master -Dorg -Ssuccess-only
2024-06-18 00:44:54,858 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:44:54,859 [ scc.repo] DEBUG ## PRs found:
2024-06-18 00:44:55,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2024-06-18 00:44:55,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2024-06-18 00:44:56,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2024-06-18 00:44:56,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-18 00:44:57,193 [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-06-18 00:44:57,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2024-06-18 00:44:58,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2024-06-18 00:44:58,175 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-18 00:44:58,175 [ scc.repo] DEBUG ## Branches found:
2024-06-18 00:44:58,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-18 00:44:58,176 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:58,176 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:58,182 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 00:44:58,190 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 00:44:58,190 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 00:44:58,196 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 00:44:58,203 [ scc.git] DEBUG Already up to date.
2024-06-18 00:44:58,203 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2024-06-18 00:44:58,652 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2024-06-18 00:44:58,652 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2024-06-18 00:44:58,658 [ scc.git] DEBUG ## Unique users: []
2024-06-18 00:44:58,658 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:58,658 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:58,665 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-18 00:44:58,674 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:58,683 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-18 00:44:58,710 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2024-06-18 00:44:58,711 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2024-06-18 00:44:58,711 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2024-06-18 00:44:58,711 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2024-06-18 00:44:58,711 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2024-06-18 00:44:58,711 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2024-06-18 00:44:58,711 [ scc.git] DEBUG Auto-merging setup.py
2024-06-18 00:44:58,711 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2024-06-18 00:44:58,711 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-18 00:44:58,711 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-18 00:44:58,718 [ scc.git] DEBUG Calling 'git reset --hard c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-18 00:44:58,728 [ scc.git] DEBUG HEAD is now at c8610db Bump version: 0.3.3 → 0.3.4.dev0
2024-06-18 00:44:58,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:44:58,898 [ scc.git] DEBUG Calling 'git merge-base c8610dba25f39870a09fa5401c735fb3be85a319 b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2024-06-18 00:44:58,908 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..c8610dba25f39870a09fa5401c735fb3be85a319'
2024-06-18 00:44:58,920 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#99](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
- omero_signup/urls.py
--conflicts
2024-06-18 00:44:58,927 [ scc.config] DEBUG Found github.token
2024-06-18 00:44:58,928 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2024-06-18 00:44:58,928 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 00:44:58,974 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:44:58,975 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:44:58,981 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 00:44:59,028 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 00:44:59,038 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f713c07df40> has no local changes
2024-06-18 00:44:59,038 [ 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#99 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/)'
2024-06-18 00:44:59,052 [ scc.git] DEBUG [detached HEAD 7c540e0] merge master -Dorg -Ssuccess-only
2024-06-18 00:44:59,052 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:44:59,053 [ scc.repo] DEBUG ## PRs found:
2024-06-18 00:44:59,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2024-06-18 00:44:59,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2024-06-18 00:45:00,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2024-06-18 00:45:00,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-18 00:45:01,368 [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-06-18 00:45:01,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2024-06-18 00:45:02,250 [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-06-18 00:45:02,251 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-18 00:45:02,251 [ scc.repo] DEBUG ## Branches found:
2024-06-18 00:45:02,251 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-18 00:45:02,251 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:45:02,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:02,259 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 00:45:02,266 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 00:45:02,267 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 00:45:02,275 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 00:45:02,283 [ scc.git] DEBUG Already up to date.
2024-06-18 00:45:02,284 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2024-06-18 00:45:02,754 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2024-06-18 00:45:02,754 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2024-06-18 00:45:02,760 [ scc.git] DEBUG ## Unique users: []
2024-06-18 00:45:02,761 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:45:02,761 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:02,769 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2024-06-18 00:45:02,777 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:02,783 [ 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-06-18 00:45:02,809 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-18 00:45:02,812 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2024-06-18 00:45:02,812 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2024-06-18 00:45:02,812 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2024-06-18 00:45:02,812 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2024-06-18 00:45:02,812 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2024-06-18 00:45:02,812 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2024-06-18 00:45:02,815 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2024-06-18 00:45:02,816 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2024-06-18 00:45:02,816 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2024-06-18 00:45:02,816 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2024-06-18 00:45:02,816 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2024-06-18 00:45:02,816 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2024-06-18 00:45:02,816 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2024-06-18 00:45:02,816 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2024-06-18 00:45:02,816 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2024-06-18 00:45:02,816 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2024-06-18 00:45:02,816 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2024-06-18 00:45:02,816 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2024-06-18 00:45:02,816 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2024-06-18 00:45:02,816 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2024-06-18 00:45:02,816 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2024-06-18 00:45:02,816 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2024-06-18 00:45:02,816 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2024-06-18 00:45:02,816 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2024-06-18 00:45:02,816 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2024-06-18 00:45:02,817 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2024-06-18 00:45:02,817 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2024-06-18 00:45:02,817 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2024-06-18 00:45:02,817 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2024-06-18 00:45:02,817 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2024-06-18 00:45:02,817 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2024-06-18 00:45:02,817 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2024-06-18 00:45:02,817 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2024-06-18 00:45:02,817 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2024-06-18 00:45:02,817 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2024-06-18 00:45:02,817 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2024-06-18 00:45:02,817 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2024-06-18 00:45:02,817 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2024-06-18 00:45:02,817 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2024-06-18 00:45:02,817 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2024-06-18 00:45:02,817 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2024-06-18 00:45:02,817 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2024-06-18 00:45:02,817 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2024-06-18 00:45:02,817 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2024-06-18 00:45:02,817 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2024-06-18 00:45:02,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:02,982 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 00:45:03,020 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:45:03,021 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:03,026 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 00:45:03,065 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 00:45:03,074 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f711c7c8730> has no local changes
2024-06-18 00:45:03,074 [ 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#99 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/)'
2024-06-18 00:45:03,084 [ scc.git] DEBUG [detached HEAD 8ed53e4] merge master -Dorg -Ssuccess-only
2024-06-18 00:45:03,085 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:03,085 [ scc.repo] DEBUG ## PRs found:
2024-06-18 00:45:03,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2024-06-18 00:45:03,431 [ scc.repo] DEBUG ## Branches found:
2024-06-18 00:45:03,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-18 00:45:03,431 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:45:03,431 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:03,441 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 00:45:03,451 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 00:45:03,451 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 00:45:03,463 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 00:45:03,473 [ scc.git] DEBUG Already up to date.
2024-06-18 00:45:03,474 [ scc.git] DEBUG ## Unique users: []
2024-06-18 00:45:03,474 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:45:03,474 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:03,482 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 00:45:03,534 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:45:03,535 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:03,542 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 00:45:03,593 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 00:45:03,608 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f711c7dab80> has no local changes
2024-06-18 00:45:03,609 [ 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#99 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/)'
2024-06-18 00:45:03,626 [ scc.git] DEBUG [detached HEAD 74c9a0e] merge master -Dorg -Ssuccess-only
2024-06-18 00:45:03,627 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:03,627 [ scc.repo] DEBUG ## PRs found:
2024-06-18 00:45:03,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2024-06-18 00:45:03,867 [ scc.repo] DEBUG ## Branches found:
2024-06-18 00:45:03,867 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-18 00:45:03,867 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:45:03,867 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:03,877 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 00:45:03,887 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 00:45:03,887 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 00:45:03,898 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 00:45:03,909 [ scc.git] DEBUG Already up to date.
2024-06-18 00:45:03,909 [ scc.git] DEBUG ## Unique users: []
2024-06-18 00:45:03,910 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:45:03,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:03,917 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 00:45:03,974 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:45:03,974 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:03,984 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 00:45:04,025 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 00:45:04,035 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f713c044d90> has no local changes
2024-06-18 00:45:04,035 [ 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#99 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/)'
2024-06-18 00:45:04,047 [ scc.git] DEBUG [detached HEAD 901ed9a] merge master -Dorg -Ssuccess-only
2024-06-18 00:45:04,047 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:04,048 [ scc.git] INFO Overriding base-branch from master to main
2024-06-18 00:45:04,048 [ scc.repo] DEBUG ## PRs found:
2024-06-18 00:45:04,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2024-06-18 00:45:04,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2024-06-18 00:45:05,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2024-06-18 00:45:05,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2024-06-18 00:45:06,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-18 00:45:06,838 [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-06-18 00:45:07,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-18 00:45:07,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2024-06-18 00:45:08,243 [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-06-18 00:45:08,244 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-18 00:45:08,244 [ scc.repo] DEBUG ## Branches found:
2024-06-18 00:45:08,244 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-18 00:45:08,244 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:45:08,244 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:08,251 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2024-06-18 00:45:08,257 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 00:45:08,258 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2024-06-18 00:45:08,264 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2024-06-18 00:45:08,271 [ scc.git] DEBUG Already up to date.
2024-06-18 00:45:08,271 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2024-06-18 00:45:08,707 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2024-06-18 00:45:08,707 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2024-06-18 00:45:08,713 [ scc.git] DEBUG ## Unique users: []
2024-06-18 00:45:08,713 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:45:08,713 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:08,720 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-18 00:45:08,727 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:08,735 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-18 00:45:08,745 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2024-06-18 00:45:08,745 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2024-06-18 00:45:08,745 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-18 00:45:08,746 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-18 00:45:08,754 [ scc.git] DEBUG Calling 'git reset --hard 67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-18 00:45:08,764 [ scc.git] DEBUG HEAD is now at 67bb245 Bump version: 0.1.1 → 0.1.2.dev0
2024-06-18 00:45:08,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:08,937 [ scc.git] DEBUG Calling 'git merge-base 67bb245b8b08709e04a8bf52b02de2298a029a94 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2024-06-18 00:45:08,945 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..67bb245b8b08709e04a8bf52b02de2298a029a94'
2024-06-18 00:45:08,952 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#99](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2024-06-18 00:45:08,965 [ scc.config] DEBUG Found github.token
2024-06-18 00:45:08,966 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2024-06-18 00:45:08,966 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 00:45:09,011 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:45:09,011 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:09,019 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 00:45:09,069 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 00:45:09,076 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f713c039df0> has no local changes
2024-06-18 00:45:09,076 [ 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#99 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/)'
2024-06-18 00:45:09,084 [ scc.git] DEBUG [detached HEAD e18d5a0] merge master -Dorg -Ssuccess-only
2024-06-18 00:45:09,085 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:09,085 [ scc.repo] DEBUG ## PRs found:
2024-06-18 00:45:09,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2024-06-18 00:45:09,361 [ scc.repo] DEBUG ## Branches found:
2024-06-18 00:45:09,361 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-18 00:45:09,361 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:45:09,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:09,367 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 00:45:09,372 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 00:45:09,372 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 00:45:09,378 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 00:45:09,384 [ scc.git] DEBUG Already up to date.
2024-06-18 00:45:09,384 [ scc.git] DEBUG ## Unique users: []
2024-06-18 00:45:09,384 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:45:09,384 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:09,389 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 00:45:09,427 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:45:09,427 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:09,433 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 00:45:09,470 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 00:45:09,477 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f711c7f6e80> has no local changes
2024-06-18 00:45:09,477 [ 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#99 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/)'
2024-06-18 00:45:09,486 [ scc.git] DEBUG [detached HEAD 9367bfa] merge master -Dorg -Ssuccess-only
2024-06-18 00:45:09,486 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:09,486 [ scc.repo] DEBUG ## PRs found:
2024-06-18 00:45:09,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2024-06-18 00:45:09,782 [ scc.repo] DEBUG ## Branches found:
2024-06-18 00:45:09,782 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-18 00:45:09,782 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:45:09,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:09,788 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 00:45:09,793 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 00:45:09,793 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 00:45:09,799 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 00:45:09,807 [ scc.git] DEBUG Already up to date.
2024-06-18 00:45:09,807 [ scc.git] DEBUG ## Unique users: []
2024-06-18 00:45:09,807 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:45:09,807 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:09,816 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 00:45:09,859 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:45:09,859 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:09,867 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 00:45:09,906 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 00:45:09,912 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f711c743400> has no local changes
2024-06-18 00:45:09,913 [ 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#99 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/)'
2024-06-18 00:45:09,922 [ scc.git] DEBUG [detached HEAD 071321d] merge master -Dorg -Ssuccess-only
2024-06-18 00:45:09,923 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:09,923 [ scc.repo] DEBUG ## PRs found:
2024-06-18 00:45:10,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2024-06-18 00:45:10,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2024-06-18 00:45:11,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2024-06-18 00:45:11,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-18 00:45:12,152 [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-06-18 00:45:12,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2024-06-18 00:45:13,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2024-06-18 00:45:13,017 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2024-06-18 00:45:13,018 [ scc.repo] DEBUG ## Branches found:
2024-06-18 00:45:13,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-18 00:45:13,018 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:45:13,018 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:13,025 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-18 00:45:13,031 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 00:45:13,032 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-18 00:45:13,040 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-18 00:45:13,048 [ scc.git] DEBUG Already up to date.
2024-06-18 00:45:13,048 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-06-18 00:45:13,445 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2024-06-18 00:45:13,446 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-06-18 00:45:13,453 [ scc.git] DEBUG ## Unique users: []
2024-06-18 00:45:13,453 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:45:13,453 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:13,460 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-18 00:45:13,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:13,478 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-18 00:45:13,490 [ scc.git] DEBUG Auto-merging Dockerfile
2024-06-18 00:45:13,491 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2024-06-18 00:45:13,491 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-18 00:45:13,491 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-18 00:45:13,500 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-18 00:45:13,513 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2024-06-18 00:45:13,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:13,699 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2024-06-18 00:45:13,705 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2024-06-18 00:45:13,712 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#99](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2024-06-18 00:45:13,718 [ scc.config] DEBUG Found github.token
2024-06-18 00:45:13,718 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2024-06-18 00:45:13,718 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 00:45:13,757 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:45:13,758 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:13,764 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 00:45:13,803 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 00:45:13,811 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f711c789b80> has no local changes
2024-06-18 00:45:13,811 [ 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#99 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/)'
2024-06-18 00:45:13,820 [ scc.git] DEBUG [detached HEAD c10ebd7] merge master -Dorg -Ssuccess-only
2024-06-18 00:45:13,820 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:13,821 [ scc.git] INFO Overriding base-branch from master to develop
2024-06-18 00:45:13,821 [ scc.repo] DEBUG ## PRs found:
2024-06-18 00:45:14,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-06-18 00:45:14,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-06-18 00:45:15,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-06-18 00:45:15,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-06-18 00:45:16,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-06-18 00:45:16,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-06-18 00:45:17,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-06-18 00:45:17,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-18 00:45:18,276 [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-06-18 00:45:18,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-18 00:45:19,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-06-18 00:45:19,121 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-18 00:45:19,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-06-18 00:45:20,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-06-18 00:45:20,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-06-18 00:45:21,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-06-18 00:45:21,217 [ scc.repo] DEBUG ## Branches found:
2024-06-18 00:45:21,218 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-18 00:45:21,218 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:45:21,218 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:21,225 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-06-18 00:45:21,232 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-18 00:45:21,233 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-06-18 00:45:21,241 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-06-18 00:45:21,249 [ scc.git] DEBUG Already up to date.
2024-06-18 00:45:21,250 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-06-18 00:45:21,661 [ scc.git] DEBUG From https://github.com/ome/scripts
2024-06-18 00:45:21,661 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-06-18 00:45:21,666 [ scc.git] DEBUG ## Unique users: []
2024-06-18 00:45:21,666 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:45:21,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:21,673 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-18 00:45:21,680 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:21,687 [ 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-06-18 00:45:21,736 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-06-18 00:45:21,736 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-06-18 00:45:21,737 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-18 00:45:21,737 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-18 00:45:21,744 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-18 00:45:21,752 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-06-18 00:45:21,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:21,903 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-18 00:45:21,912 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-18 00:45:21,919 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#99](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-06-18 00:45:21,926 [ scc.config] DEBUG Found github.token
2024-06-18 00:45:21,926 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-06-18 00:45:21,927 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-18 00:45:21,969 [ scc.git] DEBUG Get sha1 of %s
2024-06-18 00:45:21,970 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-18 00:45:21,977 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 00:45:22,019 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 00:45:22,027 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f711c779d60> has no local changes
2024-06-18 00:45:22,027 [ 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#99 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/)'
2024-06-18 00:45:22,036 [ scc.git] DEBUG [detached HEAD 83578ce] merge master -Dorg -Ssuccess-only
2024-06-18 00:45:22,037 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:22,037 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-18 00:45:22,119 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2024-06-18 00:45:22,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:22,357 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2024-06-18 00:45:22,363 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2024-06-18 00:45:22,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:22,803 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2024-06-18 00:45:22,809 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2024-06-18 00:45:23,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:23,221 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2024-06-18 00:45:23,226 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2024-06-18 00:45:23,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:23,642 [ scc.config] DEBUG Found submodule.omero-figure.url
2024-06-18 00:45:24,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:24,044 [ scc.config] DEBUG Found submodule.omero-figure.branch
2024-06-18 00:45:24,049 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2024-06-18 00:45:24,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:24,447 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2024-06-18 00:45:24,452 [ scc.config] DEBUG Found submodule.omero-gallery.url
2024-06-18 00:45:24,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:24,880 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2024-06-18 00:45:24,887 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2024-06-18 00:45:25,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:25,292 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2024-06-18 00:45:25,297 [ scc.config] DEBUG Found submodule.omero-mapr.url
2024-06-18 00:45:25,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:25,708 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2024-06-18 00:45:25,713 [ scc.config] DEBUG Found submodule.omero-metadata.url
2024-06-18 00:45:26,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:26,103 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2024-06-18 00:45:26,108 [ scc.config] DEBUG Found submodule.omero-parade.url
2024-06-18 00:45:26,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:26,552 [ scc.config] DEBUG Found submodule.omero-parade.branch
2024-06-18 00:45:26,563 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2024-06-18 00:45:26,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:26,993 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2024-06-18 00:45:26,997 [ scc.config] DEBUG Found submodule.omero-rois.url
2024-06-18 00:45:27,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:27,401 [ scc.config] DEBUG Found submodule.omero-signup.url
2024-06-18 00:45:27,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:27,819 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2024-06-18 00:45:28,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:28,229 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2024-06-18 00:45:28,234 [ scc.config] DEBUG Found submodule.omero-upload.url
2024-06-18 00:45:28,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:28,651 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2024-06-18 00:45:29,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:29,067 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2024-06-18 00:45:29,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:29,468 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2024-06-18 00:45:29,472 [ scc.config] DEBUG Found submodule.omero-weberror.url
2024-06-18 00:45:29,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:29,883 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2024-06-18 00:45:29,888 [ scc.config] DEBUG Found submodule.omero-webtest.url
2024-06-18 00:45:30,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:30,330 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2024-06-18 00:45:30,335 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2024-06-18 00:45:30,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:30,789 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2024-06-18 00:45:30,796 [ scc.config] DEBUG Found submodule.scripts.url
2024-06-18 00:45:31,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-18 00:45:31,216 [ scc.config] DEBUG Found submodule.scripts.branch
2024-06-18 00:45:31,216 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-18 00:45:31,303 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f713f9bbc40> has local changes
2024-06-18 00:45:31,304 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
- PR 375 dependabot[bot] 'Bump omero-figure from `3d9e3b8` to `ffc7e07`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
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'
- PR 63 sbesson 'Remove python-future dependency'
- PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
- PR 65 will-moore 'gateway_required() uses omero_user_token if no username and password'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
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 560 will-moore 'Max projection bytes' (exclude comment)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Already up to date.
Merged PRs:
- PR 549 will-moore 'Inset feature'
- PR 555 will-moore 'Points in shape editor'
- PR 567 jburel 'cap numpy to less than 2'
Conflicting PRs (not included):
- PR 568 will-moore 'Remove numpy from tests_require in setup.py'
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 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'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
Repository: ome/omero-metadata
Already up to date.
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 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#99 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/99/)'
2024-06-18 00:45:31,319 [ scc.git] DEBUG [detached HEAD 49a87f1] merge master -Dorg -Ssuccess-only
2024-06-18 00:45:31,319 [ scc.merge] INFO Repository: ome/omero-plugins
2024-06-18 00:45:31,319 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2024-06-18 00:45:31,319 [ scc.merge] INFO Already up to date.
2024-06-18 00:45:31,319 [ scc.merge] INFO
2024-06-18 00:45:31,319 [ scc.merge] INFO Merged PRs:
2024-06-18 00:45:31,319 [ scc.merge] INFO - PR 373 dependabot[bot] 'Bump omero-test-infra from `7688c54` to `cda3ec6`'
2024-06-18 00:45:31,319 [ scc.merge] INFO - PR 375 dependabot[bot] 'Bump omero-figure from `3d9e3b8` to `ffc7e07`'
2024-06-18 00:45:31,319 [ scc.merge] INFO
2024-06-18 00:45:31,320 [ scc.merge] INFO Repository: ome/minimal-omero-client
2024-06-18 00:45:31,320 [ scc.merge] INFO Already up to date.
2024-06-18 00:45:31,320 [ scc.merge] INFO
2024-06-18 00:45:31,320 [ scc.merge] INFO
2024-06-18 00:45:31,320 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2024-06-18 00:45:31,320 [ scc.merge] INFO Excluded PRs:
2024-06-18 00:45:31,320 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2024-06-18 00:45:31,320 [ scc.merge] INFO Already up to date.
2024-06-18 00:45:31,320 [ scc.merge] INFO
2024-06-18 00:45:31,320 [ scc.merge] INFO Merged PRs:
2024-06-18 00:45:31,320 [ scc.merge] INFO - PR 25 jburel 'review message'
2024-06-18 00:45:31,320 [ scc.merge] INFO
2024-06-18 00:45:31,320 [ scc.merge] INFO Repository: ome/omero-cli-render
2024-06-18 00:45:31,320 [ scc.merge] INFO Excluded PRs:
2024-06-18 00:45:31,320 [ scc.merge] INFO - PR 62 dominikl 'Add export and impo(rt) commands' (stage: draft)
2024-06-18 00:45:31,320 [ scc.merge] INFO - PR 54 dominikl 'Change rendering settings spec' (stage: draft)
2024-06-18 00:45:31,320 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2024-06-18 00:45:31,320 [ scc.merge] INFO - PR 48 dominikl 'Don't start rendering engine to get settings' (stage: draft)
2024-06-18 00:45:31,320 [ scc.merge] INFO Already up to date.
2024-06-18 00:45:31,320 [ scc.merge] INFO
2024-06-18 00:45:31,320 [ scc.merge] INFO Merged PRs:
2024-06-18 00:45:31,320 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2024-06-18 00:45:31,320 [ scc.merge] INFO - PR 63 sbesson 'Remove python-future dependency'
2024-06-18 00:45:31,320 [ scc.merge] INFO - PR 64 sbesson 'Fix thumbnail generation with missing rendering definition'
2024-06-18 00:45:31,320 [ scc.merge] INFO - PR 65 will-moore 'gateway_required() uses omero_user_token if no username and password'
2024-06-18 00:45:31,320 [ scc.merge] INFO
2024-06-18 00:45:31,320 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2024-06-18 00:45:31,320 [ scc.merge] INFO Excluded PRs:
2024-06-18 00:45:31,320 [ scc.merge] INFO - PR 161 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-18 00:45:31,320 [ scc.merge] INFO - PR 118 sbesson 'Allow to use bioformats2raw to export HCS data' (stage: draft)
2024-06-18 00:45:31,320 [ scc.merge] INFO Already up to date.
2024-06-18 00:45:31,320 [ scc.merge] INFO
2024-06-18 00:45:31,320 [ scc.merge] INFO Merged PRs:
2024-06-18 00:45:31,320 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2024-06-18 00:45:31,320 [ scc.merge] INFO
2024-06-18 00:45:31,320 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-18 00:45:31,321 [ scc.merge] INFO - PR 102 will-moore 'Zarr export tests'
2024-06-18 00:45:31,321 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID'
2024-06-18 00:45:31,321 [ scc.merge] INFO
2024-06-18 00:45:31,321 [ scc.merge] INFO Repository: ome/omero-figure
2024-06-18 00:45:31,321 [ scc.merge] INFO Excluded PRs:
2024-06-18 00:45:31,321 [ scc.merge] INFO - PR 560 will-moore 'Max projection bytes' (exclude comment)
2024-06-18 00:45:31,321 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2024-06-18 00:45:31,321 [ scc.merge] INFO Already up to date.
2024-06-18 00:45:31,321 [ scc.merge] INFO
2024-06-18 00:45:31,321 [ scc.merge] INFO Merged PRs:
2024-06-18 00:45:31,321 [ scc.merge] INFO - PR 549 will-moore 'Inset feature'
2024-06-18 00:45:31,321 [ scc.merge] INFO - PR 555 will-moore 'Points in shape editor'
2024-06-18 00:45:31,321 [ scc.merge] INFO - PR 567 jburel 'cap numpy to less than 2'
2024-06-18 00:45:31,321 [ scc.merge] INFO
2024-06-18 00:45:31,321 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-18 00:45:31,321 [ scc.merge] INFO - PR 568 will-moore 'Remove numpy from tests_require in setup.py'
2024-06-18 00:45:31,321 [ scc.merge] INFO
2024-06-18 00:45:31,321 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2024-06-18 00:45:31,321 [ scc.merge] INFO Already up to date.
2024-06-18 00:45:31,321 [ scc.merge] INFO
2024-06-18 00:45:31,321 [ scc.merge] INFO Merged PRs:
2024-06-18 00:45:31,321 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2024-06-18 00:45:31,321 [ scc.merge] INFO
2024-06-18 00:45:31,321 [ scc.merge] INFO Repository: ome/omero-gallery
2024-06-18 00:45:31,321 [ scc.merge] INFO Already up to date.
2024-06-18 00:45:31,321 [ scc.merge] INFO
2024-06-18 00:45:31,321 [ scc.merge] INFO Merged PRs:
2024-06-18 00:45:31,321 [ scc.merge] INFO - PR 111 dependabot[bot] 'Bump semver from 5.7.0 to 5.7.2'
2024-06-18 00:45:31,321 [ scc.merge] INFO
2024-06-18 00:45:31,321 [ scc.merge] INFO Repository: ome/omero-iviewer
2024-06-18 00:45:31,321 [ scc.merge] INFO Excluded PRs:
2024-06-18 00:45:31,321 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2024-06-18 00:45:31,321 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2024-06-18 00:45:31,321 [ scc.merge] INFO Already up to date.
2024-06-18 00:45:31,321 [ scc.merge] INFO
2024-06-18 00:45:31,321 [ scc.merge] INFO Merged PRs:
2024-06-18 00:45:31,321 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2024-06-18 00:45:31,322 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2024-06-18 00:45:31,322 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2024-06-18 00:45:31,322 [ scc.merge] INFO
2024-06-18 00:45:31,322 [ scc.merge] INFO Repository: ome/omero-mapr
2024-06-18 00:45:31,322 [ scc.merge] INFO Excluded PRs:
2024-06-18 00:45:31,322 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2024-06-18 00:45:31,322 [ scc.merge] INFO Already up to date.
2024-06-18 00:45:31,322 [ scc.merge] INFO
2024-06-18 00:45:31,322 [ scc.merge] INFO Merged PRs:
2024-06-18 00:45:31,322 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2024-06-18 00:45:31,322 [ scc.merge] INFO
2024-06-18 00:45:31,322 [ scc.merge] INFO Repository: ome/omero-metadata
2024-06-18 00:45:31,322 [ scc.merge] INFO Already up to date.
2024-06-18 00:45:31,322 [ scc.merge] INFO
2024-06-18 00:45:31,322 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-18 00:45:31,322 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2024-06-18 00:45:31,322 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2024-06-18 00:45:31,322 [ scc.merge] INFO
2024-06-18 00:45:31,322 [ scc.merge] INFO Repository: ome/omero-parade
2024-06-18 00:45:31,322 [ scc.merge] INFO Excluded PRs:
2024-06-18 00:45:31,322 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2024-06-18 00:45:31,322 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2024-06-18 00:45:31,322 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2024-06-18 00:45:31,322 [ scc.merge] INFO Already up to date.
2024-06-18 00:45:31,322 [ scc.merge] INFO
2024-06-18 00:45:31,322 [ scc.merge] INFO Merged PRs:
2024-06-18 00:45:31,322 [ scc.merge] INFO - PR 128 dependabot[bot] 'Bump postcss from 8.4.21 to 8.4.31'
2024-06-18 00:45:31,322 [ scc.merge] INFO - PR 129 dependabot[bot] 'Bump @babel/traverse from 7.21.4 to 7.23.2'
2024-06-18 00:45:31,322 [ scc.merge] INFO - PR 131 dependabot[bot] 'Bump axios from 1.3.5 to 1.6.0'
2024-06-18 00:45:31,322 [ scc.merge] INFO
2024-06-18 00:45:31,322 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2024-06-18 00:45:31,323 [ scc.merge] INFO Already up to date.
2024-06-18 00:45:31,323 [ scc.merge] INFO
2024-06-18 00:45:31,323 [ scc.merge] INFO Merged PRs:
2024-06-18 00:45:31,323 [ scc.merge] INFO - PR 14 jburel 'use conda-forge channel'
2024-06-18 00:45:31,323 [ scc.merge] INFO
2024-06-18 00:45:31,323 [ scc.merge] INFO Repository: ome/omero-rois
2024-06-18 00:45:31,323 [ scc.merge] INFO Excluded PRs:
2024-06-18 00:45:31,323 [ scc.merge] INFO - PR 28 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-06-18 00:45:31,323 [ scc.merge] INFO Already up to date.
2024-06-18 00:45:31,323 [ scc.merge] INFO
2024-06-18 00:45:31,323 [ scc.merge] INFO Merged PRs:
2024-06-18 00:45:31,323 [ scc.merge] INFO - PR 6 dominikl 'Add method to create masks grouped by label id'
2024-06-18 00:45:31,323 [ scc.merge] INFO
2024-06-18 00:45:31,323 [ scc.merge] INFO Repository: ome/omero-signup
2024-06-18 00:45:31,323 [ scc.merge] INFO Already up to date.
2024-06-18 00:45:31,323 [ scc.merge] INFO
2024-06-18 00:45:31,323 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-18 00:45:31,323 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2024-06-18 00:45:31,323 [ scc.merge] INFO
2024-06-18 00:45:31,323 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2024-06-18 00:45:31,323 [ scc.merge] INFO Already up to date.
2024-06-18 00:45:31,323 [ scc.merge] INFO
2024-06-18 00:45:31,323 [ scc.merge] INFO Merged PRs:
2024-06-18 00:45:31,323 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2024-06-18 00:45:31,323 [ scc.merge] INFO
2024-06-18 00:45:31,323 [ scc.merge] INFO Repository: ome/omero-upload
2024-06-18 00:45:31,323 [ scc.merge] INFO Already up to date.
2024-06-18 00:45:31,323 [ scc.merge] INFO
2024-06-18 00:45:31,323 [ scc.merge] INFO
2024-06-18 00:45:31,323 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2024-06-18 00:45:31,323 [ scc.merge] INFO Already up to date.
2024-06-18 00:45:31,323 [ scc.merge] INFO
2024-06-18 00:45:31,323 [ scc.merge] INFO
2024-06-18 00:45:31,323 [ scc.merge] INFO Repository: ome/omero-web-zarr
2024-06-18 00:45:31,323 [ scc.merge] INFO Excluded PRs:
2024-06-18 00:45:31,323 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2024-06-18 00:45:31,323 [ scc.merge] INFO Already up to date.
2024-06-18 00:45:31,324 [ scc.merge] INFO
2024-06-18 00:45:31,324 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-18 00:45:31,324 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2024-06-18 00:45:31,324 [ scc.merge] INFO
2024-06-18 00:45:31,324 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2024-06-18 00:45:31,324 [ scc.merge] INFO Already up to date.
2024-06-18 00:45:31,324 [ scc.merge] INFO
2024-06-18 00:45:31,324 [ scc.merge] INFO
2024-06-18 00:45:31,324 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2024-06-18 00:45:31,324 [ scc.merge] INFO Already up to date.
2024-06-18 00:45:31,324 [ scc.merge] INFO
2024-06-18 00:45:31,324 [ scc.merge] INFO
2024-06-18 00:45:31,324 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2024-06-18 00:45:31,324 [ scc.merge] INFO Already up to date.
2024-06-18 00:45:31,324 [ scc.merge] INFO
2024-06-18 00:45:31,324 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-18 00:45:31,324 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2024-06-18 00:45:31,324 [ scc.merge] INFO
2024-06-18 00:45:31,324 [ scc.merge] INFO Repository: ome/scripts
2024-06-18 00:45:31,324 [ scc.merge] INFO Excluded PRs:
2024-06-18 00:45:31,324 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-06-18 00:45:31,324 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-06-18 00:45:31,324 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-06-18 00:45:31,324 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-06-18 00:45:31,324 [ scc.merge] INFO Already up to date.
2024-06-18 00:45:31,324 [ scc.merge] INFO
2024-06-18 00:45:31,324 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-18 00:45:31,324 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-18 00:45:31,324 [ scc.merge] INFO
2024-06-18 00:45:31,324 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-06-18 00:45:31,324 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 00:45:31,331 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2024-06-18 00:45:31,331 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 00:45:31,336 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:31,336 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2024-06-18 00:45:31,336 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 00:45:31,341 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:31,341 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2024-06-18 00:45:31,341 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 00:45:31,346 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:31,346 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2024-06-18 00:45:31,346 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 00:45:31,351 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:31,351 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2024-06-18 00:45:31,351 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 00:45:31,356 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:31,356 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2024-06-18 00:45:31,356 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 00:45:31,361 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:31,361 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2024-06-18 00:45:31,361 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 00:45:31,366 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:31,366 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2024-06-18 00:45:31,366 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 00:45:31,371 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:31,371 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2024-06-18 00:45:31,371 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 00:45:31,376 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:31,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2024-06-18 00:45:31,377 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 00:45:31,381 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:31,382 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2024-06-18 00:45:31,382 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 00:45:31,387 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:31,387 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2024-06-18 00:45:31,387 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 00:45:31,393 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:31,393 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2024-06-18 00:45:31,393 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 00:45:31,398 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:31,399 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2024-06-18 00:45:31,399 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 00:45:31,404 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:31,404 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2024-06-18 00:45:31,404 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 00:45:31,409 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:31,409 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2024-06-18 00:45:31,409 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 00:45:31,414 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:31,414 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2024-06-18 00:45:31,414 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 00:45:31,420 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:31,420 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2024-06-18 00:45:31,420 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 00:45:31,425 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:31,425 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2024-06-18 00:45:31,425 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 00:45:31,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:31,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2024-06-18 00:45:31,430 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 00:45:31,435 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:31,435 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2024-06-18 00:45:31,435 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 00:45:31,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2024-06-18 00:45:31,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2024-06-18 00:45:31,440 [ scc.git] DEBUG Calling 'git remote'
2024-06-18 00:45:31,446 [ 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.1 to 5.9.2-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD 5559e99] 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 53e3f42
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 2ca566b
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 ffc7e075
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 7b7a637
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 5a90893
nothing to commit, working tree clean
[detached HEAD b91d481] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2024-06-18 00:46:18,341 [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-06-18 00:46:27,243 [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-06-18 00:46:29,627 [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-06-18 00:46:34,218 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2024-06-18 00:47:21,916 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/d0200910/images/svgs/logo.svg){kind=logo}
