Skipping 120 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTest
2025-05-16 01:12:35,493 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:35,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/statuses/a14f62a940f4974a305b3f5858049ee493b898ef?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:12:35,677 [ scc.repo] DEBUG - PR 147 will-moore 'Name option'
2025-05-16 01:12:35,928 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:36,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/issues/123 HTTP/1.1" 200 None
2025-05-16 01:12:36,445 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:36,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/issues/123/comments HTTP/1.1" 200 None
2025-05-16 01:12:37,093 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:37,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/256245946/issues/123/comments?page=2 HTTP/1.1" 200 None
2025-05-16 01:12:37,358 [ scc.repo] DEBUG ## Branches found:
2025-05-16 01:12:37,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-05-16 01:12:37,358 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 01:12:37,358 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:12:37,361 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-16 01:12:37,365 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-16 01:12:37,365 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-16 01:12:37,369 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-16 01:12:37,380 [ scc.git] DEBUG Updating 11d3587..5b2ca82
2025-05-16 01:12:37,608 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:38,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/pulls/171 HTTP/1.1" 200 None
2025-05-16 01:12:38,326 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:38,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-cli-zarr/pulls/168 HTTP/1.1" 200 None
2025-05-16 01:12:38,802 [ scc.git] DEBUG Calling 'git fetch origin pull/147/head'
2025-05-16 01:12:39,485 [ scc.git] DEBUG From https://github.com/ome/omero-cli-zarr
2025-05-16 01:12:39,486 [ scc.git] DEBUG * branch refs/pull/147/head -> FETCH_HEAD
2025-05-16 01:12:39,491 [ scc.git] DEBUG Calling 'git fetch origin pull/167/head'
2025-05-16 01:12:41,287 [ scc.git] DEBUG From https://github.com/ome/omero-cli-zarr
2025-05-16 01:12:41,288 [ scc.git] DEBUG * branch refs/pull/167/head -> FETCH_HEAD
2025-05-16 01:12:41,295 [ scc.git] DEBUG ## Unique users: []
2025-05-16 01:12:41,295 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 01:12:41,295 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:12:41,298 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a14f62a940f4974a305b3f5858049ee493b898ef'
2025-05-16 01:12:41,302 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:12:41,305 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 147 (Name option) a14f62a940f4974a305b3f5858049ee493b898ef'
2025-05-16 01:12:41,371 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2025-05-16 01:12:41,372 [ scc.git] DEBUG Auto-merging src/omero_zarr/raw_pixels.py
2025-05-16 01:12:41,373 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 01:12:41,377 [ scc.git] DEBUG README.rst | 30 ++++++++++++++++++------------
2025-05-16 01:12:41,377 [ scc.git] DEBUG src/omero_zarr/cli.py | 9 +++++++++
2025-05-16 01:12:41,377 [ scc.git] DEBUG src/omero_zarr/masks.py | 4 ++--
2025-05-16 01:12:41,377 [ scc.git] DEBUG src/omero_zarr/raw_pixels.py | 28 +++++++++++++++++++++++-----
2025-05-16 01:12:41,377 [ scc.git] DEBUG src/omero_zarr/util.py | 2 +-
2025-05-16 01:12:41,377 [ scc.git] DEBUG 5 files changed, 53 insertions(+), 20 deletions(-)
2025-05-16 01:12:41,378 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:41,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:12:41,551 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f8624324aebcce8c937fc843359ff9ff22c69442'
2025-05-16 01:12:41,559 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:12:41,563 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 167 (Add extinfo command) f8624324aebcce8c937fc843359ff9ff22c69442'
2025-05-16 01:12:41,809 [ scc.git] DEBUG Auto-merging .isort.cfg
2025-05-16 01:12:41,809 [ scc.git] DEBUG CONFLICT (content): Merge conflict in .isort.cfg
2025-05-16 01:12:41,809 [ scc.git] DEBUG Auto-merging .pre-commit-config.yaml
2025-05-16 01:12:41,809 [ scc.git] DEBUG CONFLICT (content): Merge conflict in .pre-commit-config.yaml
2025-05-16 01:12:41,809 [ scc.git] DEBUG Auto-merging src/omero_zarr/cli.py
2025-05-16 01:12:41,809 [ scc.git] DEBUG Auto-merging src/omero_zarr/masks.py
2025-05-16 01:12:41,809 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-16 01:12:41,810 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-16 01:12:41,813 [ scc.git] DEBUG Calling 'git reset --hard 6a5e8ccc2b5bec027237f9055b9bef550dd30e47'
2025-05-16 01:12:41,819 [ scc.git] DEBUG HEAD is now at 6a5e8cc merge master -Dorg -Ssuccess-only: PR 147 (Name option)
2025-05-16 01:12:41,820 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:41,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:12:41,990 [ scc.git] DEBUG Calling 'git merge-base 5b2ca823134b674d3dc7d7692abfb4702806f015 f8624324aebcce8c937fc843359ff9ff22c69442'
2025-05-16 01:12:41,995 [ scc.git] DEBUG Calling 'git diff --name-only 11d35873542022d9638ede115d0dfab4652f8e62..5b2ca823134b674d3dc7d7692abfb4702806f015'
2025-05-16 01:12:41,998 [ scc.git] INFO - PR 167 dominikl 'Add extinfo command'
Conflicting PR. Removed from build [OMERO-plugins-push#422](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/consoleText) for more details.
Possible conflicts:
- Upstream changes
- .pre-commit-config.yaml
- .isort.cfg
--conflicts
2025-05-16 01:12:42,000 [ scc.config] DEBUG Found github.token
2025-05-16 01:12:42,000 [ scc.git] DEBUG Adding comment to issue #167.
2025-05-16 01:12:42,241 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:42,796 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-cli-zarr/issues/167/comments HTTP/1.1" 201 2014
2025-05-16 01:12:42,797 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-16 01:12:42,842 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 01:12:42,843 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:12:42,845 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-16 01:12:42,889 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-16 01:12:42,893 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fca5b4b50> has no local changes
2025-05-16 01:12:42,893 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
Updating 11d3587..5b2ca82
Previously merged:
- PR 171 will-moore 'Initial addition of integration tests'
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 167 dominikl 'Add extinfo command'
Generated by OMERO-plugins-push#422 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/)'
2025-05-16 01:12:42,900 [ scc.git] DEBUG [detached HEAD 330860d] merge master -Dorg -Ssuccess-only
2025-05-16 01:12:42,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:12:42,901 [ scc.repo] DEBUG ## PRs found:
2025-05-16 01:12:43,049 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:43,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls HTTP/1.1" 200 None
2025-05-16 01:12:43,691 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:43,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/639 HTTP/1.1" 200 None
2025-05-16 01:12:43,935 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-16 01:12:44,186 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:44,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/ea5d315d21af32b6ce5529e86b939672d110c8cf HTTP/1.1" 200 None
2025-05-16 01:12:44,765 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:45,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/ea5d315d21af32b6ce5529e86b939672d110c8cf/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:12:45,308 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:45,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/ea5d315d21af32b6ce5529e86b939672d110c8cf/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-16 01:12:45,841 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:46,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/ea5d315d21af32b6ce5529e86b939672d110c8cf HTTP/1.1" 200 None
2025-05-16 01:12:46,477 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:46,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/ea5d315d21af32b6ce5529e86b939672d110c8cf?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:12:46,661 [ scc.repo] DEBUG - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-05-16 01:12:46,913 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:47,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/638 HTTP/1.1" 200 None
2025-05-16 01:12:47,442 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:47,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/637 HTTP/1.1" 200 None
2025-05-16 01:12:47,927 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:48,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/637/comments HTTP/1.1" 200 None
2025-05-16 01:12:48,423 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:48,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/630 HTTP/1.1" 200 None
2025-05-16 01:12:48,931 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:49,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/630/comments HTTP/1.1" 200 None
2025-05-16 01:12:49,471 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:49,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/7a71d8f456b659444095e496a4c6d2449c306a29 HTTP/1.1" 200 None
2025-05-16 01:12:50,098 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:50,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/7a71d8f456b659444095e496a4c6d2449c306a29/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:12:50,624 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:50,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/7a71d8f456b659444095e496a4c6d2449c306a29/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-16 01:12:51,100 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:51,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/7a71d8f456b659444095e496a4c6d2449c306a29 HTTP/1.1" 200 None
2025-05-16 01:12:51,631 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:51,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/7a71d8f456b659444095e496a4c6d2449c306a29?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:12:51,808 [ scc.repo] DEBUG - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-05-16 01:12:52,059 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:52,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/619 HTTP/1.1" 200 None
2025-05-16 01:12:52,533 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:52,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/616 HTTP/1.1" 200 None
2025-05-16 01:12:53,060 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:53,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/616/comments HTTP/1.1" 200 None
2025-05-16 01:12:53,404 [ scc.repo] DEBUG # ... Include label: include
2025-05-16 01:12:53,655 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:53,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/e559ccd24f6000f042f166455bac0f7639b362d8 HTTP/1.1" 200 None
2025-05-16 01:12:54,178 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:54,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/e559ccd24f6000f042f166455bac0f7639b362d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:12:54,687 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:54,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/e559ccd24f6000f042f166455bac0f7639b362d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-16 01:12:55,204 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:55,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/e559ccd24f6000f042f166455bac0f7639b362d8 HTTP/1.1" 200 None
2025-05-16 01:12:55,672 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:55,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/e559ccd24f6000f042f166455bac0f7639b362d8?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:12:55,871 [ scc.repo] DEBUG - PR 616 Rdornier 'Fix labels around border'
2025-05-16 01:12:56,122 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:56,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/612 HTTP/1.1" 200 None
2025-05-16 01:12:56,611 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:56,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/612/comments HTTP/1.1" 200 None
2025-05-16 01:12:57,092 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:57,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/9ae98a37ea474db7d473b99abb884cd4b1fdfb36 HTTP/1.1" 200 None
2025-05-16 01:12:57,642 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:57,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/9ae98a37ea474db7d473b99abb884cd4b1fdfb36/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:12:58,140 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:58,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/9ae98a37ea474db7d473b99abb884cd4b1fdfb36/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-16 01:12:58,650 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:58,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/9ae98a37ea474db7d473b99abb884cd4b1fdfb36 HTTP/1.1" 200 None
2025-05-16 01:12:59,151 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:59,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/9ae98a37ea474db7d473b99abb884cd4b1fdfb36?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:12:59,333 [ scc.repo] DEBUG - PR 612 will-moore 'Script version'
2025-05-16 01:12:59,584 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:12:59,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/610 HTTP/1.1" 200 None
2025-05-16 01:13:00,112 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:00,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/610/comments HTTP/1.1" 200 None
2025-05-16 01:13:00,601 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:00,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/59ca9bf79effaded86845d8c49fb94bda6727333 HTTP/1.1" 200 None
2025-05-16 01:13:01,138 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:01,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/59ca9bf79effaded86845d8c49fb94bda6727333/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:13:01,644 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:01,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/59ca9bf79effaded86845d8c49fb94bda6727333/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-16 01:13:02,187 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:02,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/59ca9bf79effaded86845d8c49fb94bda6727333 HTTP/1.1" 200 None
2025-05-16 01:13:02,702 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:02,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/59ca9bf79effaded86845d8c49fb94bda6727333?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:13:02,901 [ scc.repo] DEBUG - PR 610 will-moore 'Add docs/contributing.rst'
2025-05-16 01:13:03,152 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:03,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/605 HTTP/1.1" 200 None
2025-05-16 01:13:03,633 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:03,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/605/comments HTTP/1.1" 200 None
2025-05-16 01:13:04,192 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:04,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/8996880bb97573423561afaca6de24e03ec57895 HTTP/1.1" 200 None
2025-05-16 01:13:04,697 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:04,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/8996880bb97573423561afaca6de24e03ec57895/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:13:05,230 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:05,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/8996880bb97573423561afaca6de24e03ec57895/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-16 01:13:05,753 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:06,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/8996880bb97573423561afaca6de24e03ec57895 HTTP/1.1" 200 None
2025-05-16 01:13:06,312 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:06,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/8996880bb97573423561afaca6de24e03ec57895?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:13:06,496 [ scc.repo] DEBUG - PR 605 Tom-TBT 'Colorbar feature'
2025-05-16 01:13:06,747 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:06,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/600 HTTP/1.1" 200 None
2025-05-16 01:13:07,241 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:07,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/issues/600/comments HTTP/1.1" 200 None
2025-05-16 01:13:07,543 [ scc.repo] DEBUG # ... Include label: include
2025-05-16 01:13:07,794 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:08,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/68d6b6ca17564ecbcc43a07df38d3cbc8b793618 HTTP/1.1" 200 None
2025-05-16 01:13:08,382 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:08,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/68d6b6ca17564ecbcc43a07df38d3cbc8b793618/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:13:08,920 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:09,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/68d6b6ca17564ecbcc43a07df38d3cbc8b793618/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-16 01:13:09,411 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:09,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/commits/68d6b6ca17564ecbcc43a07df38d3cbc8b793618 HTTP/1.1" 200 None
2025-05-16 01:13:09,878 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:10,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/statuses/68d6b6ca17564ecbcc43a07df38d3cbc8b793618?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:13:10,052 [ scc.repo] DEBUG - PR 600 Rdornier 'Label on rois'
2025-05-16 01:13:10,053 [ scc.repo] DEBUG ## Branches found:
2025-05-16 01:13:10,053 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-05-16 01:13:10,054 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 01:13:10,054 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:13:10,057 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-16 01:13:10,060 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-16 01:13:10,060 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-16 01:13:10,064 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-16 01:13:10,077 [ scc.git] DEBUG Updating 9cc36cde..3e8fa730
2025-05-16 01:13:10,303 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:10,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls/633 HTTP/1.1" 200 None
2025-05-16 01:13:11,026 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:11,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls/635 HTTP/1.1" 200 None
2025-05-16 01:13:11,688 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:12,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls/623 HTTP/1.1" 200 None
2025-05-16 01:13:12,313 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:12,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-figure/pulls/631 HTTP/1.1" 200 None
2025-05-16 01:13:12,836 [ scc.git] DEBUG Calling 'git fetch origin pull/600/head'
2025-05-16 01:13:13,775 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2025-05-16 01:13:13,776 [ scc.git] DEBUG * branch refs/pull/600/head -> FETCH_HEAD
2025-05-16 01:13:13,782 [ scc.git] DEBUG Calling 'git fetch origin pull/605/head'
2025-05-16 01:13:14,149 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2025-05-16 01:13:14,149 [ scc.git] DEBUG * branch refs/pull/605/head -> FETCH_HEAD
2025-05-16 01:13:14,155 [ scc.git] DEBUG Calling 'git fetch origin pull/610/head'
2025-05-16 01:13:14,719 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2025-05-16 01:13:14,719 [ scc.git] DEBUG * branch refs/pull/610/head -> FETCH_HEAD
2025-05-16 01:13:14,725 [ scc.git] DEBUG Calling 'git fetch origin pull/612/head'
2025-05-16 01:13:15,675 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2025-05-16 01:13:15,675 [ scc.git] DEBUG * branch refs/pull/612/head -> FETCH_HEAD
2025-05-16 01:13:15,681 [ scc.git] DEBUG Calling 'git fetch origin pull/616/head'
2025-05-16 01:13:17,685 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2025-05-16 01:13:17,686 [ scc.git] DEBUG * branch refs/pull/616/head -> FETCH_HEAD
2025-05-16 01:13:17,692 [ scc.git] DEBUG Calling 'git fetch origin pull/630/head'
2025-05-16 01:13:18,174 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2025-05-16 01:13:18,174 [ scc.git] DEBUG * branch refs/pull/630/head -> FETCH_HEAD
2025-05-16 01:13:18,180 [ scc.git] DEBUG Calling 'git fetch origin pull/639/head'
2025-05-16 01:13:18,527 [ scc.git] DEBUG From https://github.com/ome/omero-figure
2025-05-16 01:13:18,527 [ scc.git] DEBUG * branch refs/pull/639/head -> FETCH_HEAD
2025-05-16 01:13:18,533 [ scc.git] DEBUG ## Unique users: []
2025-05-16 01:13:18,533 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 01:13:18,533 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:13:18,536 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...68d6b6ca17564ecbcc43a07df38d3cbc8b793618'
2025-05-16 01:13:18,543 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:13:18,546 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 600 (Label on rois) 68d6b6ca17564ecbcc43a07df38d3cbc8b793618'
2025-05-16 01:13:18,698 [ scc.git] DEBUG Auto-merging src/css/figure.css
2025-05-16 01:13:18,700 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 01:13:18,711 [ scc.git] DEBUG .gitignore | 2 +
2025-05-16 01:13:18,711 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 202 ++++++-
2025-05-16 01:13:18,712 [ scc.git] DEBUG src/css/figure.css | 10 +-
2025-05-16 01:13:18,712 [ scc.git] DEBUG src/images/text-icon-24.png | Bin 0 -> 2477 bytes
2025-05-16 01:13:18,712 [ scc.git] DEBUG src/index.html | 19 +-
2025-05-16 01:13:18,712 [ scc.git] DEBUG src/js/models/panel_model.js | 69 ++-
2025-05-16 01:13:18,712 [ scc.git] DEBUG src/js/shapeEditorTest.js | 29 +-
2025-05-16 01:13:18,712 [ scc.git] DEBUG src/js/shape_editor/ellipse.js | 149 ++++-
2025-05-16 01:13:18,712 [ scc.git] DEBUG src/js/shape_editor/line.js | 156 ++++-
2025-05-16 01:13:18,712 [ scc.git] DEBUG src/js/shape_editor/point.js | 144 ++++-
2025-05-16 01:13:18,712 [ scc.git] DEBUG src/js/shape_editor/polygon.js | 149 ++++-
2025-05-16 01:13:18,712 [ scc.git] DEBUG src/js/shape_editor/rect.js | 157 ++++-
2025-05-16 01:13:18,712 [ scc.git] DEBUG src/js/shape_editor/shape_manager.js | 279 ++++++++-
2025-05-16 01:13:18,712 [ scc.git] DEBUG src/js/shape_editor/text.js | 655 +++++++++++++++++++++
2025-05-16 01:13:18,712 [ scc.git] DEBUG src/js/views/panel_view.js | 2 +-
2025-05-16 01:13:18,712 [ scc.git] DEBUG src/js/views/right_panel_view.js | 120 +++-
2025-05-16 01:13:18,712 [ scc.git] DEBUG src/js/views/roi_loader_view.js | 1 +
2025-05-16 01:13:18,712 [ scc.git] DEBUG src/js/views/roi_modal_view.js | 118 +++-
2025-05-16 01:13:18,712 [ scc.git] DEBUG src/shapeEditorTest.html | 37 +-
2025-05-16 01:13:18,712 [ scc.git] DEBUG src/templates/scalebar_form.template.html | 4 +-
2025-05-16 01:13:18,712 [ scc.git] DEBUG src/templates/shapes/shape_sidebar.template.html | 51 ++
2025-05-16 01:13:18,712 [ scc.git] DEBUG src/templates/shapes/shape_toolbar.template.html | 90 ++-
2025-05-16 01:13:18,712 [ scc.git] DEBUG 22 files changed, 2315 insertions(+), 128 deletions(-)
2025-05-16 01:13:18,712 [ scc.git] DEBUG create mode 100644 src/images/text-icon-24.png
2025-05-16 01:13:18,712 [ scc.git] DEBUG create mode 100644 src/js/shape_editor/text.js
2025-05-16 01:13:18,712 [ scc.git] DEBUG create mode 100644 src/templates/shapes/shape_sidebar.template.html
2025-05-16 01:13:18,714 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:18,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:13:18,880 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8996880bb97573423561afaca6de24e03ec57895'
2025-05-16 01:13:18,888 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:13:18,890 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 605 (Colorbar feature) 8996880bb97573423561afaca6de24e03ec57895'
2025-05-16 01:13:19,290 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2025-05-16 01:13:19,292 [ scc.git] DEBUG Auto-merging src/css/figure.css
2025-05-16 01:13:19,292 [ scc.git] DEBUG Auto-merging src/index.html
2025-05-16 01:13:19,292 [ scc.git] DEBUG Auto-merging src/js/models/panel_model.js
2025-05-16 01:13:19,292 [ scc.git] DEBUG Auto-merging src/js/views/panel_view.js
2025-05-16 01:13:19,292 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2025-05-16 01:13:19,292 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 01:13:19,305 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 392 +++++++++++++++++++--
2025-05-16 01:13:19,305 [ scc.git] DEBUG src/css/figure.css | 133 ++++++-
2025-05-16 01:13:19,305 [ scc.git] DEBUG src/index.html | 4 +
2025-05-16 01:13:19,305 [ scc.git] DEBUG src/js/models/panel_model.js | 169 +++++++--
2025-05-16 01:13:19,305 [ scc.git] DEBUG src/js/views/colorbar_form_view.js | 124 +++++++
2025-05-16 01:13:19,305 [ scc.git] DEBUG src/js/views/lutpicker.js | 67 ++--
2025-05-16 01:13:19,305 [ scc.git] DEBUG src/js/views/panel_view.js | 79 ++++-
2025-05-16 01:13:19,305 [ scc.git] DEBUG src/js/views/right_panel_view.js | 13 +
2025-05-16 01:13:19,305 [ scc.git] DEBUG src/templates/colorbar.template.html | 42 +++
2025-05-16 01:13:19,305 [ scc.git] DEBUG src/templates/colorbar_form.template.html | 137 +++++++
2025-05-16 01:13:19,305 [ scc.git] DEBUG 10 files changed, 1080 insertions(+), 80 deletions(-)
2025-05-16 01:13:19,305 [ scc.git] DEBUG create mode 100644 src/js/views/colorbar_form_view.js
2025-05-16 01:13:19,305 [ scc.git] DEBUG create mode 100644 src/templates/colorbar.template.html
2025-05-16 01:13:19,305 [ scc.git] DEBUG create mode 100644 src/templates/colorbar_form.template.html
2025-05-16 01:13:19,307 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:19,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:13:19,465 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...59ca9bf79effaded86845d8c49fb94bda6727333'
2025-05-16 01:13:19,474 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:13:19,477 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 610 (Add docs/contributing.rst) 59ca9bf79effaded86845d8c49fb94bda6727333'
2025-05-16 01:13:19,656 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 01:13:19,661 [ scc.git] DEBUG .github/PULL_REQUEST_TEMPLATE.md | 5 +++
2025-05-16 01:13:19,661 [ scc.git] DEBUG README.rst | 4 +-
2025-05-16 01:13:19,661 [ scc.git] DEBUG docs/contributing.md | 89 ++++++++++++++++++++++++++++++++++++++++
2025-05-16 01:13:19,661 [ scc.git] DEBUG 3 files changed, 97 insertions(+), 1 deletion(-)
2025-05-16 01:13:19,661 [ scc.git] DEBUG create mode 100644 .github/PULL_REQUEST_TEMPLATE.md
2025-05-16 01:13:19,661 [ scc.git] DEBUG create mode 100644 docs/contributing.md
2025-05-16 01:13:19,716 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:19,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:13:19,902 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9ae98a37ea474db7d473b99abb884cd4b1fdfb36'
2025-05-16 01:13:19,911 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:13:19,913 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 612 (Script version) 9ae98a37ea474db7d473b99abb884cd4b1fdfb36'
2025-05-16 01:13:20,511 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2025-05-16 01:13:20,511 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-16 01:13:20,511 [ scc.git] DEBUG Auto-merging package.json
2025-05-16 01:13:20,511 [ scc.git] DEBUG Auto-merging src/css/figure.css
2025-05-16 01:13:20,511 [ scc.git] DEBUG Auto-merging src/index.html
2025-05-16 01:13:20,513 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 01:13:20,525 [ scc.git] DEBUG .bumpversion.cfg | 2 +
2025-05-16 01:13:20,525 [ scc.git] DEBUG .../scripts/omero/figure_scripts/Figure_To_Pdf.py | 7 +-
2025-05-16 01:13:20,525 [ scc.git] DEBUG omero_figure/urls.py | 3 +
2025-05-16 01:13:20,525 [ scc.git] DEBUG omero_figure/views.py | 54 ++++++++++++++
2025-05-16 01:13:20,525 [ scc.git] DEBUG package-lock.json | 8 +-
2025-05-16 01:13:20,525 [ scc.git] DEBUG package.json | 3 +-
2025-05-16 01:13:20,525 [ scc.git] DEBUG src/css/figure.css | 2 +-
2025-05-16 01:13:20,525 [ scc.git] DEBUG src/html/dialogs/scriptManagerDialog.html | 86 ++++++++++++++++++++++
2025-05-16 01:13:20,525 [ scc.git] DEBUG src/index.html | 20 +++--
2025-05-16 01:13:20,525 [ scc.git] DEBUG src/js/views/figure_view.js | 54 ++++++++++++++
2025-05-16 01:13:20,525 [ scc.git] DEBUG vite.config.js | 3 +
2025-05-16 01:13:20,525 [ scc.git] DEBUG 11 files changed, 230 insertions(+), 12 deletions(-)
2025-05-16 01:13:20,525 [ scc.git] DEBUG create mode 100644 src/html/dialogs/scriptManagerDialog.html
2025-05-16 01:13:20,527 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:20,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:13:20,685 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e559ccd24f6000f042f166455bac0f7639b362d8'
2025-05-16 01:13:20,694 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:13:20,696 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 616 (Fix labels around border) e559ccd24f6000f042f166455bac0f7639b362d8'
2025-05-16 01:13:21,341 [ scc.git] DEBUG Auto-merging omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
2025-05-16 01:13:21,341 [ scc.git] DEBUG Auto-merging src/js/views/figure_view.js
2025-05-16 01:13:21,341 [ scc.git] DEBUG Auto-merging src/js/views/panel_view.js
2025-05-16 01:13:21,341 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/js/views/panel_view.js
2025-05-16 01:13:21,341 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-16 01:13:21,342 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-16 01:13:21,347 [ scc.git] DEBUG Calling 'git reset --hard f433616bf0391c2d733a57f99e46fa9a2722d9ba'
2025-05-16 01:13:21,355 [ scc.git] DEBUG HEAD is now at f433616b merge master -Dorg -Ssuccess-only: PR 612 (Script version)
2025-05-16 01:13:21,356 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:21,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:13:21,517 [ scc.git] DEBUG Calling 'git merge-base 3e8fa73092b997ca81b2cb5a9ab19ce81f159d45 e559ccd24f6000f042f166455bac0f7639b362d8'
2025-05-16 01:13:21,522 [ scc.git] DEBUG Calling 'git diff --name-only 9cc36cde05bde4def7b62b07c2e9ae5f66712e96..3e8fa73092b997ca81b2cb5a9ab19ce81f159d45'
2025-05-16 01:13:21,526 [ scc.git] INFO - PR 616 Rdornier 'Fix labels around border'
Conflicting PR. Removed from build [OMERO-plugins-push#422](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/consoleText) for more details.
Possible conflicts:
- PR #600 Rdornier 'Label on rois'
- src/js/views/panel_view.js
- PR #605 Tom-TBT 'Colorbar feature'
- src/js/views/panel_view.js
--conflicts
2025-05-16 01:13:21,528 [ scc.config] DEBUG Found github.token
2025-05-16 01:13:21,528 [ scc.git] DEBUG Adding comment to issue #616.
2025-05-16 01:13:21,768 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:22,355 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-figure/issues/616/comments HTTP/1.1" 201 2081
2025-05-16 01:13:22,356 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7a71d8f456b659444095e496a4c6d2449c306a29'
2025-05-16 01:13:22,365 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:13:22,368 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 630 (Fix color and position for ALL new panel insets) 7a71d8f456b659444095e496a4c6d2449c306a29'
2025-05-16 01:13:22,577 [ scc.git] DEBUG Auto-merging src/js/views/right_panel_view.js
2025-05-16 01:13:22,577 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/js/views/right_panel_view.js
2025-05-16 01:13:22,578 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-16 01:13:22,578 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-16 01:13:22,582 [ scc.git] DEBUG Calling 'git reset --hard f433616bf0391c2d733a57f99e46fa9a2722d9ba'
2025-05-16 01:13:22,589 [ scc.git] DEBUG HEAD is now at f433616b merge master -Dorg -Ssuccess-only: PR 612 (Script version)
2025-05-16 01:13:22,607 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:22,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:13:22,771 [ scc.git] DEBUG Calling 'git merge-base 3e8fa73092b997ca81b2cb5a9ab19ce81f159d45 7a71d8f456b659444095e496a4c6d2449c306a29'
2025-05-16 01:13:22,775 [ scc.git] DEBUG Calling 'git diff --name-only 9cc36cde05bde4def7b62b07c2e9ae5f66712e96..3e8fa73092b997ca81b2cb5a9ab19ce81f159d45'
2025-05-16 01:13:22,779 [ scc.git] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
Conflicting PR. Removed from build [OMERO-plugins-push#422](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/consoleText) for more details.
Possible conflicts:
- PR #600 Rdornier 'Label on rois'
- src/js/views/right_panel_view.js
- PR #605 Tom-TBT 'Colorbar feature'
- src/js/views/right_panel_view.js
--conflicts
2025-05-16 01:13:22,781 [ scc.config] DEBUG Found github.token
2025-05-16 01:13:22,782 [ scc.git] DEBUG Adding comment to issue #630.
2025-05-16 01:13:23,357 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:24,090 [urllib3.conn] DEBUG https://api.github.com:443 "POST /repos/ome/omero-figure/issues/630/comments HTTP/1.1" 201 2093
2025-05-16 01:13:24,090 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ea5d315d21af32b6ce5529e86b939672d110c8cf'
2025-05-16 01:13:24,203 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:13:24,206 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 639 (Bump vite from 6.2.6 to 6.2.7) ea5d315d21af32b6ce5529e86b939672d110c8cf'
2025-05-16 01:13:24,493 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-16 01:13:24,493 [ scc.git] DEBUG Auto-merging package.json
2025-05-16 01:13:24,494 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 01:13:24,499 [ scc.git] DEBUG package-lock.json | 8 ++++----
2025-05-16 01:13:24,499 [ scc.git] DEBUG package.json | 2 +-
2025-05-16 01:13:24,499 [ scc.git] DEBUG 2 files changed, 5 insertions(+), 5 deletions(-)
2025-05-16 01:13:24,501 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:24,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:13:24,670 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-16 01:13:24,717 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 01:13:24,717 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:13:24,720 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-16 01:13:24,762 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-16 01:13:24,768 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fca5a7810> has no local changes
2025-05-16 01:13:24,768 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-figure
Excluded PRs:
- PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
- PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..3e8fa730
Previously merged:
- PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
- PR 635 dependabot[bot] 'Bump esbuild and vite'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Generated by OMERO-plugins-push#422 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/)'
2025-05-16 01:13:24,778 [ scc.git] DEBUG [detached HEAD 6155c4f4] merge master -Dorg -Ssuccess-only
2025-05-16 01:13:24,779 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:13:24,779 [ scc.repo] DEBUG ## PRs found:
2025-05-16 01:13:24,921 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:25,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/pulls HTTP/1.1" 200 None
2025-05-16 01:13:25,431 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:25,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18 HTTP/1.1" 200 None
2025-05-16 01:13:25,944 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:26,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/issues/18/comments HTTP/1.1" 200 None
2025-05-16 01:13:26,410 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:26,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2025-05-16 01:13:26,948 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:27,170 [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
2025-05-16 01:13:27,422 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:27,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/commits/45aed4d15501fa5a524a8b500af8d426f0f6b337 HTTP/1.1" 200 None
2025-05-16 01:13:27,877 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:28,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-fpbioimage/statuses/45aed4d15501fa5a524a8b500af8d426f0f6b337?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:13:28,062 [ scc.repo] DEBUG - PR 18 jburel 'default size z value'
2025-05-16 01:13:28,062 [ scc.repo] DEBUG ## Branches found:
2025-05-16 01:13:28,062 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-05-16 01:13:28,062 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 01:13:28,063 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:13:28,066 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-16 01:13:28,069 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-16 01:13:28,069 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-16 01:13:28,072 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-16 01:13:28,076 [ scc.git] DEBUG Already up to date.
2025-05-16 01:13:28,076 [ scc.git] DEBUG Calling 'git fetch origin pull/18/head'
2025-05-16 01:13:28,477 [ scc.git] DEBUG From https://github.com/ome/omero-fpbioimage
2025-05-16 01:13:28,477 [ scc.git] DEBUG * branch refs/pull/18/head -> FETCH_HEAD
2025-05-16 01:13:28,483 [ scc.git] DEBUG ## Unique users: []
2025-05-16 01:13:28,483 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 01:13:28,483 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:13:28,486 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-05-16 01:13:28,490 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:13:28,492 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 18 (default size z value) 45aed4d15501fa5a524a8b500af8d426f0f6b337'
2025-05-16 01:13:28,543 [ scc.git] DEBUG Auto-merging omero_fpbioimage/views.py
2025-05-16 01:13:28,544 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 01:13:28,547 [ scc.git] DEBUG omero_fpbioimage/views.py | 2 ++
2025-05-16 01:13:28,547 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2025-05-16 01:13:28,549 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:28,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:13:28,721 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-16 01:13:28,779 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 01:13:28,779 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:13:28,788 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-16 01:13:28,835 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-16 01:13:28,839 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fca62d910> has no local changes
2025-05-16 01:13:28,839 [ 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#422 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/)'
2025-05-16 01:13:28,848 [ scc.git] DEBUG [detached HEAD abd9d0f] merge master -Dorg -Ssuccess-only
2025-05-16 01:13:28,848 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:13:28,848 [ scc.repo] DEBUG ## PRs found:
2025-05-16 01:13:28,972 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:29,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/pulls HTTP/1.1" 200 None
2025-05-16 01:13:29,568 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:29,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/119 HTTP/1.1" 200 None
2025-05-16 01:13:30,041 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:30,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/119/comments HTTP/1.1" 200 None
2025-05-16 01:13:30,724 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:31,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/9042541/issues/119/comments?page=2 HTTP/1.1" 200 None
2025-05-16 01:13:31,019 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-16 01:13:31,269 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:31,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/00257fc993a12b3f78a45db039e7bf2c8a406062 HTTP/1.1" 200 None
2025-05-16 01:13:31,872 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:32,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/00257fc993a12b3f78a45db039e7bf2c8a406062/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:13:32,419 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:32,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/00257fc993a12b3f78a45db039e7bf2c8a406062/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-16 01:13:32,957 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:33,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/00257fc993a12b3f78a45db039e7bf2c8a406062 HTTP/1.1" 200 None
2025-05-16 01:13:33,540 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:33,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/00257fc993a12b3f78a45db039e7bf2c8a406062?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:13:33,734 [ scc.repo] DEBUG - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-05-16 01:13:33,986 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:34,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118 HTTP/1.1" 200 None
2025-05-16 01:13:34,468 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:34,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/118/comments HTTP/1.1" 200 None
2025-05-16 01:13:35,121 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:35,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/9042541/issues/118/comments?page=2 HTTP/1.1" 200 None
2025-05-16 01:13:35,372 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-16 01:13:35,622 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:35,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-05-16 01:13:36,202 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:36,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:13:36,714 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:37,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-16 01:13:37,298 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:37,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/2bf34ddacb511c52e473a104fe2a1c00204bae1d HTTP/1.1" 200 None
2025-05-16 01:13:37,859 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:38,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/2bf34ddacb511c52e473a104fe2a1c00204bae1d?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:13:38,056 [ scc.repo] DEBUG - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-05-16 01:13:38,308 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:38,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/117 HTTP/1.1" 200 None
2025-05-16 01:13:38,536 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-16 01:13:38,787 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:39,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-05-16 01:13:39,338 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:39,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:13:39,885 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:40,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-16 01:13:40,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:40,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/155d7ddab4f04c4a91bffc5736ba0741003c566c HTTP/1.1" 200 None
2025-05-16 01:13:40,972 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:41,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/155d7ddab4f04c4a91bffc5736ba0741003c566c?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:13:41,146 [ scc.repo] DEBUG - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-05-16 01:13:41,397 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:41,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/116 HTTP/1.1" 200 None
2025-05-16 01:13:41,618 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-16 01:13:41,869 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:42,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-05-16 01:13:42,461 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:42,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:13:42,990 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:43,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-16 01:13:43,504 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:43,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d HTTP/1.1" 200 None
2025-05-16 01:13:44,069 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:44,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:13:44,253 [ scc.repo] DEBUG - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-05-16 01:13:44,504 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:44,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115 HTTP/1.1" 200 None
2025-05-16 01:13:44,990 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:45,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/115/comments HTTP/1.1" 200 None
2025-05-16 01:13:45,239 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-16 01:13:45,490 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:45,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-05-16 01:13:46,071 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:46,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:13:46,621 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:46,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-16 01:13:47,190 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:47,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/25020d66a7df4ec3cad5967706bb7d13b1493bb5 HTTP/1.1" 200 None
2025-05-16 01:13:47,783 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:47,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/25020d66a7df4ec3cad5967706bb7d13b1493bb5?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:13:47,952 [ scc.repo] DEBUG - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-05-16 01:13:48,203 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:48,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/114 HTTP/1.1" 200 None
2025-05-16 01:13:48,436 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-16 01:13:48,687 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:49,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-05-16 01:13:49,262 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:49,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:13:49,778 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:50,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-16 01:13:50,316 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:50,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/cf75d259b2882000d6be73bc1c11c99c27aa439b HTTP/1.1" 200 None
2025-05-16 01:13:50,894 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:51,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/cf75d259b2882000d6be73bc1c11c99c27aa439b?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:13:51,068 [ scc.repo] DEBUG - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-05-16 01:13:51,319 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:51,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/issues/113 HTTP/1.1" 200 None
2025-05-16 01:13:51,553 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-16 01:13:51,804 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:52,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-05-16 01:13:52,384 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:52,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:13:52,894 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:53,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-16 01:13:53,451 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:53,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/commits/6a657d7a4e0bbfaa3464e851023f29c63db15d4e HTTP/1.1" 200 None
2025-05-16 01:13:53,994 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:54,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gallery/statuses/6a657d7a4e0bbfaa3464e851023f29c63db15d4e?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:13:54,181 [ scc.repo] DEBUG - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-05-16 01:13:54,181 [ scc.repo] DEBUG ## Branches found:
2025-05-16 01:13:54,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-05-16 01:13:54,182 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 01:13:54,182 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:13:54,185 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-16 01:13:54,187 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-16 01:13:54,187 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-16 01:13:54,191 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-16 01:13:54,194 [ scc.git] DEBUG Already up to date.
2025-05-16 01:13:54,194 [ scc.git] DEBUG Calling 'git fetch origin pull/113/head'
2025-05-16 01:13:54,511 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-05-16 01:13:54,512 [ scc.git] DEBUG * branch refs/pull/113/head -> FETCH_HEAD
2025-05-16 01:13:54,517 [ scc.git] DEBUG Calling 'git fetch origin pull/114/head'
2025-05-16 01:13:54,807 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-05-16 01:13:54,807 [ scc.git] DEBUG * branch refs/pull/114/head -> FETCH_HEAD
2025-05-16 01:13:54,813 [ scc.git] DEBUG Calling 'git fetch origin pull/115/head'
2025-05-16 01:13:55,101 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-05-16 01:13:55,101 [ scc.git] DEBUG * branch refs/pull/115/head -> FETCH_HEAD
2025-05-16 01:13:55,107 [ scc.git] DEBUG Calling 'git fetch origin pull/116/head'
2025-05-16 01:13:55,407 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-05-16 01:13:55,407 [ scc.git] DEBUG * branch refs/pull/116/head -> FETCH_HEAD
2025-05-16 01:13:55,412 [ scc.git] DEBUG Calling 'git fetch origin pull/117/head'
2025-05-16 01:13:55,688 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-05-16 01:13:55,688 [ scc.git] DEBUG * branch refs/pull/117/head -> FETCH_HEAD
2025-05-16 01:13:55,694 [ scc.git] DEBUG Calling 'git fetch origin pull/118/head'
2025-05-16 01:13:55,953 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-05-16 01:13:55,954 [ scc.git] DEBUG * branch refs/pull/118/head -> FETCH_HEAD
2025-05-16 01:13:55,959 [ scc.git] DEBUG Calling 'git fetch origin pull/119/head'
2025-05-16 01:13:56,261 [ scc.git] DEBUG From https://github.com/ome/omero-gallery
2025-05-16 01:13:56,261 [ scc.git] DEBUG * branch refs/pull/119/head -> FETCH_HEAD
2025-05-16 01:13:56,266 [ scc.git] DEBUG ## Unique users: []
2025-05-16 01:13:56,267 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 01:13:56,267 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:13:56,270 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-05-16 01:13:56,326 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:13:56,329 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 113 (Bump elliptic from 6.5.4 to 6.6.1) 6a657d7a4e0bbfaa3464e851023f29c63db15d4e'
2025-05-16 01:13:56,403 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 01:13:56,409 [ scc.git] DEBUG package-lock.json | 12 ++++++------
2025-05-16 01:13:56,409 [ scc.git] DEBUG 1 file changed, 6 insertions(+), 6 deletions(-)
2025-05-16 01:13:56,410 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:56,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:13:56,625 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-05-16 01:13:56,688 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:13:56,691 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents) cf75d259b2882000d6be73bc1c11c99c27aa439b'
2025-05-16 01:13:56,856 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-16 01:13:56,857 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 01:13:56,863 [ scc.git] DEBUG package-lock.json | 625 +++---------------------------------------------------
2025-05-16 01:13:56,863 [ scc.git] DEBUG 1 file changed, 29 insertions(+), 596 deletions(-)
2025-05-16 01:13:56,876 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:57,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:13:57,038 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-05-16 01:13:57,050 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:13:57,053 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 115 (Bump micromatch, webpack-cli and webpack) 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-05-16 01:13:57,204 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-16 01:13:57,205 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-05-16 01:13:57,205 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-16 01:13:57,205 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-16 01:13:57,209 [ scc.git] DEBUG Calling 'git reset --hard c5795c38fc7f92095a46f6cc55e074a442e4e6eb'
2025-05-16 01:13:57,215 [ scc.git] DEBUG HEAD is now at c5795c3 merge master -Dorg -Ssuccess-only: PR 114 (Bump tar and fsevents)
2025-05-16 01:13:57,289 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:57,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:13:57,467 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 25020d66a7df4ec3cad5967706bb7d13b1493bb5'
2025-05-16 01:13:57,470 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-05-16 01:13:57,473 [ scc.git] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#422](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
--conflicts
2025-05-16 01:13:57,476 [ scc.config] DEBUG Found github.token
2025-05-16 01:13:57,476 [ scc.git] DEBUG Not adding comment to issue #115, already --conflicts.
2025-05-16 01:13:57,476 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-05-16 01:13:57,522 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:13:57,525 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 116 (Bump browserify-sign from 4.0.4 to 4.2.3) 42a5fb83ce9b8598e3339099a6b4606ef3fd3f1d'
2025-05-16 01:13:57,657 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-16 01:13:57,658 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 01:13:57,664 [ scc.git] DEBUG package-lock.json | 119 +++++++++++++++++++++++++++++++++++++++++++++++++-----
2025-05-16 01:13:57,664 [ scc.git] DEBUG 1 file changed, 108 insertions(+), 11 deletions(-)
2025-05-16 01:13:57,718 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:57,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:13:57,886 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-05-16 01:13:57,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:13:57,937 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6) 155d7ddab4f04c4a91bffc5736ba0741003c566c'
2025-05-16 01:13:58,025 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-16 01:13:58,026 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 01:13:58,032 [ scc.git] DEBUG package-lock.json | 6 +++---
2025-05-16 01:13:58,032 [ scc.git] DEBUG 1 file changed, 3 insertions(+), 3 deletions(-)
2025-05-16 01:13:58,137 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:58,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:13:58,312 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-05-16 01:13:58,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:13:58,319 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 118 (Bump braces, webpack-cli and webpack) 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-05-16 01:13:58,433 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-16 01:13:58,433 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-05-16 01:13:58,433 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-16 01:13:58,434 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-16 01:13:58,437 [ scc.git] DEBUG Calling 'git reset --hard 09bed96a38c8622835f88547b6297aad17050b53'
2025-05-16 01:13:58,443 [ scc.git] DEBUG HEAD is now at 09bed96 merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2025-05-16 01:13:58,563 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:58,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:13:58,726 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 2bf34ddacb511c52e473a104fe2a1c00204bae1d'
2025-05-16 01:13:58,730 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-05-16 01:13:58,733 [ scc.git] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#422](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
- PR #115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- package-lock.json
- PR #116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- package-lock.json
- PR #117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
- package-lock.json
--conflicts
2025-05-16 01:13:58,735 [ scc.config] DEBUG Found github.token
2025-05-16 01:13:58,735 [ scc.git] DEBUG Not adding comment to issue #118, already --conflicts.
2025-05-16 01:13:58,735 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...00257fc993a12b3f78a45db039e7bf2c8a406062'
2025-05-16 01:13:58,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:13:58,800 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 119 (Bump serialize-javascript and webpack) 00257fc993a12b3f78a45db039e7bf2c8a406062'
2025-05-16 01:13:58,999 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-16 01:13:59,000 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-05-16 01:13:59,000 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-16 01:13:59,001 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-16 01:13:59,004 [ scc.git] DEBUG Calling 'git reset --hard 09bed96a38c8622835f88547b6297aad17050b53'
2025-05-16 01:13:59,010 [ scc.git] DEBUG HEAD is now at 09bed96 merge master -Dorg -Ssuccess-only: PR 117 (Bump cross-spawn from 6.0.5 to 6.0.6)
2025-05-16 01:13:59,012 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:59,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:13:59,175 [ scc.git] DEBUG Calling 'git merge-base 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd 00257fc993a12b3f78a45db039e7bf2c8a406062'
2025-05-16 01:13:59,184 [ scc.git] DEBUG Calling 'git diff --name-only 2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd..2a621da2c7ae6ec30fae288d6cfe64d90c40f8fd'
2025-05-16 01:13:59,187 [ scc.git] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Conflicting PR. Removed from build [OMERO-plugins-push#422](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/consoleText) for more details.
Possible conflicts:
- PR #113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- package-lock.json
- PR #114 dependabot[bot] 'Bump tar and fsevents'
- package-lock.json
- PR #115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- package-lock.json
- PR #116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- package-lock.json
- PR #117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
- package-lock.json
- PR #118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- package-lock.json
--conflicts
2025-05-16 01:13:59,190 [ scc.config] DEBUG Found github.token
2025-05-16 01:13:59,190 [ scc.git] DEBUG Not adding comment to issue #119, already --conflicts.
2025-05-16 01:13:59,190 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-16 01:13:59,233 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 01:13:59,233 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:13:59,235 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-16 01:13:59,276 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-16 01:13:59,282 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fca5b45d0> has no local changes
2025-05-16 01:13:59,282 [ 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 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Generated by OMERO-plugins-push#422 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/)'
2025-05-16 01:13:59,291 [ scc.git] DEBUG [detached HEAD ab90e53] merge master -Dorg -Ssuccess-only
2025-05-16 01:13:59,291 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:13:59,291 [ scc.repo] DEBUG ## PRs found:
2025-05-16 01:13:59,426 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:13:59,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/pulls HTTP/1.1" 200 None
2025-05-16 01:14:00,011 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:00,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/506 HTTP/1.1" 200 None
2025-05-16 01:14:00,513 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:00,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7705b58a7a2049651eb10142e2260cf73dcc29fe HTTP/1.1" 200 None
2025-05-16 01:14:01,078 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:01,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7705b58a7a2049651eb10142e2260cf73dcc29fe/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:14:01,585 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:01,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7705b58a7a2049651eb10142e2260cf73dcc29fe/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-16 01:14:02,082 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:02,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/7705b58a7a2049651eb10142e2260cf73dcc29fe HTTP/1.1" 200 None
2025-05-16 01:14:02,658 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:02,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/7705b58a7a2049651eb10142e2260cf73dcc29fe?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:14:02,839 [ scc.repo] DEBUG - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-16 01:14:03,090 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:03,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/503 HTTP/1.1" 200 None
2025-05-16 01:14:03,606 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:03,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/503/comments HTTP/1.1" 200 None
2025-05-16 01:14:04,076 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:04,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/502 HTTP/1.1" 200 None
2025-05-16 01:14:04,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:04,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/502/comments HTTP/1.1" 200 None
2025-05-16 01:14:04,889 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-16 01:14:05,140 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:05,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4 HTTP/1.1" 200 None
2025-05-16 01:14:05,760 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:06,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:14:06,303 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:06,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-16 01:14:06,889 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:07,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/45d08b7e29871ecff0386975c975dacd0865bcc4 HTTP/1.1" 200 None
2025-05-16 01:14:07,438 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:07,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/45d08b7e29871ecff0386975c975dacd0865bcc4?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:14:07,652 [ scc.repo] DEBUG - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-05-16 01:14:07,903 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:08,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/499 HTTP/1.1" 200 None
2025-05-16 01:14:08,205 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-16 01:14:08,457 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:08,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-05-16 01:14:09,035 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:09,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:14:09,601 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:09,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-16 01:14:10,124 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:10,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc HTTP/1.1" 200 None
2025-05-16 01:14:10,716 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:10,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/b19bbac5f17ff2b53ba573ca58108d28d2d86bcc?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:14:10,911 [ scc.repo] DEBUG - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-05-16 01:14:11,162 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:11,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497 HTTP/1.1" 200 None
2025-05-16 01:14:11,649 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:11,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/497/comments HTTP/1.1" 200 None
2025-05-16 01:14:12,148 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:12,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471 HTTP/1.1" 200 None
2025-05-16 01:14:12,628 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:12,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/471/comments HTTP/1.1" 200 None
2025-05-16 01:14:13,126 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:13,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-05-16 01:14:13,667 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:13,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:14:14,185 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:14,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-16 01:14:14,660 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:14,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/448d042a58da05a522531356cc58c1e35b5744d9 HTTP/1.1" 200 None
2025-05-16 01:14:15,174 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:15,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/448d042a58da05a522531356cc58c1e35b5744d9?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:14:15,384 [ scc.repo] DEBUG - PR 471 will-moore 'Z projection disabled tooltip'
2025-05-16 01:14:15,635 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:15,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465 HTTP/1.1" 200 None
2025-05-16 01:14:16,128 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:16,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/465/comments HTTP/1.1" 200 None
2025-05-16 01:14:16,679 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:16,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-05-16 01:14:17,205 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:17,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:14:17,700 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:17,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-16 01:14:18,211 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:18,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/63dd9266a853ff522780066673d0ae2b770238cd HTTP/1.1" 200 None
2025-05-16 01:14:18,735 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:18,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/63dd9266a853ff522780066673d0ae2b770238cd?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:14:18,910 [ scc.repo] DEBUG - PR 465 will-moore 'Save as Figure'
2025-05-16 01:14:19,162 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:19,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460 HTTP/1.1" 200 None
2025-05-16 01:14:19,643 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:19,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/460/comments HTTP/1.1" 200 None
2025-05-16 01:14:20,229 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:20,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-05-16 01:14:20,760 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:21,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:14:21,272 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:21,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/dada2c46211e3bf8015cc47464ab2761ef74ca30 HTTP/1.1" 200 None
2025-05-16 01:14:21,924 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:22,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/statuses/dada2c46211e3bf8015cc47464ab2761ef74ca30?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:14:22,118 [ scc.repo] DEBUG - PR 460 will-moore 'Channel min spinner fix'
2025-05-16 01:14:22,369 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:22,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/227 HTTP/1.1" 200 None
2025-05-16 01:14:22,846 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:23,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/issues/227/comments HTTP/1.1" 200 None
2025-05-16 01:14:23,336 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:23,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/a081a9f2892763bd49a7ad7ba425965150e76f97 HTTP/1.1" 200 None
2025-05-16 01:14:23,876 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:24,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/a081a9f2892763bd49a7ad7ba425965150e76f97/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:14:24,373 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:24,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-iviewer/commits/a081a9f2892763bd49a7ad7ba425965150e76f97/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-16 01:14:24,597 [ scc.repo] DEBUG ## Branches found:
2025-05-16 01:14:24,597 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-05-16 01:14:24,598 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 01:14:24,598 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:14:24,600 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-16 01:14:24,603 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-16 01:14:24,603 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-16 01:14:24,606 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-16 01:14:24,609 [ scc.git] DEBUG Already up to date.
2025-05-16 01:14:24,610 [ scc.git] DEBUG Calling 'git fetch origin pull/460/head'
2025-05-16 01:14:26,674 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-05-16 01:14:26,674 [ scc.git] DEBUG * branch refs/pull/460/head -> FETCH_HEAD
2025-05-16 01:14:26,680 [ scc.git] DEBUG Calling 'git fetch origin pull/465/head'
2025-05-16 01:14:28,643 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-05-16 01:14:28,643 [ scc.git] DEBUG * branch refs/pull/465/head -> FETCH_HEAD
2025-05-16 01:14:28,648 [ scc.git] DEBUG Calling 'git fetch origin pull/471/head'
2025-05-16 01:14:29,073 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-05-16 01:14:29,073 [ scc.git] DEBUG * branch refs/pull/471/head -> FETCH_HEAD
2025-05-16 01:14:29,079 [ scc.git] DEBUG Calling 'git fetch origin pull/499/head'
2025-05-16 01:14:29,385 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-05-16 01:14:29,385 [ scc.git] DEBUG * branch refs/pull/499/head -> FETCH_HEAD
2025-05-16 01:14:29,390 [ scc.git] DEBUG Calling 'git fetch origin pull/502/head'
2025-05-16 01:14:29,674 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-05-16 01:14:29,674 [ scc.git] DEBUG * branch refs/pull/502/head -> FETCH_HEAD
2025-05-16 01:14:29,679 [ scc.git] DEBUG Calling 'git fetch origin pull/506/head'
2025-05-16 01:14:30,004 [ scc.git] DEBUG From https://github.com/ome/omero-iviewer
2025-05-16 01:14:30,004 [ scc.git] DEBUG * branch refs/pull/506/head -> FETCH_HEAD
2025-05-16 01:14:30,010 [ scc.git] DEBUG ## Unique users: []
2025-05-16 01:14:30,011 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 01:14:30,011 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:14:30,014 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-05-16 01:14:30,021 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:14:30,024 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 460 (Channel min spinner fix) dada2c46211e3bf8015cc47464ab2761ef74ca30'
2025-05-16 01:14:30,224 [ scc.git] DEBUG Auto-merging src/model/image_info.js
2025-05-16 01:14:30,224 [ scc.git] DEBUG Auto-merging src/settings/channel-range.js
2025-05-16 01:14:30,225 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 01:14:30,231 [ scc.git] DEBUG src/model/image_info.js | 7 ++++---
2025-05-16 01:14:30,231 [ scc.git] DEBUG src/settings/channel-range.js | 4 +++-
2025-05-16 01:14:30,231 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 4 deletions(-)
2025-05-16 01:14:30,232 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:30,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:14:30,401 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63dd9266a853ff522780066673d0ae2b770238cd'
2025-05-16 01:14:30,409 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:14:30,411 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 465 (Save as Figure) 63dd9266a853ff522780066673d0ae2b770238cd'
2025-05-16 01:14:30,831 [ scc.git] DEBUG Auto-merging plugin/omero_iviewer/views.py
2025-05-16 01:14:30,831 [ scc.git] DEBUG Auto-merging src/app/context.js
2025-05-16 01:14:30,831 [ scc.git] DEBUG Auto-merging src/utils/constants.js
2025-05-16 01:14:30,831 [ scc.git] DEBUG Auto-merging src/viewers/viewer/Viewer.js
2025-05-16 01:14:30,832 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 01:14:30,837 [ scc.git] DEBUG plugin/omero_iviewer/views.py | 17 +++-
2025-05-16 01:14:30,837 [ scc.git] DEBUG src/app/context.js | 6 +-
2025-05-16 01:14:30,838 [ scc.git] DEBUG src/app/header.html | 5 +
2025-05-16 01:14:30,838 [ scc.git] DEBUG src/app/header.js | 45 ++++++++-
2025-05-16 01:14:30,838 [ scc.git] DEBUG src/utils/constants.js | 6 ++
2025-05-16 01:14:30,838 [ scc.git] DEBUG src/utils/figure.js | 217 ++++++++++++++++++++++++++++++++++++++++++
2025-05-16 01:14:30,838 [ scc.git] DEBUG 6 files changed, 290 insertions(+), 6 deletions(-)
2025-05-16 01:14:30,838 [ scc.git] DEBUG create mode 100644 src/utils/figure.js
2025-05-16 01:14:30,839 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:31,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:14:31,006 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...448d042a58da05a522531356cc58c1e35b5744d9'
2025-05-16 01:14:31,013 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:14:31,016 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 471 (Z projection disabled tooltip) 448d042a58da05a522531356cc58c1e35b5744d9'
2025-05-16 01:14:31,143 [ scc.git] DEBUG Auto-merging src/controls/dimension-slider.js
2025-05-16 01:14:31,144 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 01:14:31,148 [ scc.git] DEBUG src/controls/dimension-slider.html | 2 +-
2025-05-16 01:14:31,148 [ scc.git] DEBUG src/controls/dimension-slider.js | 20 ++++++++++++++++++++
2025-05-16 01:14:31,148 [ scc.git] DEBUG 2 files changed, 21 insertions(+), 1 deletion(-)
2025-05-16 01:14:31,257 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:31,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:14:31,442 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-05-16 01:14:31,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:14:31,502 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha) b19bbac5f17ff2b53ba573ca58108d28d2d86bcc'
2025-05-16 01:14:31,597 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 01:14:31,608 [ scc.git] DEBUG package-lock.json | 322 +++++++++++++++++++++++++++---------------------------
2025-05-16 01:14:31,609 [ scc.git] DEBUG package.json | 2 +-
2025-05-16 01:14:31,609 [ scc.git] DEBUG 2 files changed, 163 insertions(+), 161 deletions(-)
2025-05-16 01:14:31,693 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:31,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:14:31,879 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-05-16 01:14:31,896 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:14:31,899 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 502 (Bump serialize-javascript and mocha) 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-05-16 01:14:32,481 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-16 01:14:32,481 [ scc.git] DEBUG CONFLICT (content): Merge conflict in package-lock.json
2025-05-16 01:14:32,482 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-16 01:14:32,482 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-16 01:14:32,486 [ scc.git] DEBUG Calling 'git reset --hard c4c40049dc0872dc407d9d95be4047eb8142066e'
2025-05-16 01:14:32,494 [ scc.git] DEBUG HEAD is now at c4c4004 merge master -Dorg -Ssuccess-only: PR 499 (Bump nanoid and mocha)
2025-05-16 01:14:32,495 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:32,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:14:32,662 [ scc.git] DEBUG Calling 'git merge-base 7a798ceeb3926d049d73788555fb63269a071052 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-05-16 01:14:32,666 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..7a798ceeb3926d049d73788555fb63269a071052'
2025-05-16 01:14:32,669 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#422](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-05-16 01:14:32,671 [ scc.config] DEBUG Found github.token
2025-05-16 01:14:32,671 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-05-16 01:14:32,672 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-05-16 01:14:32,679 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:14:32,681 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 506 (Use the release/v1 branch for the PyPA action publishing to PyPI) 7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-05-16 01:14:32,707 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 01:14:32,711 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-16 01:14:32,711 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-16 01:14:32,913 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:33,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:14:33,072 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-16 01:14:33,115 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 01:14:33,115 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:14:33,118 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-16 01:14:33,159 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-16 01:14:33,167 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fca5dc4d0> has no local changes
2025-05-16 01:14:33,167 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#422 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/)'
2025-05-16 01:14:33,175 [ scc.git] DEBUG [detached HEAD f3b1bd5] merge master -Dorg -Ssuccess-only
2025-05-16 01:14:33,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:14:33,175 [ scc.repo] DEBUG ## PRs found:
2025-05-16 01:14:33,323 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:33,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-05-16 01:14:33,850 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:34,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-05-16 01:14:34,339 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:34,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-16 01:14:34,891 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:35,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:14:35,378 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:35,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-16 01:14:35,944 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:36,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:14:36,129 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-16 01:14:36,380 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:36,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-05-16 01:14:36,880 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:37,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-05-16 01:14:37,469 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:37,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-16 01:14:38,007 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:38,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:14:38,477 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:38,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-16 01:14:39,046 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:39,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:14:39,247 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-05-16 01:14:39,247 [ scc.repo] DEBUG ## Branches found:
2025-05-16 01:14:39,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-16 01:14:39,248 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 01:14:39,248 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:14:39,251 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-16 01:14:39,253 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-16 01:14:39,254 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-16 01:14:39,257 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-16 01:14:39,260 [ scc.git] DEBUG Already up to date.
2025-05-16 01:14:39,260 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-05-16 01:14:40,143 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-16 01:14:40,143 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-05-16 01:14:40,149 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-05-16 01:14:40,485 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-16 01:14:40,485 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-05-16 01:14:40,491 [ scc.git] DEBUG ## Unique users: []
2025-05-16 01:14:40,491 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 01:14:40,491 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:14:40,494 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-16 01:14:40,498 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:14:40,501 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-16 01:14:40,559 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 01:14:40,563 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-05-16 01:14:40,563 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-05-16 01:14:40,563 [ scc.git] DEBUG requirements.txt | 2 +-
2025-05-16 01:14:40,563 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-05-16 01:14:40,563 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-05-16 01:14:40,563 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-05-16 01:14:40,564 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:40,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:14:40,735 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-05-16 01:14:40,740 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:14:40,742 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 94 (Use the release/v1 branch for the PyPA action publishing to PyPI) 1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-05-16 01:14:40,757 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-16 01:14:40,761 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-16 01:14:40,761 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-16 01:14:40,986 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:41,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:14:41,149 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-16 01:14:41,192 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 01:14:41,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:14:41,195 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-16 01:14:41,235 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-16 01:14:41,240 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fca53f910> has no local changes
2025-05-16 01:14:41,240 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Generated by OMERO-plugins-push#422 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/)'
2025-05-16 01:14:41,247 [ scc.git] DEBUG [detached HEAD 7dcf52d] merge master -Dorg -Ssuccess-only
2025-05-16 01:14:41,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:14:41,248 [ scc.repo] DEBUG ## PRs found:
2025-05-16 01:14:41,401 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:41,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-05-16 01:14:42,006 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:42,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-05-16 01:14:42,508 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:42,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-05-16 01:14:43,071 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:43,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-16 01:14:43,628 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:43,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:14:44,124 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:44,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-16 01:14:44,602 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:44,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:14:44,782 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-16 01:14:45,033 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:45,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-05-16 01:14:45,527 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:45,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-05-16 01:14:46,022 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:46,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-16 01:14:46,584 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:46,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:14:47,075 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:47,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-16 01:14:47,667 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:47,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:14:47,858 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-16 01:14:47,858 [ scc.repo] DEBUG ## Branches found:
2025-05-16 01:14:47,858 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-16 01:14:47,859 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 01:14:47,859 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:14:47,862 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-16 01:14:47,864 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-16 01:14:47,864 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-16 01:14:47,867 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-16 01:14:47,875 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-05-16 01:14:48,109 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:48,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-05-16 01:14:48,516 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-05-16 01:14:49,073 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-16 01:14:49,074 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-05-16 01:14:49,079 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-05-16 01:14:49,505 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-16 01:14:49,506 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-05-16 01:14:49,511 [ scc.git] DEBUG ## Unique users: []
2025-05-16 01:14:49,511 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 01:14:49,511 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:14:49,514 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-16 01:14:49,519 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:14:49,521 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-16 01:14:49,641 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-05-16 01:14:49,641 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-05-16 01:14:49,641 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-16 01:14:49,641 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-16 01:14:49,641 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-16 01:14:49,642 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-16 01:14:49,645 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-16 01:14:49,650 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-16 01:14:49,652 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:49,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:14:49,817 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-16 01:14:49,823 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-16 01:14:50,132 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#422](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-05-16 01:14:50,135 [ scc.config] DEBUG Found github.token
2025-05-16 01:14:50,135 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-05-16 01:14:50,135 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-16 01:14:50,140 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:14:50,142 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-16 01:14:50,369 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-16 01:14:50,369 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-16 01:14:50,369 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-05-16 01:14:50,369 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-16 01:14:50,370 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-16 01:14:50,373 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-16 01:14:50,379 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-16 01:14:50,380 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:50,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-16 01:14:50,557 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-16 01:14:50,562 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-16 01:14:50,565 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#422](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2025-05-16 01:14:50,568 [ scc.config] DEBUG Found github.token
2025-05-16 01:14:50,568 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-05-16 01:14:50,568 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-16 01:14:50,613 [ scc.git] DEBUG Get sha1 of %s
2025-05-16 01:14:50,613 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-16 01:14:50,616 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-16 01:14:50,655 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-16 01:14:50,660 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2fca7f4810> has no local changes
2025-05-16 01:14:50,660 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Generated by OMERO-plugins-push#422 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/422/)'
2025-05-16 01:14:50,668 [ scc.git] DEBUG [detached HEAD 5d27ee1] merge master -Dorg -Ssuccess-only
2025-05-16 01:14:50,668 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:14:50,669 [ scc.repo] DEBUG ## PRs found:
2025-05-16 01:14:50,808 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:51,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-05-16 01:14:51,379 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:51,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-05-16 01:14:51,910 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:52,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-16 01:14:52,445 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:52,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:14:52,936 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:53,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-16 01:14:53,419 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:53,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-16 01:14:53,939 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:54,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-05-16 01:14:54,147 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-16 01:14:54,398 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:54,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-05-16 01:14:54,632 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-16 01:14:54,884 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:55,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-16 01:14:55,429 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:55,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-16 01:14:55,956 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:14:56,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-16 01:14:56,467 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-16 01:15:11,515 [urllib3.util] DEBUG Incremented Retry for (url='/repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80'): GithubRetry(total=9, connect=None, read=None, redirect=None, status=None)
2025-05-16 01:15:11,516 [urllib3.conn] WARNI Retrying (GithubRetry(total=9, connect=None, read=None, redirect=None, status=None)) after connection broken by 'ReadTimeoutError("HTTPSConnectionPool(host='api.github.com', port=443): Read timed out. (read timeout=15)")': /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80
2025-05-16 01:15:11,516 [urllib3.conn] DEBUG Starting new HTTPS connection (2): api.github.com:443
2025-05-16 01:15:26,532 [urllib3.util] DEBUG Incremented Retry for (url='/repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80'): GithubRetry(total=8, connect=None, read=None, redirect=None, status=None)
2025-05-16 01:15:26,532 [urllib3.conn] WARNI Retrying (GithubRetry(total=8, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<urllib3.connection.HTTPSConnection object at 0x7f2fb860a950>: Failed to establish a new connection: [Errno -2] Name or service not known')': /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80
2025-05-16 01:15:26,532 [urllib3.conn] DEBUG Starting new HTTPS connection (3): api.github.com:443
2025-05-16 01:15:36,543 [urllib3.util] DEBUG Incremented Retry for (url='/repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80'): GithubRetry(total=7, connect=None, read=None, redirect=None, status=None)
2025-05-16 01:15:36,544 [urllib3.conn] WARNI Retrying (GithubRetry(total=7, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<urllib3.connection.HTTPSConnection object at 0x7f2fb860b550>: Failed to establish a new connection: [Errno -2] Name or service not known')': /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80
2025-05-16 01:15:36,544 [urllib3.conn] DEBUG Starting new HTTPS connection (4): api.github.com:443
2025-05-16 01:15:46,556 [urllib3.util] DEBUG Incremented Retry for (url='/repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80'): GithubRetry(total=6, connect=None, read=None, redirect=None, status=None)
2025-05-16 01:15:46,556 [urllib3.conn] WARNI Retrying (GithubRetry(total=6, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<urllib3.connection.HTTPSConnection object at 0x7f2fb860bf90>: Failed to establish a new connection: [Errno -2] Name or service not known')': /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80
2025-05-16 01:15:46,556 [urllib3.conn] DEBUG Starting new HTTPS connection (5): api.github.com:443
2025-05-16 01:15:56,567 [urllib3.util] DEBUG Incremented Retry for (url='/repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80'): GithubRetry(total=5, connect=None, read=None, redirect=None, status=None)
2025-05-16 01:15:56,568 [urllib3.conn] WARNI Retrying (GithubRetry(total=5, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<urllib3.connection.HTTPSConnection object at 0x7f2fb8614850>: Failed to establish a new connection: [Errno -2] Name or service not known')': /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80
2025-05-16 01:15:56,568 [urllib3.conn] DEBUG Starting new HTTPS connection (6): api.github.com:443
2025-05-16 01:16:06,578 [urllib3.util] DEBUG Incremented Retry for (url='/repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80'): GithubRetry(total=4, connect=None, read=None, redirect=None, status=None)
2025-05-16 01:16:06,578 [urllib3.conn] WARNI Retrying (GithubRetry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<urllib3.connection.HTTPSConnection object at 0x7f2fb8615210>: Failed to establish a new connection: [Errno -2] Name or service not known')': /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80
2025-05-16 01:16:06,578 [urllib3.conn] DEBUG Starting new HTTPS connection (7): api.github.com:443
2025-05-16 01:16:16,589 [urllib3.util] DEBUG Incremented Retry for (url='/repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80'): GithubRetry(total=3, connect=None, read=None, redirect=None, status=None)
2025-05-16 01:16:16,590 [urllib3.conn] WARNI Retrying (GithubRetry(total=3, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<urllib3.connection.HTTPSConnection object at 0x7f2fb8615d10>: Failed to establish a new connection: [Errno -2] Name or service not known')': /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80
2025-05-16 01:16:16,590 [urllib3.conn] DEBUG Starting new HTTPS connection (8): api.github.com:443
2025-05-16 01:16:26,600 [urllib3.util] DEBUG Incremented Retry for (url='/repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80'): GithubRetry(total=2, connect=None, read=None, redirect=None, status=None)
2025-05-16 01:16:26,600 [urllib3.conn] WARNI Retrying (GithubRetry(total=2, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<urllib3.connection.HTTPSConnection object at 0x7f2fb8616690>: Failed to establish a new connection: [Errno -2] Name or service not known')': /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80
2025-05-16 01:16:26,600 [urllib3.conn] DEBUG Starting new HTTPS connection (9): api.github.com:443
2025-05-16 01:16:36,611 [urllib3.util] DEBUG Incremented Retry for (url='/repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80'): GithubRetry(total=1, connect=None, read=None, redirect=None, status=None)
2025-05-16 01:16:36,611 [urllib3.conn] WARNI Retrying (GithubRetry(total=1, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<urllib3.connection.HTTPSConnection object at 0x7f2fb8617090>: Failed to establish a new connection: [Errno -2] Name or service not known')': /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80
2025-05-16 01:16:36,612 [urllib3.conn] DEBUG Starting new HTTPS connection (10): api.github.com:443
2025-05-16 01:16:46,624 [urllib3.util] DEBUG Incremented Retry for (url='/repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80'): GithubRetry(total=0, connect=None, read=None, redirect=None, status=None)
2025-05-16 01:16:46,624 [urllib3.conn] WARNI Retrying (GithubRetry(total=0, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<urllib3.connection.HTTPSConnection object at 0x7f2fb8617950>: Failed to establish a new connection: [Errno -2] Name or service not known')': /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80
2025-05-16 01:16:46,624 [urllib3.conn] DEBUG Starting new HTTPS connection (11): api.github.com:443
2025-05-16 01:16:56,635 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-05-16 01:16:56,635 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 01:16:56,638 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-05-16 01:16:56,638 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 01:16:56,640 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:16:56,640 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-05-16 01:16:56,640 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 01:16:56,643 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:16:56,643 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-05-16 01:16:56,643 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 01:16:56,645 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:16:56,645 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-05-16 01:16:56,645 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 01:16:56,647 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:16:56,647 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-05-16 01:16:56,647 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 01:16:56,649 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:16:56,650 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-05-16 01:16:56,650 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 01:16:56,652 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:16:56,652 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-05-16 01:16:56,652 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 01:16:56,654 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:16:56,654 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-05-16 01:16:56,654 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 01:16:56,656 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:16:56,657 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-16 01:16:56,657 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 01:16:56,659 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:16:56,659 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-16 01:16:56,659 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 01:16:56,661 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:16:56,661 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-16 01:16:56,661 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 01:16:56,664 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:16:56,664 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-16 01:16:56,664 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 01:16:56,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:16:56,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-16 01:16:56,666 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 01:16:56,668 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:16:56,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-16 01:16:56,669 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 01:16:56,671 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:16:56,671 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-16 01:16:56,671 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 01:16:56,673 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:16:56,673 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-16 01:16:56,673 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 01:16:56,675 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:16:56,675 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-16 01:16:56,675 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 01:16:56,678 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:16:56,678 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-16 01:16:56,678 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 01:16:56,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:16:56,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-16 01:16:56,680 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 01:16:56,682 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:16:56,682 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-16 01:16:56,682 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 01:16:56,684 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:16:56,684 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-16 01:16:56,684 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 01:16:56,687 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-16 01:16:56,687 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-16 01:16:56,687 [ scc.git] DEBUG Calling 'git remote'
2025-05-16 01:16:56,689 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/urllib3/connection.py", line 174, in _new_conn
conn = connection.create_connection(
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/urllib3/util/connection.py", line 72, in create_connection
for res in socket.getaddrinfo(host, port, family, socket.SOCK_STREAM):
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib64/python3.11/socket.py", line 962, in getaddrinfo
for res in _socket.getaddrinfo(host, port, family, type, proto, flags):
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
socket.gaierror: [Errno -2] Name or service not known
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/urllib3/connectionpool.py", line 716, in urlopen
httplib_response = self._make_request(
^^^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/urllib3/connectionpool.py", line 404, in _make_request
self._validate_conn(conn)
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/urllib3/connectionpool.py", line 1061, in _validate_conn
conn.connect()
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/urllib3/connection.py", line 363, in connect
self.sock = conn = self._new_conn()
^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/urllib3/connection.py", line 186, in _new_conn
raise NewConnectionError(
urllib3.exceptions.NewConnectionError: <urllib3.connection.HTTPSConnection object at 0x7f2fb8624390>: Failed to establish a new connection: [Errno -2] Name or service not known
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/requests/adapters.py", line 667, in send
resp = conn.urlopen(
^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/urllib3/connectionpool.py", line 830, in urlopen
return self.urlopen(
^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/urllib3/connectionpool.py", line 830, in urlopen
return self.urlopen(
^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/urllib3/connectionpool.py", line 830, in urlopen
return self.urlopen(
^^^^^^^^^^^^^
[Previous line repeated 7 more times]
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/urllib3/connectionpool.py", line 802, in urlopen
retries = retries.increment(
^^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/github/GithubRetry.py", line 205, in increment
return super().increment(method, url, response, error, _pool, _stacktrace)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/urllib3/util/retry.py", line 594, in increment
raise MaxRetryError(_pool, url, error or ResponseError(cause))
urllib3.exceptions.MaxRetryError: HTTPSConnectionPool(host='api.github.com', port=443): Max retries exceeded with url: /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 (Caused by NewConnectionError('<urllib3.connection.HTTPSConnection object at 0x7f2fb8624390>: Failed to establish a new connection: [Errno -2] Name or service not known'))
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/scc/main.py", line 64, in entry_point
main("scc", items=[
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/yaclifw/framework.py", line 188, in main
ns.func(ns)
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 3332, in __call__
self.merge(args, self.main_repo)
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 3357, in merge
updated, merge_msg = main_repo.rmerge(
^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 1851, in rmerge
submodule_updated, submodule_msg = submodule_repo.rmerge(
^^^^^^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 1822, in rmerge
merge_msg += self.origin.find_candidate_pulls(filters)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 930, in find_candidate_pulls
include, exclude_reason = self.filter_pull(pullrequest, filters)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 996, in filter_pull
status_included, reason = self.run_status_filter(pullrequest, filters)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 1039, in run_status_filter
statuses = pullrequest.get_last_commit().get_statuses()
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 126, in wrapper
error = check_exception_message(e)
^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 115, in wrapper
return func(*args, **kwargs)
^^^^^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 694, in get_last_commit
return branch.repo.get_commit(self.get_sha())
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/github/Repository.py", line 2327, in get_commit
headers, data = self._requester.requestJsonAndCheck("GET", f"{self.url}/commits/{sha}")
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/github/Requester.py", line 625, in requestJsonAndCheck
*self.requestJson(
^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/github/Requester.py", line 959, in requestJson
status, responseHeaders, output = self.__requestEncode(
^^^^^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/github/Requester.py", line 1098, in __requestEncode
status, responseHeaders, output = self.__requestRaw(
^^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/github/Requester.py", line 1136, in __requestRaw
response = cnx.getresponse()
^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/github/Requester.py", line 214, in getresponse
r = verb(
^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/requests/sessions.py", line 602, in get
return self.request("GET", url, **kwargs)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/requests/sessions.py", line 589, in request
resp = self.send(prep, **send_kwargs)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/requests/sessions.py", line 703, in send
r = adapter.send(request, **kwargs)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/requests/adapters.py", line 700, in send
raise ConnectionError(e, request=request)
requests.exceptions.ConnectionError: HTTPSConnectionPool(host='api.github.com', port=443): Max retries exceeded with url: /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 (Caused by NewConnectionError('<urllib3.connection.HTTPSConnection object at 0x7f2fb8624390>: Failed to establish a new connection: [Errno -2] Name or service not known'))
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
ERROR: script returned exit code 1
Finished: FAILURE
![[Jenkins]](/jenkins/static/9bac06d9/images/svgs/logo.svg){kind=logo}
