Console Output
Skipping 203 KB..
Full Logling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 506 (Use the release/v1 branch for the PyPA action publishing to PyPI) 7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-05-10 00:45:51,092 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-10 00:45:51,095 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-10 00:45:51,095 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-10 00:45:51,312 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:45:51,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:45:51,476 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-10 00:45:51,513 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:45:51,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:45:51,516 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-10 00:45:51,554 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-10 00:45:51,559 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88e9af18d0> has no local changes
2025-05-10 00:45:51,559 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#415 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/)'
2025-05-10 00:45:51,566 [ scc.git] DEBUG [detached HEAD d4c9f1a] merge master -Dorg -Ssuccess-only
2025-05-10 00:45:51,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:45:51,566 [ scc.repo] DEBUG ## PRs found:
2025-05-10 00:45:51,727 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:45:51,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-05-10 00:45:52,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:45:52,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-05-10 00:45:52,747 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:45:53,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-10 00:45:53,292 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:45:53,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-10 00:45:53,743 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:45:53,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-10 00:45:54,250 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:45:54,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-05-10 00:45:54,424 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-10 00:45:54,675 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:45:54,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-05-10 00:45:55,126 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:45:55,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-05-10 00:45:55,670 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:45:55,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-10 00:45:56,181 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:45:56,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-10 00:45:56,629 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:45:56,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-10 00:45:57,143 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:45:57,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-05-10 00:45:57,328 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-05-10 00:45:57,328 [ scc.repo] DEBUG ## Branches found:
2025-05-10 00:45:57,328 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-10 00:45:57,328 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:45:57,328 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:45:57,331 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-10 00:45:57,333 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-10 00:45:57,333 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-10 00:45:57,336 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-10 00:45:57,339 [ scc.git] DEBUG Already up to date.
2025-05-10 00:45:57,339 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-05-10 00:45:57,622 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-10 00:45:57,622 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-05-10 00:45:57,627 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-05-10 00:45:57,932 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-10 00:45:57,932 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-05-10 00:45:57,936 [ scc.git] DEBUG ## Unique users: []
2025-05-10 00:45:57,936 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:45:57,936 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:45:57,939 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-10 00:45:57,943 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:45:57,945 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-10 00:45:57,953 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-10 00:45:57,957 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-05-10 00:45:57,957 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-05-10 00:45:57,957 [ scc.git] DEBUG requirements.txt | 2 +-
2025-05-10 00:45:57,957 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-05-10 00:45:57,957 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-05-10 00:45:57,957 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-05-10 00:45:57,958 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:45:58,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:45:58,114 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-05-10 00:45:58,118 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:45:58,120 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 94 (Use the release/v1 branch for the PyPA action publishing to PyPI) 1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-05-10 00:45:58,129 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-10 00:45:58,132 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-10 00:45:58,132 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-10 00:45:58,365 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:45:58,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:45:58,534 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-10 00:45:58,571 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:45:58,571 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:45:58,573 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-10 00:45:58,609 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-10 00:45:58,613 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88e9afc950> has no local changes
2025-05-10 00:45:58,613 [ 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#415 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/)'
2025-05-10 00:45:58,619 [ scc.git] DEBUG [detached HEAD 1fb1dc3] merge master -Dorg -Ssuccess-only
2025-05-10 00:45:58,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:45:58,620 [ scc.repo] DEBUG ## PRs found:
2025-05-10 00:45:58,785 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:45:59,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-05-10 00:45:59,301 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:45:59,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-05-10 00:45:59,774 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:00,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-05-10 00:46:00,333 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:00,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-10 00:46:00,953 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:01,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-10 00:46:01,444 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:01,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-10 00:46:01,975 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:02,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-05-10 00:46:02,169 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-10 00:46:02,420 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:02,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-05-10 00:46:02,918 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:03,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-05-10 00:46:03,399 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:03,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-10 00:46:03,947 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:04,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-10 00:46:04,406 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:04,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-10 00:46:04,928 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:05,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-05-10 00:46:05,122 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-10 00:46:05,122 [ scc.repo] DEBUG ## Branches found:
2025-05-10 00:46:05,122 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-10 00:46:05,122 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:05,122 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:05,125 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-10 00:46:05,128 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-10 00:46:05,128 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-10 00:46:05,131 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-10 00:46:05,139 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-05-10 00:46:05,373 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:05,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-05-10 00:46:05,732 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-05-10 00:46:06,018 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-10 00:46:06,018 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-05-10 00:46:06,023 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-05-10 00:46:06,307 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-10 00:46:06,307 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-05-10 00:46:06,311 [ scc.git] DEBUG ## Unique users: []
2025-05-10 00:46:06,312 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:06,312 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:06,314 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-10 00:46:06,318 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:06,320 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-10 00:46:06,333 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-05-10 00:46:06,333 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-05-10 00:46:06,334 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-10 00:46:06,334 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-10 00:46:06,334 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-10 00:46:06,334 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-10 00:46:06,337 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-10 00:46:06,341 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-10 00:46:06,343 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:06,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:46:06,497 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-10 00:46:06,502 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-10 00:46:06,505 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#415](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-05-10 00:46:06,507 [ scc.config] DEBUG Found github.token
2025-05-10 00:46:06,507 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-05-10 00:46:06,507 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-10 00:46:06,511 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:06,513 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-10 00:46:06,529 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-10 00:46:06,529 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-10 00:46:06,529 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-05-10 00:46:06,529 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-10 00:46:06,529 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-10 00:46:06,532 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-10 00:46:06,537 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-10 00:46:06,748 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:06,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:46:06,948 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-10 00:46:06,952 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-10 00:46:06,955 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#415](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2025-05-10 00:46:06,957 [ scc.config] DEBUG Found github.token
2025-05-10 00:46:06,957 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-05-10 00:46:06,957 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-10 00:46:06,993 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:06,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:06,995 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-10 00:46:07,032 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-10 00:46:07,036 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88e993bdd0> has no local changes
2025-05-10 00:46:07,037 [ 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#415 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/)'
2025-05-10 00:46:07,043 [ scc.git] DEBUG [detached HEAD 8e35d5b] merge master -Dorg -Ssuccess-only
2025-05-10 00:46:07,043 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:46:07,043 [ scc.repo] DEBUG ## PRs found:
2025-05-10 00:46:07,199 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:07,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-05-10 00:46:07,808 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:08,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-05-10 00:46:08,294 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:08,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-10 00:46:08,824 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:09,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-10 00:46:09,327 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:09,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-10 00:46:09,811 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:10,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-10 00:46:10,267 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:10,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-05-10 00:46:10,455 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-10 00:46:10,706 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:10,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-05-10 00:46:10,967 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-10 00:46:11,218 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:11,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-10 00:46:11,794 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:12,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-10 00:46:12,292 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:12,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-10 00:46:12,817 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:13,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-10 00:46:13,345 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:13,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-05-10 00:46:13,572 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-10 00:46:13,823 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:14,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-05-10 00:46:14,069 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-10 00:46:14,320 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:14,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-10 00:46:14,882 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:15,185 [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-05-10 00:46:15,437 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:15,664 [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-05-10 00:46:15,915 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:16,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-10 00:46:16,473 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:16,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-05-10 00:46:16,659 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-10 00:46:16,910 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:17,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-05-10 00:46:17,369 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:17,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-05-10 00:46:17,833 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:18,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-05-10 00:46:18,318 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:18,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-05-10 00:46:18,775 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:19,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-05-10 00:46:19,269 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:19,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-05-10 00:46:19,732 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:19,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-05-10 00:46:20,001 [ scc.repo] DEBUG ## Branches found:
2025-05-10 00:46:20,002 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-10 00:46:20,002 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:20,002 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:20,004 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-10 00:46:20,007 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-10 00:46:20,007 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-10 00:46:20,010 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-10 00:46:20,013 [ scc.git] DEBUG Already up to date.
2025-05-10 00:46:20,013 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-05-10 00:46:20,322 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-10 00:46:20,322 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-05-10 00:46:20,326 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-05-10 00:46:20,614 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-10 00:46:20,614 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-05-10 00:46:20,618 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-05-10 00:46:20,874 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-10 00:46:20,874 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-05-10 00:46:20,878 [ scc.git] DEBUG ## Unique users: []
2025-05-10 00:46:20,878 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:20,878 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:20,880 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-05-10 00:46:20,883 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:20,885 [ 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-05-10 00:46:20,893 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-10 00:46:20,897 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-05-10 00:46:20,897 [ scc.git] DEBUG package.json | 2 +-
2025-05-10 00:46:20,897 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-05-10 00:46:20,898 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:21,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:46:21,069 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-05-10 00:46:21,072 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:21,074 [ 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-05-10 00:46:21,084 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-10 00:46:21,084 [ scc.git] DEBUG Auto-merging package.json
2025-05-10 00:46:21,085 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-10 00:46:21,088 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-05-10 00:46:21,088 [ scc.git] DEBUG package.json | 2 +-
2025-05-10 00:46:21,088 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-05-10 00:46:21,320 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:21,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:46:21,477 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-05-10 00:46:21,480 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:21,482 [ 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-05-10 00:46:21,491 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-10 00:46:21,494 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-10 00:46:21,494 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-10 00:46:21,728 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:21,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:46:21,888 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-10 00:46:21,925 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:21,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:21,928 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-10 00:46:21,964 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-10 00:46:21,968 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88e9939a90> has no local changes
2025-05-10 00:46:21,968 [ 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#415 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/)'
2025-05-10 00:46:21,975 [ scc.git] DEBUG [detached HEAD ef03155] merge master -Dorg -Ssuccess-only
2025-05-10 00:46:21,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:46:21,975 [ scc.repo] DEBUG ## PRs found:
2025-05-10 00:46:22,139 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:22,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-05-10 00:46:22,324 [ scc.repo] DEBUG ## Branches found:
2025-05-10 00:46:22,324 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-10 00:46:22,324 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:22,324 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:22,326 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-10 00:46:22,329 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-10 00:46:22,329 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-10 00:46:22,332 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-10 00:46:22,334 [ scc.git] DEBUG Already up to date.
2025-05-10 00:46:22,334 [ scc.git] DEBUG ## Unique users: []
2025-05-10 00:46:22,335 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:22,335 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:22,337 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-10 00:46:22,374 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:22,374 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:22,376 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-10 00:46:22,412 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-10 00:46:22,415 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88e8024b90> has no local changes
2025-05-10 00:46:22,415 [ 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#415 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/)'
2025-05-10 00:46:22,421 [ scc.git] DEBUG [detached HEAD 3541454] merge master -Dorg -Ssuccess-only
2025-05-10 00:46:22,422 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:46:22,422 [ scc.repo] DEBUG ## PRs found:
2025-05-10 00:46:22,575 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:22,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-05-10 00:46:23,115 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:23,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-05-10 00:46:23,620 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:23,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-05-10 00:46:24,088 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:24,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-05-10 00:46:24,325 [ scc.repo] DEBUG ## Branches found:
2025-05-10 00:46:24,325 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-10 00:46:24,325 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:24,325 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:24,327 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-10 00:46:24,329 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-10 00:46:24,330 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-10 00:46:24,332 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-10 00:46:24,335 [ scc.git] DEBUG Already up to date.
2025-05-10 00:46:24,335 [ scc.git] DEBUG ## Unique users: []
2025-05-10 00:46:24,335 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:24,335 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:24,337 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-10 00:46:24,376 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:24,376 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:24,379 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-10 00:46:24,417 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-10 00:46:24,420 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88e99bbf10> has no local changes
2025-05-10 00:46:24,420 [ 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#415 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/)'
2025-05-10 00:46:24,426 [ scc.git] DEBUG [detached HEAD 78be14a] merge master -Dorg -Ssuccess-only
2025-05-10 00:46:24,427 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:46:24,427 [ scc.repo] DEBUG ## PRs found:
2025-05-10 00:46:24,575 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:24,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-05-10 00:46:25,099 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:25,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-05-10 00:46:25,578 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:25,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-05-10 00:46:26,053 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:26,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-10 00:46:26,620 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:26,820 [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-05-10 00:46:27,071 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:27,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-10 00:46:27,622 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:27,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-05-10 00:46:27,813 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-10 00:46:27,813 [ scc.repo] DEBUG ## Branches found:
2025-05-10 00:46:27,813 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-10 00:46:27,813 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:27,813 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:27,816 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-10 00:46:27,818 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-10 00:46:27,819 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-10 00:46:27,822 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-10 00:46:27,825 [ scc.git] DEBUG Already up to date.
2025-05-10 00:46:27,825 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-05-10 00:46:28,117 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-05-10 00:46:28,117 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-05-10 00:46:28,121 [ scc.git] DEBUG ## Unique users: []
2025-05-10 00:46:28,121 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:28,121 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:28,123 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-10 00:46:28,127 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:28,129 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-10 00:46:28,138 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-05-10 00:46:28,138 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-05-10 00:46:28,138 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-05-10 00:46:28,138 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-05-10 00:46:28,138 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-05-10 00:46:28,138 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-05-10 00:46:28,138 [ scc.git] DEBUG Auto-merging setup.py
2025-05-10 00:46:28,138 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-05-10 00:46:28,138 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-10 00:46:28,138 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-10 00:46:28,141 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-10 00:46:28,145 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-05-10 00:46:28,146 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:28,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:46:28,334 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-10 00:46:28,337 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-10 00:46:28,340 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#415](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/views.py
- setup.py
- omero_signup/urls.py
--conflicts
2025-05-10 00:46:28,342 [ scc.config] DEBUG Found github.token
2025-05-10 00:46:28,342 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-05-10 00:46:28,343 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-10 00:46:28,382 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:28,382 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:28,384 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-10 00:46:28,422 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-10 00:46:28,425 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88e804fd10> has no local changes
2025-05-10 00:46:28,426 [ 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#415 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/)'
2025-05-10 00:46:28,432 [ scc.git] DEBUG [detached HEAD cf125f5] merge master -Dorg -Ssuccess-only
2025-05-10 00:46:28,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:46:28,433 [ scc.repo] DEBUG ## PRs found:
2025-05-10 00:46:28,585 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:28,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-05-10 00:46:29,117 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:29,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-05-10 00:46:29,603 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:29,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-10 00:46:30,156 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:30,432 [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-05-10 00:46:30,683 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:30,921 [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-05-10 00:46:31,172 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:31,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-10 00:46:31,637 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:31,819 [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-05-10 00:46:31,820 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-05-10 00:46:32,071 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:32,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-05-10 00:46:32,572 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:32,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-05-10 00:46:33,059 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:33,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-05-10 00:46:33,569 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:33,805 [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-05-10 00:46:34,056 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:34,298 [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-05-10 00:46:34,549 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:34,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-05-10 00:46:35,046 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:35,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-05-10 00:46:35,531 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:35,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-05-10 00:46:36,008 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:36,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-05-10 00:46:36,467 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:36,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-10 00:46:36,994 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:37,231 [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-05-10 00:46:37,482 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:37,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-10 00:46:37,938 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:38,108 [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-05-10 00:46:38,109 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-10 00:46:38,109 [ scc.repo] DEBUG ## Branches found:
2025-05-10 00:46:38,109 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-10 00:46:38,109 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:38,109 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:38,112 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-10 00:46:38,114 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-10 00:46:38,114 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-10 00:46:38,117 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-10 00:46:38,120 [ scc.git] DEBUG Already up to date.
2025-05-10 00:46:38,120 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-05-10 00:46:38,420 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-10 00:46:38,420 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-05-10 00:46:38,424 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-05-10 00:46:38,735 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-10 00:46:38,735 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-05-10 00:46:38,739 [ scc.git] DEBUG ## Unique users: []
2025-05-10 00:46:38,739 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:38,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:38,741 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-05-10 00:46:38,746 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:38,748 [ 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-05-10 00:46:38,760 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-10 00:46:38,764 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-05-10 00:46:38,764 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-05-10 00:46:38,764 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-05-10 00:46:38,764 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-05-10 00:46:38,764 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-05-10 00:46:38,764 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-05-10 00:46:38,764 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-05-10 00:46:38,764 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-05-10 00:46:38,765 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-05-10 00:46:38,765 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:38,765 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-05-10 00:46:38,766 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-05-10 00:46:38,766 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-05-10 00:46:38,766 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-05-10 00:46:38,766 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-05-10 00:46:38,766 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-05-10 00:46:38,766 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-05-10 00:46:38,766 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-05-10 00:46:38,766 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-05-10 00:46:38,766 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-05-10 00:46:38,766 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-05-10 00:46:38,766 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-05-10 00:46:38,766 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-05-10 00:46:38,766 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-05-10 00:46:38,766 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-05-10 00:46:38,766 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-05-10 00:46:38,766 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-05-10 00:46:38,766 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-05-10 00:46:38,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-05-10 00:46:38,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-05-10 00:46:38,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-05-10 00:46:38,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-05-10 00:46:38,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-05-10 00:46:38,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-05-10 00:46:38,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-05-10 00:46:38,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-05-10 00:46:38,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-05-10 00:46:38,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-05-10 00:46:38,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-05-10 00:46:38,766 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-05-10 00:46:38,766 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-05-10 00:46:38,766 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-05-10 00:46:38,766 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-05-10 00:46:38,766 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-05-10 00:46:38,766 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-05-10 00:46:38,767 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-05-10 00:46:38,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:46:38,923 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-10 00:46:38,928 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:38,930 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-10 00:46:38,940 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-10 00:46:38,942 [ scc.git] DEBUG docker | 1 +
2025-05-10 00:46:38,942 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-05-10 00:46:39,174 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:39,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:46:39,346 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-10 00:46:39,383 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:39,383 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:39,385 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-10 00:46:39,422 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-10 00:46:39,426 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88e8018810> has no local changes
2025-05-10 00:46:39,426 [ 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#415 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/)'
2025-05-10 00:46:39,432 [ scc.git] DEBUG [detached HEAD 0fc5eaa] merge master -Dorg -Ssuccess-only
2025-05-10 00:46:39,432 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:46:39,432 [ scc.repo] DEBUG ## PRs found:
2025-05-10 00:46:39,597 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:39,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-05-10 00:46:39,772 [ scc.repo] DEBUG ## Branches found:
2025-05-10 00:46:39,772 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-10 00:46:39,772 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:39,772 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:39,774 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-10 00:46:39,776 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-10 00:46:39,776 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-10 00:46:39,779 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-10 00:46:39,782 [ scc.git] DEBUG Already up to date.
2025-05-10 00:46:39,782 [ scc.git] DEBUG ## Unique users: []
2025-05-10 00:46:39,782 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:39,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:39,784 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-10 00:46:39,823 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:39,823 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:39,825 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-10 00:46:39,862 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-10 00:46:39,865 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88e806e610> has no local changes
2025-05-10 00:46:39,865 [ 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#415 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/)'
2025-05-10 00:46:39,871 [ scc.git] DEBUG [detached HEAD f20f907] merge master -Dorg -Ssuccess-only
2025-05-10 00:46:39,872 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:46:39,872 [ scc.repo] DEBUG ## PRs found:
2025-05-10 00:46:40,023 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:40,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-05-10 00:46:40,522 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:40,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-05-10 00:46:41,011 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:41,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-05-10 00:46:41,501 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:41,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-10 00:46:42,037 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:42,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-10 00:46:42,549 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:42,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-10 00:46:43,010 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:43,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-10 00:46:43,551 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:43,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-05-10 00:46:43,738 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-05-10 00:46:43,738 [ scc.repo] DEBUG ## Branches found:
2025-05-10 00:46:43,738 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-10 00:46:43,738 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:43,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:43,741 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-10 00:46:43,743 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-10 00:46:43,743 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-10 00:46:43,746 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-10 00:46:43,749 [ scc.git] DEBUG Already up to date.
2025-05-10 00:46:43,749 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-05-10 00:46:44,060 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-05-10 00:46:44,060 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-05-10 00:46:44,064 [ scc.git] DEBUG ## Unique users: []
2025-05-10 00:46:44,064 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:44,064 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:44,066 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-05-10 00:46:44,069 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:44,072 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-05-10 00:46:44,079 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-10 00:46:44,082 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-05-10 00:46:44,082 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-05-10 00:46:44,082 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-05-10 00:46:44,082 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-05-10 00:46:44,082 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-05-10 00:46:44,083 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:44,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:46:44,255 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-10 00:46:44,292 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:44,292 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:44,294 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-10 00:46:44,331 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-10 00:46:44,334 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88e803f110> has no local changes
2025-05-10 00:46:44,334 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Generated by OMERO-plugins-push#415 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/)'
2025-05-10 00:46:44,340 [ scc.git] DEBUG [detached HEAD 718e269] merge master -Dorg -Ssuccess-only
2025-05-10 00:46:44,341 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:46:44,341 [ scc.git] INFO Overriding base-branch from master to main
2025-05-10 00:46:44,341 [ scc.repo] DEBUG ## PRs found:
2025-05-10 00:46:44,506 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:44,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-05-10 00:46:45,030 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:45,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-05-10 00:46:45,502 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:45,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-05-10 00:46:46,002 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:46,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-05-10 00:46:46,537 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:46,780 [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-05-10 00:46:47,031 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:47,275 [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-05-10 00:46:47,527 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:47,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-05-10 00:46:48,059 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:48,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-05-10 00:46:48,538 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:48,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-05-10 00:46:49,004 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:49,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-10 00:46:49,597 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:49,827 [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-05-10 00:46:50,078 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:50,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-10 00:46:50,618 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:50,802 [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-05-10 00:46:50,803 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-10 00:46:50,803 [ scc.repo] DEBUG ## Branches found:
2025-05-10 00:46:50,803 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-10 00:46:50,803 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:50,803 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:50,806 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-05-10 00:46:50,809 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-10 00:46:50,809 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-05-10 00:46:50,812 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-05-10 00:46:50,815 [ scc.git] DEBUG Already up to date.
2025-05-10 00:46:50,815 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-05-10 00:46:51,118 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-05-10 00:46:51,118 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-05-10 00:46:51,122 [ scc.git] DEBUG ## Unique users: []
2025-05-10 00:46:51,122 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:51,122 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:51,125 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-10 00:46:51,128 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:51,130 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-10 00:46:51,137 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-05-10 00:46:51,137 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-05-10 00:46:51,138 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-10 00:46:51,138 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-10 00:46:51,140 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-10 00:46:51,144 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-05-10 00:46:51,146 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:51,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:46:51,315 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-10 00:46:51,318 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-10 00:46:51,321 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#415](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-05-10 00:46:51,323 [ scc.config] DEBUG Found github.token
2025-05-10 00:46:51,323 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-05-10 00:46:51,323 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-10 00:46:51,360 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:51,360 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:51,362 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-10 00:46:51,398 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-10 00:46:51,401 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88e80542d0> has no local changes
2025-05-10 00:46:51,402 [ 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#415 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/)'
2025-05-10 00:46:51,408 [ scc.git] DEBUG [detached HEAD da19ec4] merge master -Dorg -Ssuccess-only
2025-05-10 00:46:51,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:46:51,408 [ scc.repo] DEBUG ## PRs found:
2025-05-10 00:46:51,566 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:51,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-05-10 00:46:51,756 [ scc.repo] DEBUG ## Branches found:
2025-05-10 00:46:51,756 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-10 00:46:51,756 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:51,756 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:51,758 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-10 00:46:51,760 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-10 00:46:51,760 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-10 00:46:51,763 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-10 00:46:51,766 [ scc.git] DEBUG Already up to date.
2025-05-10 00:46:51,766 [ scc.git] DEBUG ## Unique users: []
2025-05-10 00:46:51,766 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:51,766 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:51,768 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-10 00:46:51,804 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:51,805 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:51,807 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-10 00:46:51,843 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-10 00:46:51,846 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88e8063410> has no local changes
2025-05-10 00:46:51,846 [ 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#415 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/)'
2025-05-10 00:46:51,852 [ scc.git] DEBUG [detached HEAD c33d1b7] merge master -Dorg -Ssuccess-only
2025-05-10 00:46:51,852 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:46:51,852 [ scc.repo] DEBUG ## PRs found:
2025-05-10 00:46:52,007 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:52,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-05-10 00:46:52,198 [ scc.repo] DEBUG ## Branches found:
2025-05-10 00:46:52,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-10 00:46:52,198 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:52,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:52,200 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-10 00:46:52,203 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-10 00:46:52,203 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-10 00:46:52,206 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-10 00:46:52,209 [ scc.git] DEBUG Already up to date.
2025-05-10 00:46:52,209 [ scc.git] DEBUG ## Unique users: []
2025-05-10 00:46:52,209 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:52,209 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:52,211 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-10 00:46:52,248 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:52,248 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:52,250 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-10 00:46:52,288 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-10 00:46:52,292 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88e80bdfd0> has no local changes
2025-05-10 00:46:52,292 [ 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#415 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/)'
2025-05-10 00:46:52,298 [ scc.git] DEBUG [detached HEAD 4774868] merge master -Dorg -Ssuccess-only
2025-05-10 00:46:52,299 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:46:52,299 [ scc.repo] DEBUG ## PRs found:
2025-05-10 00:46:52,449 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:52,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-05-10 00:46:52,957 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:53,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-05-10 00:46:53,437 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:53,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-05-10 00:46:53,905 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:54,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-10 00:46:54,437 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:54,668 [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-05-10 00:46:54,919 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:55,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-10 00:46:55,455 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:55,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-05-10 00:46:55,645 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-05-10 00:46:55,645 [ scc.repo] DEBUG ## Branches found:
2025-05-10 00:46:55,645 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-10 00:46:55,645 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:55,645 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:55,648 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-10 00:46:55,650 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-10 00:46:55,650 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-10 00:46:55,653 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-10 00:46:55,656 [ scc.git] DEBUG Already up to date.
2025-05-10 00:46:55,656 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-05-10 00:46:55,962 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-05-10 00:46:55,962 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-05-10 00:46:55,966 [ scc.git] DEBUG ## Unique users: []
2025-05-10 00:46:55,966 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:55,966 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:55,968 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-10 00:46:55,971 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:55,973 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-10 00:46:55,982 [ scc.git] DEBUG Auto-merging Dockerfile
2025-05-10 00:46:55,982 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-05-10 00:46:55,982 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-10 00:46:55,982 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-10 00:46:55,985 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-10 00:46:55,990 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-05-10 00:46:55,991 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:56,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:46:56,154 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-10 00:46:56,156 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-10 00:46:56,159 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#415](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-05-10 00:46:56,161 [ scc.config] DEBUG Found github.token
2025-05-10 00:46:56,161 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-05-10 00:46:56,161 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-10 00:46:56,198 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:46:56,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:46:56,201 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-10 00:46:56,239 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-10 00:46:56,243 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88e803e9d0> has no local changes
2025-05-10 00:46:56,243 [ 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#415 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/)'
2025-05-10 00:46:56,249 [ scc.git] DEBUG [detached HEAD 93f1034] merge master -Dorg -Ssuccess-only
2025-05-10 00:46:56,249 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:46:56,250 [ scc.git] INFO Overriding base-branch from master to develop
2025-05-10 00:46:56,250 [ scc.repo] DEBUG ## PRs found:
2025-05-10 00:46:56,404 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:56,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-05-10 00:46:56,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:57,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-05-10 00:46:57,522 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:57,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-05-10 00:46:57,988 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:58,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-10 00:46:58,533 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:58,749 [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-05-10 00:46:59,001 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:59,235 [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-05-10 00:46:59,486 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:46:59,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-10 00:46:59,998 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:00,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-05-10 00:47:00,163 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-10 00:47:00,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:00,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-05-10 00:47:00,884 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:01,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-05-10 00:47:01,407 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:01,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-10 00:47:01,938 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:02,147 [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-05-10 00:47:02,398 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:02,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-10 00:47:02,899 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:03,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-05-10 00:47:03,085 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-10 00:47:03,336 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:03,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-05-10 00:47:03,859 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:04,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-05-10 00:47:04,389 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:04,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-05-10 00:47:04,888 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:05,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-05-10 00:47:05,157 [ scc.repo] DEBUG ## Branches found:
2025-05-10 00:47:05,157 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-10 00:47:05,157 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:47:05,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:47:05,160 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-05-10 00:47:05,162 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-10 00:47:05,163 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-05-10 00:47:05,166 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-05-10 00:47:05,175 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-05-10 00:47:05,407 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:05,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-05-10 00:47:05,836 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-05-10 00:47:06,178 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-10 00:47:06,178 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-05-10 00:47:06,182 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-05-10 00:47:06,464 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-10 00:47:06,465 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-05-10 00:47:06,469 [ scc.git] DEBUG ## Unique users: []
2025-05-10 00:47:06,469 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:47:06,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:47:06,471 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-10 00:47:06,477 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:47:06,479 [ 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-05-10 00:47:06,490 [ 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-05-10 00:47:06,490 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-10 00:47:06,490 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-10 00:47:06,493 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-10 00:47:06,497 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-05-10 00:47:06,498 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:06,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:47:06,661 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-10 00:47:06,666 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-10 00:47:06,671 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#415](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-05-10 00:47:06,673 [ scc.config] DEBUG Found github.token
2025-05-10 00:47:06,673 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-05-10 00:47:06,673 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-05-10 00:47:06,677 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:47:06,680 [ 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-05-10 00:47:06,689 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-10 00:47:06,692 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-05-10 00:47:06,692 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-05-10 00:47:06,912 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:07,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:47:07,078 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-10 00:47:07,115 [ scc.git] DEBUG Get sha1 of %s
2025-05-10 00:47:07,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-10 00:47:07,118 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-10 00:47:07,154 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-10 00:47:07,157 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88e9b43f90> has no local changes
2025-05-10 00:47:07,158 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#415 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/)'
2025-05-10 00:47:07,164 [ scc.git] DEBUG [detached HEAD 91a893f] merge master -Dorg -Ssuccess-only
2025-05-10 00:47:07,164 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:47:07,164 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-10 00:47:07,241 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-05-10 00:47:07,329 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:07,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:47:07,509 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-05-10 00:47:07,511 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-05-10 00:47:07,755 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:07,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:47:07,937 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-05-10 00:47:07,939 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-05-10 00:47:08,183 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:08,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:47:08,360 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-05-10 00:47:08,362 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-05-10 00:47:08,607 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:08,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:47:08,767 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-05-10 00:47:09,012 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:09,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:47:09,177 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-05-10 00:47:09,179 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-05-10 00:47:09,424 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:09,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:47:09,585 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-05-10 00:47:09,587 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-05-10 00:47:09,831 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:09,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:47:10,002 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-05-10 00:47:10,004 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-05-10 00:47:10,249 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:10,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:47:10,416 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-05-10 00:47:10,418 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-05-10 00:47:10,662 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:10,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:47:10,826 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-05-10 00:47:10,828 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-05-10 00:47:11,073 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:11,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:47:11,245 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-05-10 00:47:11,247 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-05-10 00:47:11,492 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:11,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:47:11,670 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-05-10 00:47:11,672 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-05-10 00:47:11,917 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:12,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:47:12,087 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-05-10 00:47:12,089 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-05-10 00:47:12,333 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:12,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:47:12,515 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-05-10 00:47:12,760 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:12,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:47:12,964 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-05-10 00:47:13,209 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:13,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:47:13,377 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-05-10 00:47:13,378 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-05-10 00:47:13,623 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:13,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:47:13,790 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-05-10 00:47:14,035 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:14,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:47:14,213 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-05-10 00:47:14,459 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:14,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:47:14,612 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-05-10 00:47:14,614 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-05-10 00:47:14,859 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:15,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:47:15,028 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-05-10 00:47:15,030 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-05-10 00:47:15,275 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:15,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:47:15,428 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-05-10 00:47:15,430 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-05-10 00:47:15,675 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:15,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:47:15,853 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-05-10 00:47:15,855 [ scc.config] DEBUG Found submodule.scripts.url
2025-05-10 00:47:16,100 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-10 00:47:16,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-10 00:47:16,280 [ scc.config] DEBUG Found submodule.scripts.branch
2025-05-10 00:47:16,280 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-10 00:47:16,368 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f88ea4d2150> has local changes
2025-05-10 00:47:16,368 [ 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 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
Updating 11d3587..5b2ca82
Previously merged:
- PR 171 will-moore 'Initial addition of integration tests'
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 167 dominikl 'Add extinfo command'
Repository: ome/omero-figure
Excluded PRs:
- PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
- PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..3e8fa730
Previously merged:
- PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
- PR 635 dependabot[bot] 'Bump esbuild and vite'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
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)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
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
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#415 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/415/)'
2025-05-10 00:47:16,382 [ scc.git] DEBUG [detached HEAD b2988ef] merge master -Dorg -Ssuccess-only
2025-05-10 00:47:16,382 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-05-10 00:47:16,382 [ scc.merge] INFO Repository: ome/omero-plugins
2025-05-10 00:47:16,382 [ scc.merge] INFO Already up to date.
2025-05-10 00:47:16,382 [ scc.merge] INFO
2025-05-10 00:47:16,382 [ scc.merge] INFO Merged PRs:
2025-05-10 00:47:16,382 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-05-10 00:47:16,383 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-05-10 00:47:16,383 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-05-10 00:47:16,383 [ scc.merge] INFO
2025-05-10 00:47:16,383 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-05-10 00:47:16,383 [ scc.merge] INFO Already up to date.
2025-05-10 00:47:16,383 [ scc.merge] INFO
2025-05-10 00:47:16,383 [ scc.merge] INFO
2025-05-10 00:47:16,383 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-05-10 00:47:16,383 [ scc.merge] INFO Excluded PRs:
2025-05-10 00:47:16,383 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-05-10 00:47:16,383 [ scc.merge] INFO Already up to date.
2025-05-10 00:47:16,383 [ scc.merge] INFO
2025-05-10 00:47:16,383 [ scc.merge] INFO
2025-05-10 00:47:16,383 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-05-10 00:47:16,383 [ scc.merge] INFO Excluded PRs:
2025-05-10 00:47:16,383 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-05-10 00:47:16,383 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-05-10 00:47:16,383 [ scc.merge] INFO Already up to date.
2025-05-10 00:47:16,383 [ scc.merge] INFO
2025-05-10 00:47:16,383 [ scc.merge] INFO Merged PRs:
2025-05-10 00:47:16,383 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-05-10 00:47:16,383 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-05-10 00:47:16,383 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-05-10 00:47:16,383 [ scc.merge] INFO
2025-05-10 00:47:16,383 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-05-10 00:47:16,383 [ scc.merge] INFO Excluded PRs:
2025-05-10 00:47:16,383 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-05-10 00:47:16,383 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-05-10 00:47:16,383 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-05-10 00:47:16,383 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-10 00:47:16,383 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-05-10 00:47:16,383 [ scc.merge] INFO Updating 11d3587..5b2ca82
2025-05-10 00:47:16,383 [ scc.merge] INFO Previously merged:
2025-05-10 00:47:16,383 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-05-10 00:47:16,383 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-10 00:47:16,383 [ scc.merge] INFO
2025-05-10 00:47:16,383 [ scc.merge] INFO Merged PRs:
2025-05-10 00:47:16,384 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-05-10 00:47:16,384 [ scc.merge] INFO
2025-05-10 00:47:16,384 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-10 00:47:16,384 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-05-10 00:47:16,384 [ scc.merge] INFO
2025-05-10 00:47:16,384 [ scc.merge] INFO Repository: ome/omero-figure
2025-05-10 00:47:16,384 [ scc.merge] INFO Excluded PRs:
2025-05-10 00:47:16,384 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-05-10 00:47:16,384 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-05-10 00:47:16,384 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-05-10 00:47:16,384 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-05-10 00:47:16,384 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-05-10 00:47:16,384 [ scc.merge] INFO Previously merged:
2025-05-10 00:47:16,384 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-05-10 00:47:16,384 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-05-10 00:47:16,384 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-05-10 00:47:16,384 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-10 00:47:16,384 [ scc.merge] INFO
2025-05-10 00:47:16,384 [ scc.merge] INFO Merged PRs:
2025-05-10 00:47:16,384 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-05-10 00:47:16,384 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-05-10 00:47:16,384 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-05-10 00:47:16,384 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-05-10 00:47:16,384 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-05-10 00:47:16,384 [ scc.merge] INFO
2025-05-10 00:47:16,384 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-10 00:47:16,384 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-05-10 00:47:16,384 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-05-10 00:47:16,384 [ scc.merge] INFO
2025-05-10 00:47:16,384 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-05-10 00:47:16,384 [ scc.merge] INFO Already up to date.
2025-05-10 00:47:16,384 [ scc.merge] INFO
2025-05-10 00:47:16,384 [ scc.merge] INFO Merged PRs:
2025-05-10 00:47:16,384 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-05-10 00:47:16,384 [ scc.merge] INFO
2025-05-10 00:47:16,384 [ scc.merge] INFO Repository: ome/omero-gallery
2025-05-10 00:47:16,384 [ scc.merge] INFO Already up to date.
2025-05-10 00:47:16,384 [ scc.merge] INFO
2025-05-10 00:47:16,385 [ scc.merge] INFO Merged PRs:
2025-05-10 00:47:16,385 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-05-10 00:47:16,385 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-05-10 00:47:16,385 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-05-10 00:47:16,385 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-05-10 00:47:16,385 [ scc.merge] INFO
2025-05-10 00:47:16,385 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-10 00:47:16,385 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-05-10 00:47:16,385 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-05-10 00:47:16,385 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-05-10 00:47:16,385 [ scc.merge] INFO
2025-05-10 00:47:16,385 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-05-10 00:47:16,385 [ scc.merge] INFO Excluded PRs:
2025-05-10 00:47:16,385 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-05-10 00:47:16,385 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-05-10 00:47:16,385 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-05-10 00:47:16,385 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-05-10 00:47:16,385 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-05-10 00:47:16,385 [ scc.merge] INFO Already up to date.
2025-05-10 00:47:16,385 [ scc.merge] INFO
2025-05-10 00:47:16,385 [ scc.merge] INFO Merged PRs:
2025-05-10 00:47:16,385 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-05-10 00:47:16,385 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-05-10 00:47:16,385 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-05-10 00:47:16,385 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-05-10 00:47:16,385 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-10 00:47:16,385 [ scc.merge] INFO
2025-05-10 00:47:16,385 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-10 00:47:16,385 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-05-10 00:47:16,385 [ scc.merge] INFO
2025-05-10 00:47:16,385 [ scc.merge] INFO Repository: ome/omero-mapr
2025-05-10 00:47:16,385 [ scc.merge] INFO Excluded PRs:
2025-05-10 00:47:16,385 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-05-10 00:47:16,385 [ scc.merge] INFO Already up to date.
2025-05-10 00:47:16,385 [ scc.merge] INFO
2025-05-10 00:47:16,385 [ scc.merge] INFO Merged PRs:
2025-05-10 00:47:16,385 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-05-10 00:47:16,385 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-10 00:47:16,386 [ scc.merge] INFO
2025-05-10 00:47:16,386 [ scc.merge] INFO Repository: ome/omero-metadata
2025-05-10 00:47:16,386 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-05-10 00:47:16,386 [ scc.merge] INFO Previously merged:
2025-05-10 00:47:16,386 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-10 00:47:16,386 [ scc.merge] INFO
2025-05-10 00:47:16,386 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-10 00:47:16,386 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-10 00:47:16,386 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-10 00:47:16,386 [ scc.merge] INFO
2025-05-10 00:47:16,386 [ scc.merge] INFO Repository: ome/omero-parade
2025-05-10 00:47:16,386 [ scc.merge] INFO Excluded PRs:
2025-05-10 00:47:16,386 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-05-10 00:47:16,386 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-05-10 00:47:16,386 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-05-10 00:47:16,386 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-05-10 00:47:16,386 [ scc.merge] INFO Already up to date.
2025-05-10 00:47:16,386 [ scc.merge] INFO
2025-05-10 00:47:16,386 [ scc.merge] INFO Merged PRs:
2025-05-10 00:47:16,386 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-10 00:47:16,386 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-10 00:47:16,386 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-10 00:47:16,386 [ scc.merge] INFO
2025-05-10 00:47:16,386 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-05-10 00:47:16,386 [ scc.merge] INFO Already up to date.
2025-05-10 00:47:16,386 [ scc.merge] INFO
2025-05-10 00:47:16,386 [ scc.merge] INFO
2025-05-10 00:47:16,386 [ scc.merge] INFO Repository: ome/omero-rois
2025-05-10 00:47:16,386 [ scc.merge] INFO Excluded PRs:
2025-05-10 00:47:16,386 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-05-10 00:47:16,386 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-10 00:47:16,386 [ scc.merge] INFO Already up to date.
2025-05-10 00:47:16,386 [ scc.merge] INFO
2025-05-10 00:47:16,386 [ scc.merge] INFO
2025-05-10 00:47:16,386 [ scc.merge] INFO Repository: ome/omero-signup
2025-05-10 00:47:16,386 [ scc.merge] INFO Already up to date.
2025-05-10 00:47:16,386 [ scc.merge] INFO
2025-05-10 00:47:16,386 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-10 00:47:16,386 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-10 00:47:16,387 [ scc.merge] INFO
2025-05-10 00:47:16,387 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-05-10 00:47:16,387 [ scc.merge] INFO Excluded PRs:
2025-05-10 00:47:16,387 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-05-10 00:47:16,387 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-05-10 00:47:16,387 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-05-10 00:47:16,387 [ scc.merge] INFO Already up to date.
2025-05-10 00:47:16,387 [ scc.merge] INFO
2025-05-10 00:47:16,387 [ scc.merge] INFO Merged PRs:
2025-05-10 00:47:16,387 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-10 00:47:16,387 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-05-10 00:47:16,387 [ scc.merge] INFO
2025-05-10 00:47:16,387 [ scc.merge] INFO Repository: ome/omero-upload
2025-05-10 00:47:16,387 [ scc.merge] INFO Already up to date.
2025-05-10 00:47:16,387 [ scc.merge] INFO
2025-05-10 00:47:16,387 [ scc.merge] INFO
2025-05-10 00:47:16,387 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-05-10 00:47:16,387 [ scc.merge] INFO Already up to date.
2025-05-10 00:47:16,387 [ scc.merge] INFO
2025-05-10 00:47:16,387 [ scc.merge] INFO Merged PRs:
2025-05-10 00:47:16,387 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-05-10 00:47:16,387 [ scc.merge] INFO
2025-05-10 00:47:16,387 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-05-10 00:47:16,387 [ scc.merge] INFO Excluded PRs:
2025-05-10 00:47:16,387 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-05-10 00:47:16,387 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-05-10 00:47:16,387 [ scc.merge] INFO Already up to date.
2025-05-10 00:47:16,387 [ scc.merge] INFO
2025-05-10 00:47:16,387 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-10 00:47:16,387 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-10 00:47:16,387 [ scc.merge] INFO
2025-05-10 00:47:16,387 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-05-10 00:47:16,387 [ scc.merge] INFO Already up to date.
2025-05-10 00:47:16,387 [ scc.merge] INFO
2025-05-10 00:47:16,387 [ scc.merge] INFO
2025-05-10 00:47:16,387 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-05-10 00:47:16,387 [ scc.merge] INFO Already up to date.
2025-05-10 00:47:16,387 [ scc.merge] INFO
2025-05-10 00:47:16,388 [ scc.merge] INFO
2025-05-10 00:47:16,388 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-05-10 00:47:16,388 [ scc.merge] INFO Already up to date.
2025-05-10 00:47:16,388 [ scc.merge] INFO
2025-05-10 00:47:16,388 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-10 00:47:16,388 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-05-10 00:47:16,388 [ scc.merge] INFO
2025-05-10 00:47:16,388 [ scc.merge] INFO Repository: ome/scripts
2025-05-10 00:47:16,388 [ scc.merge] INFO Excluded PRs:
2025-05-10 00:47:16,388 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-05-10 00:47:16,388 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-05-10 00:47:16,388 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-05-10 00:47:16,388 [ scc.merge] INFO Previously merged:
2025-05-10 00:47:16,388 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-05-10 00:47:16,388 [ scc.merge] INFO
2025-05-10 00:47:16,388 [ scc.merge] INFO Merged PRs:
2025-05-10 00:47:16,388 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-10 00:47:16,388 [ scc.merge] INFO
2025-05-10 00:47:16,388 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-10 00:47:16,388 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-10 00:47:16,388 [ scc.merge] INFO
2025-05-10 00:47:16,388 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-05-10 00:47:16,388 [ scc.git] DEBUG Calling 'git remote'
2025-05-10 00:47:16,390 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-05-10 00:47:16,390 [ scc.git] DEBUG Calling 'git remote'
2025-05-10 00:47:16,392 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:47:16,392 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-05-10 00:47:16,393 [ scc.git] DEBUG Calling 'git remote'
2025-05-10 00:47:16,395 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:47:16,395 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-05-10 00:47:16,395 [ scc.git] DEBUG Calling 'git remote'
2025-05-10 00:47:16,397 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:47:16,397 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-05-10 00:47:16,397 [ scc.git] DEBUG Calling 'git remote'
2025-05-10 00:47:16,399 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:47:16,399 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-05-10 00:47:16,399 [ scc.git] DEBUG Calling 'git remote'
2025-05-10 00:47:16,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:47:16,402 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-05-10 00:47:16,402 [ scc.git] DEBUG Calling 'git remote'
2025-05-10 00:47:16,404 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:47:16,404 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-05-10 00:47:16,404 [ scc.git] DEBUG Calling 'git remote'
2025-05-10 00:47:16,406 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:47:16,406 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-05-10 00:47:16,406 [ scc.git] DEBUG Calling 'git remote'
2025-05-10 00:47:16,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:47:16,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-10 00:47:16,408 [ scc.git] DEBUG Calling 'git remote'
2025-05-10 00:47:16,410 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:47:16,410 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-10 00:47:16,410 [ scc.git] DEBUG Calling 'git remote'
2025-05-10 00:47:16,412 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:47:16,412 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-10 00:47:16,412 [ scc.git] DEBUG Calling 'git remote'
2025-05-10 00:47:16,414 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:47:16,415 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-10 00:47:16,415 [ scc.git] DEBUG Calling 'git remote'
2025-05-10 00:47:16,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:47:16,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-10 00:47:16,417 [ scc.git] DEBUG Calling 'git remote'
2025-05-10 00:47:16,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:47:16,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-10 00:47:16,419 [ scc.git] DEBUG Calling 'git remote'
2025-05-10 00:47:16,421 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:47:16,421 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-10 00:47:16,421 [ scc.git] DEBUG Calling 'git remote'
2025-05-10 00:47:16,423 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:47:16,423 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-10 00:47:16,423 [ scc.git] DEBUG Calling 'git remote'
2025-05-10 00:47:16,425 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:47:16,425 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-10 00:47:16,426 [ scc.git] DEBUG Calling 'git remote'
2025-05-10 00:47:16,428 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:47:16,428 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-10 00:47:16,428 [ scc.git] DEBUG Calling 'git remote'
2025-05-10 00:47:16,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:47:16,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-10 00:47:16,430 [ scc.git] DEBUG Calling 'git remote'
2025-05-10 00:47:16,432 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:47:16,432 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-10 00:47:16,432 [ scc.git] DEBUG Calling 'git remote'
2025-05-10 00:47:16,434 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:47:16,434 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-10 00:47:16,434 [ scc.git] DEBUG Calling 'git remote'
2025-05-10 00:47:16,436 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-10 00:47:16,436 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-10 00:47:16,436 [ scc.git] DEBUG Calling 'git remote'
2025-05-10 00:47:16,438 [ 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.3-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 70e90f8] 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 40cb8ec] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-05-10 00:48:03,432 [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-05-10 00:48:12,946 [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-05-10 00:48:15,456 [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-05-10 00:48:20,373 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-05-10 00:48:59,709 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/0cb5541d/images/svgs/logo.svg){kind=logo}
