Skipping 220 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-08-01 08:07:41,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:07:41,015 [ scc.git] DEBUG Calling 'git merge-base bb94cf8da960e3283090038b04432f301560f5e4 45d08b7e29871ecff0386975c975dacd0865bcc4'
2025-08-01 08:07:41,018 [ scc.git] DEBUG Calling 'git diff --name-only 7a798ceeb3926d049d73788555fb63269a071052..bb94cf8da960e3283090038b04432f301560f5e4'
2025-08-01 08:07:41,020 [ scc.git] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Conflicting PR. Removed from build [OMERO-plugins-push#491](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/consoleText) for more details.
Possible conflicts:
- PR #499 dependabot[bot] 'Bump nanoid and mocha'
- package-lock.json
--conflicts
2025-08-01 08:07:41,023 [ scc.config] DEBUG Found github.token
2025-08-01 08:07:41,023 [ scc.git] DEBUG Not adding comment to issue #502, already --conflicts.
2025-08-01 08:07:41,023 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-01 08:07:41,066 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:07:41,066 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:07:41,068 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-01 08:07:41,107 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-01 08:07:41,114 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f356ef2ab90> has no local changes
2025-08-01 08:07:41,114 [ 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)
Updating 7a798ce..bb94cf8
Previously merged:
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#491 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/)'
2025-08-01 08:07:41,121 [ scc.git] DEBUG [detached HEAD 2f93f94] merge master -Dorg -Ssuccess-only
2025-08-01 08:07:41,121 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:07:41,121 [ scc.repo] DEBUG ## PRs found:
2025-08-01 08:07:41,265 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:41,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-08-01 08:07:41,808 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:42,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-08-01 08:07:42,306 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:42,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-08-01 08:07:42,843 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:43,075 [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-08-01 08:07:43,327 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:43,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-08-01 08:07:43,877 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:44,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-08-01 08:07:44,101 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-01 08:07:44,352 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:44,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-08-01 08:07:44,880 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:45,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-08-01 08:07:45,396 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:45,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-08-01 08:07:45,967 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:46,211 [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-08-01 08:07:46,462 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:46,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-08-01 08:07:46,920 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:47,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-08-01 08:07:47,128 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-08-01 08:07:47,128 [ scc.repo] DEBUG ## Branches found:
2025-08-01 08:07:47,128 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-08-01 08:07:47,129 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:07:47,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:07:47,131 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-01 08:07:47,134 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-01 08:07:47,134 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-01 08:07:47,137 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-01 08:07:47,140 [ scc.git] DEBUG Already up to date.
2025-08-01 08:07:47,140 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-08-01 08:07:47,936 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-08-01 08:07:47,936 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-08-01 08:07:47,940 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-08-01 08:07:48,222 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-08-01 08:07:48,222 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-08-01 08:07:48,227 [ scc.git] DEBUG ## Unique users: []
2025-08-01 08:07:48,227 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:07:48,227 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:07:48,229 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-08-01 08:07:48,233 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:07:48,236 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-08-01 08:07:48,259 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-01 08:07:48,262 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-08-01 08:07:48,262 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-08-01 08:07:48,262 [ scc.git] DEBUG requirements.txt | 2 +-
2025-08-01 08:07:48,262 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-08-01 08:07:48,263 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-08-01 08:07:48,263 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-08-01 08:07:48,264 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:48,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:07:48,461 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-08-01 08:07:48,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:07:48,467 [ 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-08-01 08:07:48,476 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-01 08:07:48,480 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-08-01 08:07:48,480 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-08-01 08:07:48,711 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:48,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:07:48,898 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-01 08:07:48,939 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:07:48,939 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:07:48,941 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-01 08:07:48,981 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-01 08:07:48,985 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f356eefe910> has no local changes
2025-08-01 08:07:48,985 [ 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#491 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/)'
2025-08-01 08:07:48,991 [ scc.git] DEBUG [detached HEAD a260d0e] merge master -Dorg -Ssuccess-only
2025-08-01 08:07:48,991 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:07:48,992 [ scc.repo] DEBUG ## PRs found:
2025-08-01 08:07:49,149 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:49,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-08-01 08:07:49,703 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:49,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-08-01 08:07:50,240 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:50,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-08-01 08:07:50,797 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:51,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-08-01 08:07:51,355 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:51,593 [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-08-01 08:07:51,844 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:52,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-08-01 08:07:52,397 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:52,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-08-01 08:07:52,626 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-08-01 08:07:52,877 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:53,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-08-01 08:07:53,362 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:53,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-08-01 08:07:53,887 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:54,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-08-01 08:07:54,422 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:54,674 [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-08-01 08:07:54,926 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:55,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-08-01 08:07:55,470 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:55,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-08-01 08:07:55,676 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-08-01 08:07:55,677 [ scc.repo] DEBUG ## Branches found:
2025-08-01 08:07:55,677 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-08-01 08:07:55,677 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:07:55,677 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:07:55,680 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-01 08:07:55,682 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-01 08:07:55,682 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-01 08:07:55,685 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-01 08:07:55,693 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-08-01 08:07:55,927 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:56,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-08-01 08:07:56,371 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-08-01 08:07:57,133 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-08-01 08:07:57,133 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-08-01 08:07:57,138 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-08-01 08:07:57,690 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-08-01 08:07:57,690 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-08-01 08:07:57,695 [ scc.git] DEBUG ## Unique users: []
2025-08-01 08:07:57,695 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:07:57,695 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:07:57,697 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-08-01 08:07:57,702 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:07:57,704 [ 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-08-01 08:07:57,909 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-08-01 08:07:57,910 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-08-01 08:07:57,910 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-08-01 08:07:57,910 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-08-01 08:07:57,910 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-01 08:07:57,910 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-01 08:07:57,913 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-08-01 08:07:57,918 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-08-01 08:07:57,919 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:58,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:07:58,099 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-08-01 08:07:58,103 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-08-01 08:07:58,106 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#491](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-08-01 08:07:58,108 [ scc.config] DEBUG Found github.token
2025-08-01 08:07:58,108 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-08-01 08:07:58,109 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-08-01 08:07:58,113 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:07:58,115 [ 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-08-01 08:07:58,202 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-08-01 08:07:58,202 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-08-01 08:07:58,203 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-08-01 08:07:58,203 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-01 08:07:58,203 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-01 08:07:58,206 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-08-01 08:07:58,211 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-08-01 08:07:58,350 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:58,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:07:58,532 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-08-01 08:07:58,536 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-08-01 08:07:58,539 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#491](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/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-08-01 08:07:58,541 [ scc.config] DEBUG Found github.token
2025-08-01 08:07:58,542 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-08-01 08:07:58,542 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-01 08:07:58,583 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:07:58,583 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:07:58,585 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-01 08:07:58,625 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-01 08:07:58,629 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f356eeaec50> has no local changes
2025-08-01 08:07:58,629 [ 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#491 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/)'
2025-08-01 08:07:58,637 [ scc.git] DEBUG [detached HEAD 6740b11] merge master -Dorg -Ssuccess-only
2025-08-01 08:07:58,637 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:07:58,637 [ scc.repo] DEBUG ## PRs found:
2025-08-01 08:07:58,783 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:59,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-08-01 08:07:59,384 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:07:59,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-08-01 08:07:59,914 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:00,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-08-01 08:08:00,457 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:00,777 [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-08-01 08:08:01,028 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:01,266 [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-08-01 08:08:01,518 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:01,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-08-01 08:08:02,044 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:02,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-08-01 08:08:02,240 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-01 08:08:02,491 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:02,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-08-01 08:08:02,742 [ scc.repo] DEBUG # ... Include label: dependencies
2025-08-01 08:08:02,993 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:03,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-08-01 08:08:03,575 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:03,876 [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-08-01 08:08:04,128 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:04,411 [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-08-01 08:08:04,663 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:04,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-08-01 08:08:05,236 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:05,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-08-01 08:08:05,500 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-08-01 08:08:05,751 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:05,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-08-01 08:08:05,988 [ scc.repo] DEBUG # ... Include label: dependencies
2025-08-01 08:08:06,239 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:06,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-08-01 08:08:06,824 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:07,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-08-01 08:08:07,407 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:07,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-08-01 08:08:07,946 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:08,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-08-01 08:08:08,514 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:08,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-08-01 08:08:08,780 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-08-01 08:08:09,031 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:09,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-08-01 08:08:09,563 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:09,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-08-01 08:08:10,118 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:10,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-08-01 08:08:10,596 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:10,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-08-01 08:08:11,077 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:11,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-08-01 08:08:11,552 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:11,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-08-01 08:08:12,046 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:12,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-08-01 08:08:12,282 [ scc.repo] DEBUG ## Branches found:
2025-08-01 08:08:12,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-08-01 08:08:12,282 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:12,282 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:12,285 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-01 08:08:12,287 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-01 08:08:12,287 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-01 08:08:12,290 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-01 08:08:12,294 [ scc.git] DEBUG Already up to date.
2025-08-01 08:08:12,294 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-08-01 08:08:12,578 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-08-01 08:08:12,579 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-08-01 08:08:12,583 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-08-01 08:08:12,861 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-08-01 08:08:12,861 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-08-01 08:08:12,866 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-08-01 08:08:13,207 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-08-01 08:08:13,208 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-08-01 08:08:13,212 [ scc.git] DEBUG ## Unique users: []
2025-08-01 08:08:13,212 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:13,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:13,214 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-08-01 08:08:13,229 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:13,232 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 140 (Bump vite from 4.2.3 to 4.5.9) 6301bc61b0a877104173846d526382bf15cc70a0'
2025-08-01 08:08:13,352 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-01 08:08:13,356 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-08-01 08:08:13,356 [ scc.git] DEBUG package.json | 2 +-
2025-08-01 08:08:13,356 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-08-01 08:08:13,357 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:13,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:08:13,543 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-08-01 08:08:13,559 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:13,561 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 141 (Bump axios from 1.6.0 to 1.8.2) de7db17cd62b498179713df276cff151a1f36d80'
2025-08-01 08:08:13,664 [ scc.git] DEBUG Auto-merging package-lock.json
2025-08-01 08:08:13,664 [ scc.git] DEBUG Auto-merging package.json
2025-08-01 08:08:13,665 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-01 08:08:13,668 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-08-01 08:08:13,668 [ scc.git] DEBUG package.json | 2 +-
2025-08-01 08:08:13,668 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-08-01 08:08:13,794 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:13,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:08:13,972 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-08-01 08:08:13,975 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:13,978 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 142 (Use the release/v1 branch for the PyPA action publishing to PyPI) 16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-08-01 08:08:13,988 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-01 08:08:13,991 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-08-01 08:08:13,991 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-08-01 08:08:14,223 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:14,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:08:14,412 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-01 08:08:14,453 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:14,453 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:14,455 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-01 08:08:14,494 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-01 08:08:14,499 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f356c529a90> has no local changes
2025-08-01 08:08:14,499 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Generated by OMERO-plugins-push#491 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/)'
2025-08-01 08:08:14,505 [ scc.git] DEBUG [detached HEAD 78391d2] merge master -Dorg -Ssuccess-only
2025-08-01 08:08:14,506 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:08:14,506 [ scc.repo] DEBUG ## PRs found:
2025-08-01 08:08:14,663 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:14,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-08-01 08:08:14,870 [ scc.repo] DEBUG ## Branches found:
2025-08-01 08:08:14,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-08-01 08:08:14,870 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:14,870 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:14,872 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-01 08:08:14,875 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-01 08:08:14,875 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-01 08:08:14,878 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-01 08:08:14,881 [ scc.git] DEBUG Already up to date.
2025-08-01 08:08:14,881 [ scc.git] DEBUG ## Unique users: []
2025-08-01 08:08:14,881 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:14,881 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:14,883 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-01 08:08:14,922 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:14,922 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:14,925 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-01 08:08:14,962 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-01 08:08:14,965 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f356c517c50> has no local changes
2025-08-01 08:08:14,965 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-prometheus-tools
Already up to date.
Generated by OMERO-plugins-push#491 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/)'
2025-08-01 08:08:14,971 [ scc.git] DEBUG [detached HEAD d1b8cbe] merge master -Dorg -Ssuccess-only
2025-08-01 08:08:14,971 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:08:14,972 [ scc.repo] DEBUG ## PRs found:
2025-08-01 08:08:15,121 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:15,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-08-01 08:08:15,698 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:15,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-08-01 08:08:16,216 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:16,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-08-01 08:08:16,685 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:16,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-08-01 08:08:16,956 [ scc.repo] DEBUG ## Branches found:
2025-08-01 08:08:16,956 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-08-01 08:08:16,956 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:16,956 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:16,958 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-01 08:08:16,961 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-01 08:08:16,961 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-01 08:08:16,964 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-01 08:08:16,967 [ scc.git] DEBUG Already up to date.
2025-08-01 08:08:16,967 [ scc.git] DEBUG ## Unique users: []
2025-08-01 08:08:16,967 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:16,967 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:16,970 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-01 08:08:17,010 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:17,010 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:17,012 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-01 08:08:17,052 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-01 08:08:17,055 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f356ffba6d0> has no local changes
2025-08-01 08:08:17,056 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Generated by OMERO-plugins-push#491 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/)'
2025-08-01 08:08:17,062 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:08:17,062 [ scc.repo] DEBUG ## PRs found:
2025-08-01 08:08:17,062 [ scc.git] DEBUG [detached HEAD c632298] merge master -Dorg -Ssuccess-only
2025-08-01 08:08:17,207 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:17,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-08-01 08:08:17,765 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:17,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-08-01 08:08:18,249 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:18,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-08-01 08:08:18,707 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:19,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-08-01 08:08:19,313 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:19,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-08-01 08:08:19,831 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:20,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-08-01 08:08:20,335 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:20,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-08-01 08:08:20,539 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-08-01 08:08:20,540 [ scc.repo] DEBUG ## Branches found:
2025-08-01 08:08:20,540 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-08-01 08:08:20,540 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:20,540 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:20,543 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-01 08:08:20,545 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-01 08:08:20,545 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-01 08:08:20,548 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-01 08:08:20,551 [ scc.git] DEBUG Already up to date.
2025-08-01 08:08:20,551 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-08-01 08:08:20,939 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-08-01 08:08:20,939 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-08-01 08:08:20,944 [ scc.git] DEBUG ## Unique users: []
2025-08-01 08:08:20,944 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:20,944 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:20,946 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-08-01 08:08:20,950 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:20,952 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-08-01 08:08:21,091 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-08-01 08:08:21,091 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-08-01 08:08:21,091 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-08-01 08:08:21,091 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-08-01 08:08:21,091 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-08-01 08:08:21,091 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-08-01 08:08:21,091 [ scc.git] DEBUG Auto-merging setup.py
2025-08-01 08:08:21,091 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-08-01 08:08:21,091 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-01 08:08:21,092 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-01 08:08:21,094 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-08-01 08:08:21,099 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-08-01 08:08:21,100 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:21,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:08:21,293 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-08-01 08:08:21,296 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-08-01 08:08:21,300 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#491](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/views.py
- setup.py
- omero_signup/signup_settings.py
--conflicts
2025-08-01 08:08:21,302 [ scc.config] DEBUG Found github.token
2025-08-01 08:08:21,302 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-08-01 08:08:21,303 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-01 08:08:21,345 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:21,345 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:21,347 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-01 08:08:21,384 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-01 08:08:21,388 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f356c563150> has no local changes
2025-08-01 08:08:21,388 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Generated by OMERO-plugins-push#491 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/)'
2025-08-01 08:08:21,394 [ scc.git] DEBUG [detached HEAD 33b3ae6] merge master -Dorg -Ssuccess-only
2025-08-01 08:08:21,394 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:08:21,395 [ scc.repo] DEBUG ## PRs found:
2025-08-01 08:08:21,544 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:21,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-08-01 08:08:22,220 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:22,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-08-01 08:08:22,743 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:23,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-08-01 08:08:23,333 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:23,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-08-01 08:08:23,887 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:24,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-08-01 08:08:24,385 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:24,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-08-01 08:08:24,869 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:25,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6?per_page=1 HTTP/1.1" 200 2
2025-08-01 08:08:25,085 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-08-01 08:08:25,337 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:25,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-08-01 08:08:25,842 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:26,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-08-01 08:08:26,372 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:26,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-08-01 08:08:26,936 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:27,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-08-01 08:08:27,534 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:27,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-08-01 08:08:28,023 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:28,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-08-01 08:08:28,526 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:28,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-08-01 08:08:29,019 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:29,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-08-01 08:08:29,509 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:29,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-08-01 08:08:30,019 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:30,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-08-01 08:08:30,549 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:30,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-08-01 08:08:31,043 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:31,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-08-01 08:08:31,580 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:31,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2025-08-01 08:08:31,777 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-08-01 08:08:31,778 [ scc.repo] DEBUG ## Branches found:
2025-08-01 08:08:31,778 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-08-01 08:08:31,778 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:31,778 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:31,781 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-01 08:08:31,784 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-01 08:08:31,784 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-01 08:08:31,787 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-01 08:08:31,791 [ scc.git] DEBUG Already up to date.
2025-08-01 08:08:31,791 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-08-01 08:08:32,110 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-08-01 08:08:32,110 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-08-01 08:08:32,115 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-08-01 08:08:32,485 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-08-01 08:08:32,485 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-08-01 08:08:32,490 [ scc.git] DEBUG ## Unique users: []
2025-08-01 08:08:32,490 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:32,490 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:32,492 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-08-01 08:08:32,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:32,499 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2025-08-01 08:08:32,522 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-01 08:08:32,526 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-08-01 08:08:32,526 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-08-01 08:08:32,526 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-08-01 08:08:32,526 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-08-01 08:08:32,526 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-08-01 08:08:32,526 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-08-01 08:08:32,526 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-08-01 08:08:32,526 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-08-01 08:08:32,527 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:32,527 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-08-01 08:08:32,527 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-08-01 08:08:32,527 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-08-01 08:08:32,527 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-08-01 08:08:32,527 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-08-01 08:08:32,527 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-08-01 08:08:32,527 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-08-01 08:08:32,527 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-08-01 08:08:32,527 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-08-01 08:08:32,527 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-08-01 08:08:32,527 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-08-01 08:08:32,527 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-08-01 08:08:32,527 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-08-01 08:08:32,527 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-08-01 08:08:32,528 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-08-01 08:08:32,528 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-08-01 08:08:32,528 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-08-01 08:08:32,528 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-08-01 08:08:32,528 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-08-01 08:08:32,528 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-08-01 08:08:32,528 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-08-01 08:08:32,528 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-08-01 08:08:32,528 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-08-01 08:08:32,528 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-08-01 08:08:32,528 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-08-01 08:08:32,528 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-08-01 08:08:32,528 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-08-01 08:08:32,528 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-08-01 08:08:32,528 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-08-01 08:08:32,528 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-08-01 08:08:32,528 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-08-01 08:08:32,528 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-08-01 08:08:32,528 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-08-01 08:08:32,528 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-08-01 08:08:32,528 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-08-01 08:08:32,528 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-08-01 08:08:32,528 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-08-01 08:08:32,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:08:32,702 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-08-01 08:08:32,706 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:32,708 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-08-01 08:08:32,718 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-01 08:08:32,721 [ scc.git] DEBUG docker | 1 +
2025-08-01 08:08:32,721 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-08-01 08:08:32,952 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:33,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:08:33,146 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-01 08:08:33,188 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:33,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:33,190 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-01 08:08:33,228 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-01 08:08:33,232 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f356ee2f050> has no local changes
2025-08-01 08:08:33,232 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
- PR 76 will-moore 'Run cli deps'
Generated by OMERO-plugins-push#491 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/)'
2025-08-01 08:08:33,238 [ scc.git] DEBUG [detached HEAD 665fef5] merge master -Dorg -Ssuccess-only
2025-08-01 08:08:33,238 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:08:33,239 [ scc.repo] DEBUG ## PRs found:
2025-08-01 08:08:33,397 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:33,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-08-01 08:08:33,633 [ scc.repo] DEBUG ## Branches found:
2025-08-01 08:08:33,633 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-08-01 08:08:33,633 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:33,633 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:33,635 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-01 08:08:33,638 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-01 08:08:33,638 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-01 08:08:33,641 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-01 08:08:33,644 [ scc.git] DEBUG Already up to date.
2025-08-01 08:08:33,644 [ scc.git] DEBUG ## Unique users: []
2025-08-01 08:08:33,644 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:33,644 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:33,646 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-01 08:08:33,688 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:33,688 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:33,690 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-01 08:08:33,730 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-01 08:08:33,733 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f356c5382d0> has no local changes
2025-08-01 08:08:33,733 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-upload
Already up to date.
Generated by OMERO-plugins-push#491 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/)'
2025-08-01 08:08:33,739 [ scc.git] DEBUG [detached HEAD fbebf16] merge master -Dorg -Ssuccess-only
2025-08-01 08:08:33,739 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:08:33,739 [ scc.repo] DEBUG ## PRs found:
2025-08-01 08:08:33,884 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:34,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2025-08-01 08:08:34,081 [ scc.repo] DEBUG ## Branches found:
2025-08-01 08:08:34,081 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-08-01 08:08:34,081 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:34,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:34,083 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-01 08:08:34,087 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-01 08:08:34,087 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-01 08:08:34,090 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-01 08:08:34,097 [ scc.git] DEBUG Updating deab817..160d894
2025-08-01 08:08:34,332 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:34,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls/20 HTTP/1.1" 200 None
2025-08-01 08:08:34,839 [ scc.git] DEBUG ## Unique users: []
2025-08-01 08:08:34,839 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:34,839 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:34,841 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-01 08:08:34,883 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:34,883 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:34,885 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-01 08:08:34,925 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-01 08:08:34,928 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f356c56e6d0> has no local changes
2025-08-01 08:08:34,928 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-virtual-microscope
Updating deab817..160d894
Previously merged:
- PR 20 jburel 'Build'
Generated by OMERO-plugins-push#491 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/)'
2025-08-01 08:08:34,935 [ scc.git] DEBUG [detached HEAD bab9a8a] merge master -Dorg -Ssuccess-only
2025-08-01 08:08:34,935 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:08:34,935 [ scc.git] INFO Overriding base-branch from master to main
2025-08-01 08:08:34,935 [ scc.repo] DEBUG ## PRs found:
2025-08-01 08:08:35,089 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:35,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-08-01 08:08:35,656 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:35,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-08-01 08:08:36,160 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:36,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-08-01 08:08:36,627 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:36,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-08-01 08:08:37,228 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:37,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-08-01 08:08:37,750 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:38,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-08-01 08:08:38,319 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:38,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-08-01 08:08:38,836 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:39,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-08-01 08:08:39,342 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:39,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-08-01 08:08:39,827 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:40,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-08-01 08:08:40,371 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:40,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-08-01 08:08:40,864 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:41,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-08-01 08:08:41,437 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:41,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-08-01 08:08:41,630 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-08-01 08:08:41,630 [ scc.repo] DEBUG ## Branches found:
2025-08-01 08:08:41,630 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-08-01 08:08:41,630 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:41,630 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:41,633 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-08-01 08:08:41,635 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-01 08:08:41,635 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-08-01 08:08:41,638 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-08-01 08:08:41,641 [ scc.git] DEBUG Already up to date.
2025-08-01 08:08:41,641 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-08-01 08:08:42,062 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-08-01 08:08:42,062 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-08-01 08:08:42,067 [ scc.git] DEBUG ## Unique users: []
2025-08-01 08:08:42,067 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:42,067 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:42,069 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-08-01 08:08:42,072 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:42,074 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-08-01 08:08:42,266 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-08-01 08:08:42,266 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-08-01 08:08:42,266 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-01 08:08:42,266 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-01 08:08:42,269 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-08-01 08:08:42,273 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-08-01 08:08:42,275 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:42,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:08:42,457 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-08-01 08:08:42,460 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-08-01 08:08:42,463 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#491](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-08-01 08:08:42,465 [ scc.config] DEBUG Found github.token
2025-08-01 08:08:42,465 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-08-01 08:08:42,465 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-01 08:08:42,507 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:42,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:42,509 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-01 08:08:42,547 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-01 08:08:42,551 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f356ef499d0> has no local changes
2025-08-01 08:08:42,551 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Generated by OMERO-plugins-push#491 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/)'
2025-08-01 08:08:42,557 [ scc.git] DEBUG [detached HEAD bf75f86] merge master -Dorg -Ssuccess-only
2025-08-01 08:08:42,557 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:08:42,557 [ scc.repo] DEBUG ## PRs found:
2025-08-01 08:08:42,708 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:42,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-08-01 08:08:42,933 [ scc.repo] DEBUG ## Branches found:
2025-08-01 08:08:42,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-08-01 08:08:42,933 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:42,933 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:42,935 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-01 08:08:42,937 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-01 08:08:42,938 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-01 08:08:42,940 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-01 08:08:42,943 [ scc.git] DEBUG Already up to date.
2025-08-01 08:08:42,943 [ scc.git] DEBUG ## Unique users: []
2025-08-01 08:08:42,943 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:42,943 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:42,946 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-01 08:08:42,983 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:42,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:42,985 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-01 08:08:43,023 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-01 08:08:43,026 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f356c596010> has no local changes
2025-08-01 08:08:43,026 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-weberror
Already up to date.
Generated by OMERO-plugins-push#491 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/)'
2025-08-01 08:08:43,032 [ scc.git] DEBUG [detached HEAD e33c81b] merge master -Dorg -Ssuccess-only
2025-08-01 08:08:43,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:08:43,032 [ scc.repo] DEBUG ## PRs found:
2025-08-01 08:08:43,184 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:43,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-08-01 08:08:43,387 [ scc.repo] DEBUG ## Branches found:
2025-08-01 08:08:43,387 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-08-01 08:08:43,387 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:43,387 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:43,389 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-01 08:08:43,392 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-01 08:08:43,392 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-01 08:08:43,395 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-01 08:08:43,398 [ scc.git] DEBUG Already up to date.
2025-08-01 08:08:43,398 [ scc.git] DEBUG ## Unique users: []
2025-08-01 08:08:43,398 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:43,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:43,400 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-01 08:08:43,440 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:43,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:43,442 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-01 08:08:43,481 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-01 08:08:43,485 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f356ef48750> has no local changes
2025-08-01 08:08:43,485 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-webtest
Already up to date.
Generated by OMERO-plugins-push#491 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/)'
2025-08-01 08:08:43,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:08:43,491 [ scc.git] DEBUG [detached HEAD 7b5cccb] merge master -Dorg -Ssuccess-only
2025-08-01 08:08:43,491 [ scc.repo] DEBUG ## PRs found:
2025-08-01 08:08:43,638 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:43,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-08-01 08:08:44,157 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:44,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-08-01 08:08:44,657 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:44,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-08-01 08:08:45,160 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:45,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-08-01 08:08:45,678 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:45,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-08-01 08:08:46,163 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:46,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-08-01 08:08:46,711 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:46,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-08-01 08:08:46,895 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-08-01 08:08:46,895 [ scc.repo] DEBUG ## Branches found:
2025-08-01 08:08:46,895 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-08-01 08:08:46,895 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:46,895 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:46,898 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-08-01 08:08:46,901 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-01 08:08:46,901 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-08-01 08:08:46,904 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-08-01 08:08:46,907 [ scc.git] DEBUG Already up to date.
2025-08-01 08:08:46,907 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-08-01 08:08:47,330 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-08-01 08:08:47,330 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-08-01 08:08:47,335 [ scc.git] DEBUG ## Unique users: []
2025-08-01 08:08:47,335 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:47,335 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:47,337 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-08-01 08:08:47,340 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:47,342 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-08-01 08:08:47,448 [ scc.git] DEBUG Auto-merging Dockerfile
2025-08-01 08:08:47,448 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-08-01 08:08:47,449 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-01 08:08:47,449 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-01 08:08:47,452 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-08-01 08:08:47,457 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-08-01 08:08:47,458 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:47,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:08:47,634 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-08-01 08:08:47,638 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-08-01 08:08:47,641 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#491](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-08-01 08:08:47,643 [ scc.config] DEBUG Found github.token
2025-08-01 08:08:47,643 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-08-01 08:08:47,643 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-01 08:08:47,682 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:47,682 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:47,684 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-01 08:08:47,723 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-01 08:08:47,727 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f356ffba050> has no local changes
2025-08-01 08:08:47,727 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Generated by OMERO-plugins-push#491 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/)'
2025-08-01 08:08:47,733 [ scc.git] DEBUG [detached HEAD 2eccba0] merge master -Dorg -Ssuccess-only
2025-08-01 08:08:47,733 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:08:47,733 [ scc.git] INFO Overriding base-branch from master to develop
2025-08-01 08:08:47,734 [ scc.repo] DEBUG ## PRs found:
2025-08-01 08:08:47,886 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:48,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-08-01 08:08:48,507 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:48,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-08-01 08:08:49,031 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:49,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-08-01 08:08:49,547 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:49,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-08-01 08:08:50,034 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:50,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-08-01 08:08:50,525 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:50,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-08-01 08:08:51,124 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:51,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-08-01 08:08:51,610 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:51,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-08-01 08:08:51,812 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-08-01 08:08:52,062 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:52,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-08-01 08:08:52,574 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:52,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-08-01 08:08:53,089 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:53,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-08-01 08:08:53,568 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:53,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-08-01 08:08:54,054 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:54,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-08-01 08:08:54,564 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:54,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-08-01 08:08:54,759 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-08-01 08:08:55,010 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:55,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-08-01 08:08:55,546 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:55,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-08-01 08:08:56,067 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:56,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-08-01 08:08:56,552 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:56,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-08-01 08:08:56,827 [ scc.repo] DEBUG ## Branches found:
2025-08-01 08:08:56,827 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-08-01 08:08:56,827 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:56,827 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:56,829 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-08-01 08:08:56,832 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-08-01 08:08:56,832 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-08-01 08:08:56,836 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-08-01 08:08:56,846 [ scc.git] DEBUG Updating 4b4c755..573db34
2025-08-01 08:08:57,076 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:57,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/227 HTTP/1.1" 200 None
2025-08-01 08:08:57,777 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:58,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-08-01 08:08:58,166 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-08-01 08:08:58,852 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-08-01 08:08:58,852 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-08-01 08:08:58,857 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-08-01 08:08:59,411 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-08-01 08:08:59,411 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-08-01 08:08:59,415 [ scc.git] DEBUG ## Unique users: []
2025-08-01 08:08:59,415 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:08:59,415 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:59,417 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-08-01 08:08:59,423 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:59,425 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-08-01 08:08:59,567 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-08-01 08:08:59,567 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-08-01 08:08:59,568 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-08-01 08:08:59,570 [ scc.git] DEBUG Calling 'git reset --hard 573db340d5d1429fa17c7e486206948412a7c150'
2025-08-01 08:08:59,574 [ scc.git] DEBUG HEAD is now at 573db34 Bump version: 5.9.1 → 5.9.2.dev0
2025-08-01 08:08:59,575 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:08:59,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:08:59,749 [ scc.git] DEBUG Calling 'git merge-base 573db340d5d1429fa17c7e486206948412a7c150 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-08-01 08:08:59,755 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..573db340d5d1429fa17c7e486206948412a7c150'
2025-08-01 08:08:59,759 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#491](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-08-01 08:08:59,761 [ scc.config] DEBUG Found github.token
2025-08-01 08:08:59,762 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-08-01 08:08:59,762 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-08-01 08:08:59,766 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:08:59,768 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-08-01 08:08:59,779 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-08-01 08:08:59,782 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-08-01 08:08:59,782 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-08-01 08:09:00,000 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:09:00,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:09:00,189 [ scc.git] DEBUG Calling 'git submodule update'
2025-08-01 08:09:00,230 [ scc.git] DEBUG Get sha1 of %s
2025-08-01 08:09:00,230 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-08-01 08:09:00,232 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-01 08:09:00,270 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-01 08:09:00,273 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f356c5b0450> has no local changes
2025-08-01 08:09:00,273 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..573db34
Previously merged:
- PR 227 jburel 'Replace tostring by tobytes'
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#491 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/)'
2025-08-01 08:09:00,280 [ scc.git] DEBUG [detached HEAD c895448] merge master -Dorg -Ssuccess-only
2025-08-01 08:09:00,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:09:00,280 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-08-01 08:09:00,357 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-08-01 08:09:00,440 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:09:00,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:09:00,640 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-08-01 08:09:00,642 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-08-01 08:09:00,887 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:09:01,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:09:01,075 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-08-01 08:09:01,077 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-08-01 08:09:01,321 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:09:01,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:09:01,521 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-08-01 08:09:01,523 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-08-01 08:09:01,767 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:09:01,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:09:01,981 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-08-01 08:09:02,226 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:09:02,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:09:02,412 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-08-01 08:09:02,414 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-08-01 08:09:02,659 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:09:02,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:09:02,832 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-08-01 08:09:02,834 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-08-01 08:09:03,079 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:09:03,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:09:03,296 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-08-01 08:09:03,298 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-08-01 08:09:03,543 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:09:03,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:09:03,722 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-08-01 08:09:03,724 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-08-01 08:09:03,968 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:09:04,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:09:04,143 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-08-01 08:09:04,145 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-08-01 08:09:04,390 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:09:04,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:09:04,576 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-08-01 08:09:04,578 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-08-01 08:09:04,822 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:09:05,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:09:05,020 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-08-01 08:09:05,022 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-08-01 08:09:05,267 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:09:05,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:09:05,459 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-08-01 08:09:05,461 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-08-01 08:09:05,706 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:09:05,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:09:05,888 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-08-01 08:09:06,133 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:09:06,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:09:06,322 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-08-01 08:09:06,567 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:09:06,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:09:06,753 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-08-01 08:09:06,755 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-08-01 08:09:07,000 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:09:07,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:09:07,182 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-08-01 08:09:07,427 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:09:07,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:09:07,599 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-08-01 08:09:07,843 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:09:08,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:09:08,024 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-08-01 08:09:08,026 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-08-01 08:09:08,270 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:09:08,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:09:08,457 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-08-01 08:09:08,459 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-08-01 08:09:08,703 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:09:08,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:09:08,906 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-08-01 08:09:08,908 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-08-01 08:09:09,153 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:09:09,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:09:09,366 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-08-01 08:09:09,368 [ scc.config] DEBUG Found submodule.scripts.url
2025-08-01 08:09:09,612 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-08-01 08:09:09,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-08-01 08:09:09,812 [ scc.config] DEBUG Found submodule.scripts.branch
2025-08-01 08:09:09,812 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-08-01 08:09:09,899 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f356eff4590> has local changes
2025-08-01 08:09:09,900 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
- PR 71 dominikl 'Escape slash character in image names'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 174 will-moore 'Skip wells' (stage: draft)
- PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 167 dominikl 'Add extinfo command' (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..f7eea7c
Previously merged:
- PR 179 will-moore 'Changelog 0.6.0'
- PR 177 jburel 'Replace fromstring by frombuffer'
- PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
- PR 147 will-moore 'Name option'
- PR 173 will-moore 'Add test_export_plate_polygons()'
- 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 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..d2c6f5bc
Previously merged:
- PR 638 Rdornier 'Fix arrow opacity'
- 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'
- PR 637 Rdornier 'Fix scalebar position'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Updating 7a798ce..bb94cf8
Previously merged:
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
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'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
- PR 76 will-moore 'Run cli deps'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Updating deab817..160d894
Previously merged:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..573db34
Previously merged:
- PR 227 jburel 'Replace tostring by tobytes'
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#491 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/491/)'
2025-08-01 08:09:09,912 [ scc.git] DEBUG [detached HEAD 35c31e5] merge master -Dorg -Ssuccess-only
2025-08-01 08:09:09,912 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-08-01 08:09:09,912 [ scc.merge] INFO Repository: ome/omero-plugins
2025-08-01 08:09:09,912 [ scc.merge] INFO Already up to date.
2025-08-01 08:09:09,912 [ scc.merge] INFO
2025-08-01 08:09:09,912 [ scc.merge] INFO Merged PRs:
2025-08-01 08:09:09,912 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-08-01 08:09:09,912 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-08-01 08:09:09,912 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-08-01 08:09:09,912 [ scc.merge] INFO
2025-08-01 08:09:09,913 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-08-01 08:09:09,913 [ scc.merge] INFO Already up to date.
2025-08-01 08:09:09,913 [ scc.merge] INFO
2025-08-01 08:09:09,913 [ scc.merge] INFO
2025-08-01 08:09:09,913 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-08-01 08:09:09,913 [ scc.merge] INFO Excluded PRs:
2025-08-01 08:09:09,913 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-08-01 08:09:09,913 [ scc.merge] INFO Already up to date.
2025-08-01 08:09:09,913 [ scc.merge] INFO
2025-08-01 08:09:09,913 [ scc.merge] INFO
2025-08-01 08:09:09,913 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-08-01 08:09:09,913 [ scc.merge] INFO Excluded PRs:
2025-08-01 08:09:09,913 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-08-01 08:09:09,913 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-08-01 08:09:09,913 [ scc.merge] INFO Already up to date.
2025-08-01 08:09:09,913 [ scc.merge] INFO
2025-08-01 08:09:09,913 [ scc.merge] INFO Merged PRs:
2025-08-01 08:09:09,913 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-08-01 08:09:09,913 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-08-01 08:09:09,913 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-08-01 08:09:09,913 [ scc.merge] INFO
2025-08-01 08:09:09,913 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-08-01 08:09:09,913 [ scc.merge] INFO Excluded PRs:
2025-08-01 08:09:09,913 [ scc.merge] INFO - PR 174 will-moore 'Skip wells' (stage: draft)
2025-08-01 08:09:09,913 [ scc.merge] INFO - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
2025-08-01 08:09:09,913 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-08-01 08:09:09,913 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-08-01 08:09:09,913 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-08-01 08:09:09,913 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-08-01 08:09:09,913 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-08-01 08:09:09,913 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-08-01 08:09:09,913 [ scc.merge] INFO Updating 11d3587..f7eea7c
2025-08-01 08:09:09,913 [ scc.merge] INFO Previously merged:
2025-08-01 08:09:09,913 [ scc.merge] INFO - PR 179 will-moore 'Changelog 0.6.0'
2025-08-01 08:09:09,913 [ scc.merge] INFO - PR 177 jburel 'Replace fromstring by frombuffer'
2025-08-01 08:09:09,913 [ scc.merge] INFO - PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
2025-08-01 08:09:09,913 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-08-01 08:09:09,913 [ scc.merge] INFO - PR 173 will-moore 'Add test_export_plate_polygons()'
2025-08-01 08:09:09,913 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-08-01 08:09:09,913 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-01 08:09:09,914 [ scc.merge] INFO
2025-08-01 08:09:09,914 [ scc.merge] INFO Merged PRs:
2025-08-01 08:09:09,914 [ scc.merge] INFO - PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
2025-08-01 08:09:09,914 [ scc.merge] INFO
2025-08-01 08:09:09,914 [ scc.merge] INFO Repository: ome/omero-figure
2025-08-01 08:09:09,914 [ scc.merge] INFO Excluded PRs:
2025-08-01 08:09:09,914 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-08-01 08:09:09,914 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-08-01 08:09:09,914 [ scc.merge] INFO Updating 9cc36cde..d2c6f5bc
2025-08-01 08:09:09,914 [ scc.merge] INFO Previously merged:
2025-08-01 08:09:09,914 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity'
2025-08-01 08:09:09,914 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-08-01 08:09:09,914 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-08-01 08:09:09,914 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-08-01 08:09:09,914 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-01 08:09:09,914 [ scc.merge] INFO
2025-08-01 08:09:09,914 [ scc.merge] INFO Merged PRs:
2025-08-01 08:09:09,914 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-08-01 08:09:09,914 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-08-01 08:09:09,914 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-08-01 08:09:09,914 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-08-01 08:09:09,914 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-08-01 08:09:09,914 [ scc.merge] INFO
2025-08-01 08:09:09,914 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-01 08:09:09,914 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-08-01 08:09:09,914 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-08-01 08:09:09,914 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position'
2025-08-01 08:09:09,914 [ scc.merge] INFO
2025-08-01 08:09:09,914 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-08-01 08:09:09,914 [ scc.merge] INFO Already up to date.
2025-08-01 08:09:09,914 [ scc.merge] INFO
2025-08-01 08:09:09,914 [ scc.merge] INFO Merged PRs:
2025-08-01 08:09:09,914 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-08-01 08:09:09,914 [ scc.merge] INFO
2025-08-01 08:09:09,914 [ scc.merge] INFO Repository: ome/omero-gallery
2025-08-01 08:09:09,914 [ scc.merge] INFO Already up to date.
2025-08-01 08:09:09,914 [ scc.merge] INFO
2025-08-01 08:09:09,914 [ scc.merge] INFO Merged PRs:
2025-08-01 08:09:09,914 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-08-01 08:09:09,914 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-08-01 08:09:09,914 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-08-01 08:09:09,915 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-08-01 08:09:09,915 [ scc.merge] INFO
2025-08-01 08:09:09,915 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-01 08:09:09,915 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-08-01 08:09:09,915 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-08-01 08:09:09,915 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-08-01 08:09:09,915 [ scc.merge] INFO
2025-08-01 08:09:09,915 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-08-01 08:09:09,915 [ scc.merge] INFO Excluded PRs:
2025-08-01 08:09:09,915 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-08-01 08:09:09,915 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-08-01 08:09:09,915 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-08-01 08:09:09,915 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-08-01 08:09:09,915 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-08-01 08:09:09,915 [ scc.merge] INFO Updating 7a798ce..bb94cf8
2025-08-01 08:09:09,915 [ scc.merge] INFO Previously merged:
2025-08-01 08:09:09,915 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-01 08:09:09,915 [ scc.merge] INFO
2025-08-01 08:09:09,915 [ scc.merge] INFO Merged PRs:
2025-08-01 08:09:09,915 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-08-01 08:09:09,915 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-08-01 08:09:09,915 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-08-01 08:09:09,915 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-08-01 08:09:09,915 [ scc.merge] INFO
2025-08-01 08:09:09,915 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-01 08:09:09,915 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-08-01 08:09:09,915 [ scc.merge] INFO
2025-08-01 08:09:09,915 [ scc.merge] INFO Repository: ome/omero-mapr
2025-08-01 08:09:09,915 [ scc.merge] INFO Excluded PRs:
2025-08-01 08:09:09,915 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-08-01 08:09:09,915 [ scc.merge] INFO Already up to date.
2025-08-01 08:09:09,915 [ scc.merge] INFO
2025-08-01 08:09:09,915 [ scc.merge] INFO Merged PRs:
2025-08-01 08:09:09,915 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-08-01 08:09:09,915 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-01 08:09:09,915 [ scc.merge] INFO
2025-08-01 08:09:09,915 [ scc.merge] INFO Repository: ome/omero-metadata
2025-08-01 08:09:09,915 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-08-01 08:09:09,915 [ scc.merge] INFO Previously merged:
2025-08-01 08:09:09,915 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-01 08:09:09,915 [ scc.merge] INFO
2025-08-01 08:09:09,916 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-01 08:09:09,916 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-08-01 08:09:09,916 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-08-01 08:09:09,916 [ scc.merge] INFO
2025-08-01 08:09:09,916 [ scc.merge] INFO Repository: ome/omero-parade
2025-08-01 08:09:09,916 [ scc.merge] INFO Excluded PRs:
2025-08-01 08:09:09,916 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-08-01 08:09:09,916 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-08-01 08:09:09,916 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-08-01 08:09:09,916 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-08-01 08:09:09,916 [ scc.merge] INFO Already up to date.
2025-08-01 08:09:09,916 [ scc.merge] INFO
2025-08-01 08:09:09,916 [ scc.merge] INFO Merged PRs:
2025-08-01 08:09:09,916 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-08-01 08:09:09,916 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-08-01 08:09:09,916 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-08-01 08:09:09,916 [ scc.merge] INFO
2025-08-01 08:09:09,916 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-08-01 08:09:09,916 [ scc.merge] INFO Already up to date.
2025-08-01 08:09:09,916 [ scc.merge] INFO
2025-08-01 08:09:09,916 [ scc.merge] INFO
2025-08-01 08:09:09,916 [ scc.merge] INFO Repository: ome/omero-rois
2025-08-01 08:09:09,916 [ scc.merge] INFO Excluded PRs:
2025-08-01 08:09:09,916 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-08-01 08:09:09,916 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-08-01 08:09:09,916 [ scc.merge] INFO Already up to date.
2025-08-01 08:09:09,916 [ scc.merge] INFO
2025-08-01 08:09:09,916 [ scc.merge] INFO
2025-08-01 08:09:09,916 [ scc.merge] INFO Repository: ome/omero-signup
2025-08-01 08:09:09,916 [ scc.merge] INFO Already up to date.
2025-08-01 08:09:09,916 [ scc.merge] INFO
2025-08-01 08:09:09,916 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-01 08:09:09,916 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-08-01 08:09:09,916 [ scc.merge] INFO
2025-08-01 08:09:09,916 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-08-01 08:09:09,916 [ scc.merge] INFO Excluded PRs:
2025-08-01 08:09:09,916 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-08-01 08:09:09,916 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-08-01 08:09:09,916 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-08-01 08:09:09,916 [ scc.merge] INFO Already up to date.
2025-08-01 08:09:09,916 [ scc.merge] INFO
2025-08-01 08:09:09,917 [ scc.merge] INFO Merged PRs:
2025-08-01 08:09:09,917 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-08-01 08:09:09,917 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-08-01 08:09:09,917 [ scc.merge] INFO
2025-08-01 08:09:09,917 [ scc.merge] INFO Repository: ome/omero-upload
2025-08-01 08:09:09,917 [ scc.merge] INFO Already up to date.
2025-08-01 08:09:09,917 [ scc.merge] INFO
2025-08-01 08:09:09,917 [ scc.merge] INFO
2025-08-01 08:09:09,917 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-08-01 08:09:09,917 [ scc.merge] INFO Updating deab817..160d894
2025-08-01 08:09:09,917 [ scc.merge] INFO Previously merged:
2025-08-01 08:09:09,917 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-08-01 08:09:09,917 [ scc.merge] INFO
2025-08-01 08:09:09,917 [ scc.merge] INFO
2025-08-01 08:09:09,917 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-08-01 08:09:09,917 [ scc.merge] INFO Excluded PRs:
2025-08-01 08:09:09,917 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-08-01 08:09:09,917 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-08-01 08:09:09,917 [ scc.merge] INFO Already up to date.
2025-08-01 08:09:09,917 [ scc.merge] INFO
2025-08-01 08:09:09,917 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-01 08:09:09,917 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-08-01 08:09:09,917 [ scc.merge] INFO
2025-08-01 08:09:09,917 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-08-01 08:09:09,917 [ scc.merge] INFO Already up to date.
2025-08-01 08:09:09,917 [ scc.merge] INFO
2025-08-01 08:09:09,917 [ scc.merge] INFO
2025-08-01 08:09:09,917 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-08-01 08:09:09,917 [ scc.merge] INFO Already up to date.
2025-08-01 08:09:09,917 [ scc.merge] INFO
2025-08-01 08:09:09,917 [ scc.merge] INFO
2025-08-01 08:09:09,917 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-08-01 08:09:09,917 [ scc.merge] INFO Already up to date.
2025-08-01 08:09:09,917 [ scc.merge] INFO
2025-08-01 08:09:09,917 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-01 08:09:09,917 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-08-01 08:09:09,917 [ scc.merge] INFO
2025-08-01 08:09:09,917 [ scc.merge] INFO Repository: ome/scripts
2025-08-01 08:09:09,917 [ scc.merge] INFO Excluded PRs:
2025-08-01 08:09:09,917 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-08-01 08:09:09,917 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-08-01 08:09:09,918 [ scc.merge] INFO Updating 4b4c755..573db34
2025-08-01 08:09:09,918 [ scc.merge] INFO Previously merged:
2025-08-01 08:09:09,918 [ scc.merge] INFO - PR 227 jburel 'Replace tostring by tobytes'
2025-08-01 08:09:09,918 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-08-01 08:09:09,918 [ scc.merge] INFO
2025-08-01 08:09:09,918 [ scc.merge] INFO Merged PRs:
2025-08-01 08:09:09,918 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-08-01 08:09:09,918 [ scc.merge] INFO
2025-08-01 08:09:09,918 [ scc.merge] INFO Conflicting PRs (not included):
2025-08-01 08:09:09,918 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-08-01 08:09:09,918 [ scc.merge] INFO
2025-08-01 08:09:09,918 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-08-01 08:09:09,918 [ scc.git] DEBUG Calling 'git remote'
2025-08-01 08:09:09,920 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-08-01 08:09:09,920 [ scc.git] DEBUG Calling 'git remote'
2025-08-01 08:09:09,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:09:09,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-08-01 08:09:09,922 [ scc.git] DEBUG Calling 'git remote'
2025-08-01 08:09:09,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:09:09,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-08-01 08:09:09,924 [ scc.git] DEBUG Calling 'git remote'
2025-08-01 08:09:09,926 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:09:09,927 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-08-01 08:09:09,927 [ scc.git] DEBUG Calling 'git remote'
2025-08-01 08:09:09,929 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:09:09,929 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-08-01 08:09:09,929 [ scc.git] DEBUG Calling 'git remote'
2025-08-01 08:09:09,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:09:09,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-08-01 08:09:09,931 [ scc.git] DEBUG Calling 'git remote'
2025-08-01 08:09:09,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:09:09,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-08-01 08:09:09,933 [ scc.git] DEBUG Calling 'git remote'
2025-08-01 08:09:09,936 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:09:09,936 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-08-01 08:09:09,936 [ scc.git] DEBUG Calling 'git remote'
2025-08-01 08:09:09,938 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:09:09,938 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-08-01 08:09:09,939 [ scc.git] DEBUG Calling 'git remote'
2025-08-01 08:09:09,941 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:09:09,941 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-08-01 08:09:09,941 [ scc.git] DEBUG Calling 'git remote'
2025-08-01 08:09:09,943 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:09:09,943 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-08-01 08:09:09,943 [ scc.git] DEBUG Calling 'git remote'
2025-08-01 08:09:09,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:09:09,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-08-01 08:09:09,946 [ scc.git] DEBUG Calling 'git remote'
2025-08-01 08:09:09,949 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:09:09,949 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-08-01 08:09:09,949 [ scc.git] DEBUG Calling 'git remote'
2025-08-01 08:09:09,951 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:09:09,951 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-08-01 08:09:09,951 [ scc.git] DEBUG Calling 'git remote'
2025-08-01 08:09:09,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:09:09,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-08-01 08:09:09,953 [ scc.git] DEBUG Calling 'git remote'
2025-08-01 08:09:09,955 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:09:09,956 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-08-01 08:09:09,956 [ scc.git] DEBUG Calling 'git remote'
2025-08-01 08:09:09,958 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:09:09,958 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-08-01 08:09:09,958 [ scc.git] DEBUG Calling 'git remote'
2025-08-01 08:09:09,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:09:09,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-08-01 08:09:09,960 [ scc.git] DEBUG Calling 'git remote'
2025-08-01 08:09:09,962 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:09:09,962 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-08-01 08:09:09,962 [ scc.git] DEBUG Calling 'git remote'
2025-08-01 08:09:09,964 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:09:09,964 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-08-01 08:09:09,964 [ scc.git] DEBUG Calling 'git remote'
2025-08-01 08:09:09,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:09:09,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-08-01 08:09:09,967 [ scc.git] DEBUG Calling 'git remote'
2025-08-01 08:09:09,969 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-08-01 08:09:09,969 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-08-01 08:09:09,969 [ scc.git] DEBUG Calling 'git remote'
2025-08-01 08:09:09,971 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.10.0 to 5.10.4-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD 5858d5f] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-cli-duplicate'
HEAD detached from 4777ef8
nothing to commit, working tree clean
Entering 'omero-cli-render'
HEAD detached from ce6e13c
nothing to commit, working tree clean
Entering 'omero-cli-zarr'
HEAD detached from 11d3587
Untracked files:
(use "git add <file>..." to include in what will be committed)
.eggs/
nothing added to commit but untracked files present (use "git add" to track)
Entering 'omero-figure'
HEAD detached from 9cc36cde
nothing to commit, working tree clean
Entering 'omero-fpbioimage'
HEAD detached from 3b6c05a
nothing to commit, working tree clean
Entering 'omero-gallery'
HEAD detached from 2a621da
nothing to commit, working tree clean
Entering 'omero-iviewer'
HEAD detached from 7a798ce
nothing to commit, working tree clean
Entering 'omero-mapr'
HEAD detached from 0a557da
nothing to commit, working tree clean
Entering 'omero-metadata'
HEAD detached from 3cd120c
nothing to commit, working tree clean
Entering 'omero-parade'
HEAD detached from fb5ae86
nothing to commit, working tree clean
Entering 'omero-prometheus-tools'
HEAD detached from eb47378
nothing to commit, working tree clean
Entering 'omero-rois'
HEAD detached from bdfeb5e
nothing to commit, working tree clean
Entering 'omero-signup'
HEAD detached from be76813
nothing to commit, working tree clean
Entering 'omero-test-infra'
HEAD detached from cda3ec6
nothing to commit, working tree clean
Entering 'omero-upload'
HEAD detached from 100f6ae
nothing to commit, working tree clean
Entering 'omero-virtual-microscope'
HEAD detached from deab817
nothing to commit, working tree clean
Entering 'omero-web-zarr'
HEAD detached from 8f3c313
nothing to commit, working tree clean
Entering 'omero-weberror'
HEAD detached from 70b01ed
nothing to commit, working tree clean
Entering 'omero-webtest'
HEAD detached from 5bfef29
nothing to commit, working tree clean
Entering 'rOMERO-gateway'
HEAD detached from 7b5d64d
nothing to commit, working tree clean
Entering 'scripts'
HEAD detached from 4b4c755
nothing to commit, working tree clean
[detached HEAD 99ebd11] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-08-01 08:09:59,280 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2025-08-01 08:10:09,185 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2025-08-01 08:10:11,838 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-08-01 08:10:16,918 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-08-01 08:10:59,372 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/daea91b1/images/svgs/logo.svg){kind=logo}
