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-13 00:43:42,899 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-13 00:43:42,902 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-13 00:43:42,902 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-13 00:43:43,117 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:43,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:43:43,296 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-13 00:43:43,334 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:43:43,334 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:43:43,336 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-13 00:43:43,373 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-13 00:43:43,380 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bd1ae9bd0> has no local changes
2025-05-13 00:43:43,380 [ 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#418 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/)'
2025-05-13 00:43:43,386 [ scc.git] DEBUG [detached HEAD cc08894] merge master -Dorg -Ssuccess-only
2025-05-13 00:43:43,387 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:43:43,387 [ scc.repo] DEBUG ## PRs found:
2025-05-13 00:43:43,547 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:43,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-05-13 00:43:44,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:44,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-05-13 00:43:44,583 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:44,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-13 00:43:45,124 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:45,337 [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-13 00:43:45,588 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:45,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-13 00:43:46,045 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:46,232 [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-13 00:43:46,233 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-13 00:43:46,484 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:46,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-05-13 00:43:46,975 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:47,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-05-13 00:43:47,514 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:47,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-13 00:43:48,032 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:48,237 [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-13 00:43:48,488 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:48,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-13 00:43:49,009 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:49,190 [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-13 00:43:49,191 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-05-13 00:43:49,191 [ scc.repo] DEBUG ## Branches found:
2025-05-13 00:43:49,191 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-13 00:43:49,191 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:43:49,191 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:43:49,194 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-13 00:43:49,196 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-13 00:43:49,196 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-13 00:43:49,199 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-13 00:43:49,202 [ scc.git] DEBUG Already up to date.
2025-05-13 00:43:49,202 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-05-13 00:43:49,488 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-13 00:43:49,488 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-05-13 00:43:49,493 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-05-13 00:43:49,775 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-13 00:43:49,775 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-05-13 00:43:49,780 [ scc.git] DEBUG ## Unique users: []
2025-05-13 00:43:49,780 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:43:49,780 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:43:49,783 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-13 00:43:49,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:43:49,789 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-13 00:43:49,798 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-13 00:43:49,801 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-05-13 00:43:49,801 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-05-13 00:43:49,801 [ scc.git] DEBUG requirements.txt | 2 +-
2025-05-13 00:43:49,801 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-05-13 00:43:49,801 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-05-13 00:43:49,801 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-05-13 00:43:49,802 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:49,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:43:49,967 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-05-13 00:43:49,971 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:43:49,974 [ 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-13 00:43:49,983 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-13 00:43:49,986 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-13 00:43:49,986 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-13 00:43:50,218 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:50,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:43:50,379 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-13 00:43:50,417 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:43:50,417 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:43:50,420 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-13 00:43:50,456 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-13 00:43:50,460 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bd1af81d0> has no local changes
2025-05-13 00:43:50,460 [ 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#418 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/)'
2025-05-13 00:43:50,467 [ scc.git] DEBUG [detached HEAD c55c2e5] merge master -Dorg -Ssuccess-only
2025-05-13 00:43:50,467 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:43:50,467 [ scc.repo] DEBUG ## PRs found:
2025-05-13 00:43:50,630 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:50,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-05-13 00:43:51,136 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:51,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-05-13 00:43:51,609 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:51,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-05-13 00:43:52,181 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:52,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-13 00:43:52,763 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:53,011 [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-13 00:43:53,262 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:53,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-13 00:43:53,727 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:53,902 [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-13 00:43:53,902 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-13 00:43:54,153 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:54,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-05-13 00:43:54,683 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:54,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-05-13 00:43:55,155 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:55,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-13 00:43:55,683 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:55,899 [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-13 00:43:56,150 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:56,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-13 00:43:56,688 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:56,886 [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-13 00:43:56,886 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-13 00:43:56,886 [ scc.repo] DEBUG ## Branches found:
2025-05-13 00:43:56,886 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-13 00:43:56,887 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:43:56,887 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:43:56,889 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-13 00:43:56,892 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-13 00:43:56,892 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-13 00:43:56,895 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-13 00:43:56,902 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-05-13 00:43:57,138 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:57,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-05-13 00:43:57,570 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-05-13 00:43:57,883 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-13 00:43:57,884 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-05-13 00:43:57,888 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-05-13 00:43:58,179 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-13 00:43:58,179 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-05-13 00:43:58,183 [ scc.git] DEBUG ## Unique users: []
2025-05-13 00:43:58,184 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:43:58,184 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:43:58,186 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-13 00:43:58,191 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:43:58,193 [ 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-13 00:43:58,206 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-05-13 00:43:58,206 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-05-13 00:43:58,206 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-13 00:43:58,206 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-13 00:43:58,206 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-13 00:43:58,207 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-13 00:43:58,209 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-13 00:43:58,214 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-13 00:43:58,215 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:58,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:43:58,394 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-13 00:43:58,399 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-13 00:43:58,402 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#418](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-05-13 00:43:58,404 [ scc.config] DEBUG Found github.token
2025-05-13 00:43:58,404 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-05-13 00:43:58,404 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-13 00:43:58,409 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:43:58,411 [ 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-13 00:43:58,426 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-13 00:43:58,426 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-13 00:43:58,426 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-05-13 00:43:58,426 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-13 00:43:58,426 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-13 00:43:58,429 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-13 00:43:58,434 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-13 00:43:58,645 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:58,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:43:58,810 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-13 00:43:58,814 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-13 00:43:58,817 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#418](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/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-13 00:43:58,819 [ scc.config] DEBUG Found github.token
2025-05-13 00:43:58,819 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-05-13 00:43:58,820 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-13 00:43:58,857 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:43:58,857 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:43:58,859 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-13 00:43:58,895 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-13 00:43:58,900 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bd1acbe10> has no local changes
2025-05-13 00:43:58,900 [ 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#418 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/)'
2025-05-13 00:43:58,907 [ scc.git] DEBUG [detached HEAD 2dba6cd] merge master -Dorg -Ssuccess-only
2025-05-13 00:43:58,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:43:58,907 [ scc.repo] DEBUG ## PRs found:
2025-05-13 00:43:59,061 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:59,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-05-13 00:43:59,624 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:43:59,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-05-13 00:44:00,104 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:00,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-13 00:44:00,697 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:00,971 [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-13 00:44:01,223 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:01,486 [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-13 00:44:01,737 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:02,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-13 00:44:02,267 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:02,463 [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-13 00:44:02,463 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-13 00:44:02,714 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:02,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-05-13 00:44:02,950 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-13 00:44:03,201 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:03,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-13 00:44:03,826 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:04,095 [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-13 00:44:04,346 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:04,686 [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-13 00:44:04,938 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:05,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-13 00:44:05,495 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:05,688 [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-13 00:44:05,688 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-13 00:44:05,939 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:06,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-05-13 00:44:06,181 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-13 00:44:06,432 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:06,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-13 00:44:06,990 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:07,255 [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-13 00:44:07,506 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:07,746 [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-13 00:44:07,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:08,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-13 00:44:08,451 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:08,624 [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-13 00:44:08,624 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-13 00:44:08,875 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:09,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-05-13 00:44:09,354 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:09,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-05-13 00:44:09,850 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:10,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-05-13 00:44:10,295 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:10,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-05-13 00:44:10,779 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:11,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-05-13 00:44:11,284 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:11,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-05-13 00:44:11,754 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:12,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-05-13 00:44:12,052 [ scc.repo] DEBUG ## Branches found:
2025-05-13 00:44:12,053 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-13 00:44:12,053 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:12,053 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:12,055 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-13 00:44:12,058 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-13 00:44:12,058 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-13 00:44:12,061 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-13 00:44:12,064 [ scc.git] DEBUG Already up to date.
2025-05-13 00:44:12,064 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-05-13 00:44:12,374 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-13 00:44:12,374 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-05-13 00:44:12,379 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-05-13 00:44:12,662 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-13 00:44:12,662 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-05-13 00:44:12,666 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-05-13 00:44:12,919 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-13 00:44:12,919 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-05-13 00:44:12,922 [ scc.git] DEBUG ## Unique users: []
2025-05-13 00:44:12,922 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:12,923 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:12,925 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-05-13 00:44:12,928 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:12,930 [ 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-13 00:44:12,938 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-13 00:44:12,941 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-05-13 00:44:12,941 [ scc.git] DEBUG package.json | 2 +-
2025-05-13 00:44:12,941 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-05-13 00:44:12,942 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:13,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:44:13,128 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-05-13 00:44:13,131 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:13,133 [ 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-13 00:44:13,142 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-13 00:44:13,142 [ scc.git] DEBUG Auto-merging package.json
2025-05-13 00:44:13,143 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-13 00:44:13,147 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-05-13 00:44:13,147 [ scc.git] DEBUG package.json | 2 +-
2025-05-13 00:44:13,147 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-05-13 00:44:13,379 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:13,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:44:13,539 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-05-13 00:44:13,542 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:13,544 [ 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-13 00:44:13,553 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-13 00:44:13,556 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-13 00:44:13,556 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-13 00:44:13,790 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:14,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:44:14,002 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-13 00:44:14,040 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:14,040 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:14,042 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-13 00:44:14,078 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-13 00:44:14,083 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bd1a26dd0> has no local changes
2025-05-13 00:44:14,083 [ 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#418 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/)'
2025-05-13 00:44:14,089 [ scc.git] DEBUG [detached HEAD 55a5f63] merge master -Dorg -Ssuccess-only
2025-05-13 00:44:14,089 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:44:14,089 [ scc.repo] DEBUG ## PRs found:
2025-05-13 00:44:14,253 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:14,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-05-13 00:44:14,435 [ scc.repo] DEBUG ## Branches found:
2025-05-13 00:44:14,435 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-13 00:44:14,435 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:14,435 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:14,437 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-13 00:44:14,439 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-13 00:44:14,439 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-13 00:44:14,442 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-13 00:44:14,445 [ scc.git] DEBUG Already up to date.
2025-05-13 00:44:14,445 [ scc.git] DEBUG ## Unique users: []
2025-05-13 00:44:14,445 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:14,445 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:14,447 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-13 00:44:14,488 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:14,488 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:14,490 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-13 00:44:14,529 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-13 00:44:14,532 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bd1a79b90> has no local changes
2025-05-13 00:44:14,532 [ 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#418 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/)'
2025-05-13 00:44:14,538 [ scc.git] DEBUG [detached HEAD 3d489ba] merge master -Dorg -Ssuccess-only
2025-05-13 00:44:14,538 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:44:14,539 [ scc.repo] DEBUG ## PRs found:
2025-05-13 00:44:14,686 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:15,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-05-13 00:44:15,277 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:15,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-05-13 00:44:15,751 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:15,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-05-13 00:44:16,239 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:16,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-05-13 00:44:16,502 [ scc.repo] DEBUG ## Branches found:
2025-05-13 00:44:16,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-13 00:44:16,502 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:16,502 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:16,505 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-13 00:44:16,507 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-13 00:44:16,507 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-13 00:44:16,510 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-13 00:44:16,513 [ scc.git] DEBUG Already up to date.
2025-05-13 00:44:16,513 [ scc.git] DEBUG ## Unique users: []
2025-05-13 00:44:16,513 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:16,513 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:16,515 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-13 00:44:16,553 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:16,553 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:16,555 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-13 00:44:16,591 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-13 00:44:16,595 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bd1b11b90> has no local changes
2025-05-13 00:44:16,595 [ 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#418 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/)'
2025-05-13 00:44:16,601 [ scc.git] DEBUG [detached HEAD 6ff8f2f] merge master -Dorg -Ssuccess-only
2025-05-13 00:44:16,601 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:44:16,601 [ scc.repo] DEBUG ## PRs found:
2025-05-13 00:44:16,753 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:17,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-05-13 00:44:17,272 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:17,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-05-13 00:44:17,770 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:17,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-05-13 00:44:18,227 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:18,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-13 00:44:18,794 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:19,010 [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-13 00:44:19,262 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:19,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-13 00:44:19,827 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:20,009 [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-13 00:44:20,009 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-13 00:44:20,009 [ scc.repo] DEBUG ## Branches found:
2025-05-13 00:44:20,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-13 00:44:20,010 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:20,010 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:20,012 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-13 00:44:20,014 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-13 00:44:20,014 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-13 00:44:20,017 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-13 00:44:20,021 [ scc.git] DEBUG Already up to date.
2025-05-13 00:44:20,021 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-05-13 00:44:20,317 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-05-13 00:44:20,318 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-05-13 00:44:20,321 [ scc.git] DEBUG ## Unique users: []
2025-05-13 00:44:20,322 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:20,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:20,324 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-13 00:44:20,327 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:20,329 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-13 00:44:20,338 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-05-13 00:44:20,338 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-05-13 00:44:20,338 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-05-13 00:44:20,338 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-05-13 00:44:20,338 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-05-13 00:44:20,338 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-05-13 00:44:20,338 [ scc.git] DEBUG Auto-merging setup.py
2025-05-13 00:44:20,338 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-05-13 00:44:20,338 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-13 00:44:20,338 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-13 00:44:20,341 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-13 00:44:20,345 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-05-13 00:44:20,346 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:20,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:44:20,521 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-13 00:44:20,524 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-13 00:44:20,528 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#418](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- setup.py
- omero_signup/views.py
--conflicts
2025-05-13 00:44:20,530 [ scc.config] DEBUG Found github.token
2025-05-13 00:44:20,530 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-05-13 00:44:20,530 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-13 00:44:20,567 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:20,567 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:20,569 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-13 00:44:20,608 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-13 00:44:20,612 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bd1afb710> has no local changes
2025-05-13 00:44:20,612 [ 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#418 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/)'
2025-05-13 00:44:20,618 [ scc.git] DEBUG [detached HEAD b981452] merge master -Dorg -Ssuccess-only
2025-05-13 00:44:20,618 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:44:20,619 [ scc.repo] DEBUG ## PRs found:
2025-05-13 00:44:20,773 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:21,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-05-13 00:44:21,387 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:21,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-05-13 00:44:21,894 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:22,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-13 00:44:22,453 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:22,713 [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-13 00:44:22,964 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:23,204 [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-13 00:44:23,456 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:23,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-13 00:44:23,925 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:24,118 [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-13 00:44:24,118 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-05-13 00:44:24,369 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:24,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-05-13 00:44:24,879 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:25,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-05-13 00:44:25,344 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:25,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-05-13 00:44:25,873 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:26,119 [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-13 00:44:26,370 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:26,602 [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-13 00:44:26,854 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:27,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-05-13 00:44:27,350 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:27,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-05-13 00:44:27,811 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:28,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-05-13 00:44:28,279 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:28,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-05-13 00:44:28,750 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:29,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-13 00:44:29,257 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:29,504 [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-13 00:44:29,756 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:30,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-13 00:44:30,322 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:30,523 [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-13 00:44:30,523 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-13 00:44:30,524 [ scc.repo] DEBUG ## Branches found:
2025-05-13 00:44:30,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-13 00:44:30,524 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:30,524 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:30,527 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-13 00:44:30,529 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-13 00:44:30,529 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-13 00:44:30,532 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-13 00:44:30,535 [ scc.git] DEBUG Already up to date.
2025-05-13 00:44:30,535 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-05-13 00:44:30,835 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-13 00:44:30,835 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-05-13 00:44:30,840 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-05-13 00:44:31,136 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-13 00:44:31,136 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-05-13 00:44:31,140 [ scc.git] DEBUG ## Unique users: []
2025-05-13 00:44:31,140 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:31,140 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:31,142 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-05-13 00:44:31,147 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:31,149 [ 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-13 00:44:31,161 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-13 00:44:31,164 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-05-13 00:44:31,165 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-05-13 00:44:31,165 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-05-13 00:44:31,165 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-05-13 00:44:31,165 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-05-13 00:44:31,165 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-05-13 00:44:31,166 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:31,166 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-05-13 00:44:31,166 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-05-13 00:44:31,166 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-05-13 00:44:31,166 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-05-13 00:44:31,166 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-05-13 00:44:31,166 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-05-13 00:44:31,166 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-05-13 00:44:31,166 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-05-13 00:44:31,166 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-05-13 00:44:31,166 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-05-13 00:44:31,166 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-05-13 00:44:31,166 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-05-13 00:44:31,166 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-05-13 00:44:31,166 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-05-13 00:44:31,166 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-05-13 00:44:31,166 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-05-13 00:44:31,166 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-05-13 00:44:31,166 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-05-13 00:44:31,166 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-05-13 00:44:31,166 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-05-13 00:44:31,166 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-05-13 00:44:31,166 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-05-13 00:44:31,166 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-05-13 00:44:31,167 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-05-13 00:44:31,167 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-05-13 00:44:31,167 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-05-13 00:44:31,167 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-05-13 00:44:31,167 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-05-13 00:44:31,167 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-05-13 00:44:31,167 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-05-13 00:44:31,167 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-05-13 00:44:31,167 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-05-13 00:44:31,167 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-05-13 00:44:31,167 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-05-13 00:44:31,167 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-05-13 00:44:31,167 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-05-13 00:44:31,167 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-05-13 00:44:31,167 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-05-13 00:44:31,167 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-05-13 00:44:31,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:44:31,340 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-13 00:44:31,344 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:31,346 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-13 00:44:31,356 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-13 00:44:31,359 [ scc.git] DEBUG docker | 1 +
2025-05-13 00:44:31,359 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-05-13 00:44:31,590 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:31,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:44:31,759 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-13 00:44:31,797 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:31,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:31,799 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-13 00:44:31,836 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-13 00:44:31,840 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bd0125d10> has no local changes
2025-05-13 00:44:31,840 [ 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#418 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/)'
2025-05-13 00:44:31,848 [ scc.git] DEBUG [detached HEAD e9ece4b] merge master -Dorg -Ssuccess-only
2025-05-13 00:44:31,848 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:44:31,848 [ scc.repo] DEBUG ## PRs found:
2025-05-13 00:44:32,010 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:32,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-05-13 00:44:32,198 [ scc.repo] DEBUG ## Branches found:
2025-05-13 00:44:32,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-13 00:44:32,198 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:32,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:32,200 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-13 00:44:32,203 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-13 00:44:32,203 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-13 00:44:32,205 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-13 00:44:32,208 [ scc.git] DEBUG Already up to date.
2025-05-13 00:44:32,208 [ scc.git] DEBUG ## Unique users: []
2025-05-13 00:44:32,208 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:32,209 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:32,211 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-13 00:44:32,249 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:32,249 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:32,252 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-13 00:44:32,289 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-13 00:44:32,293 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bd00fd5d0> has no local changes
2025-05-13 00:44:32,293 [ 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#418 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/)'
2025-05-13 00:44:32,299 [ scc.git] DEBUG [detached HEAD 5686049] merge master -Dorg -Ssuccess-only
2025-05-13 00:44:32,300 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:44:32,300 [ scc.repo] DEBUG ## PRs found:
2025-05-13 00:44:32,449 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:32,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-05-13 00:44:32,969 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:33,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-05-13 00:44:33,456 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:33,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-05-13 00:44:33,947 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:34,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-13 00:44:34,480 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:34,751 [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-13 00:44:35,002 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:35,232 [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-13 00:44:35,484 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:35,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-13 00:44:36,017 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:36,210 [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-13 00:44:36,210 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-05-13 00:44:36,210 [ scc.repo] DEBUG ## Branches found:
2025-05-13 00:44:36,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-13 00:44:36,210 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:36,210 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:36,213 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-13 00:44:36,215 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-13 00:44:36,215 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-13 00:44:36,218 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-13 00:44:36,221 [ scc.git] DEBUG Already up to date.
2025-05-13 00:44:36,221 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-05-13 00:44:36,505 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-05-13 00:44:36,505 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-05-13 00:44:36,509 [ scc.git] DEBUG ## Unique users: []
2025-05-13 00:44:36,509 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:36,509 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:36,511 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-05-13 00:44:36,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:36,516 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-05-13 00:44:36,523 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-13 00:44:36,526 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-05-13 00:44:36,526 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-05-13 00:44:36,526 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-05-13 00:44:36,526 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-05-13 00:44:36,526 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-05-13 00:44:36,527 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:36,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:44:36,693 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-13 00:44:36,731 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:36,731 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:36,733 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-13 00:44:36,769 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-13 00:44:36,773 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bd1a7a0d0> has no local changes
2025-05-13 00:44:36,773 [ 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#418 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/)'
2025-05-13 00:44:36,779 [ scc.git] DEBUG [detached HEAD 4734df5] merge master -Dorg -Ssuccess-only
2025-05-13 00:44:36,779 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:44:36,780 [ scc.git] INFO Overriding base-branch from master to main
2025-05-13 00:44:36,780 [ scc.repo] DEBUG ## PRs found:
2025-05-13 00:44:36,944 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:37,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-05-13 00:44:37,475 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:37,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-05-13 00:44:38,021 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:38,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-05-13 00:44:38,513 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:38,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-05-13 00:44:39,103 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:39,369 [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-13 00:44:39,621 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:39,866 [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-13 00:44:40,118 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:40,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-05-13 00:44:40,614 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:40,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-05-13 00:44:41,099 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:41,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-05-13 00:44:41,794 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:42,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-13 00:44:42,292 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:42,533 [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-13 00:44:42,784 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:43,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-13 00:44:43,315 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:43,492 [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-13 00:44:43,492 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-13 00:44:43,493 [ scc.repo] DEBUG ## Branches found:
2025-05-13 00:44:43,493 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-13 00:44:43,493 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:43,493 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:43,495 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-05-13 00:44:43,498 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-13 00:44:43,498 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-05-13 00:44:43,501 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-05-13 00:44:43,503 [ scc.git] DEBUG Already up to date.
2025-05-13 00:44:43,504 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-05-13 00:44:43,815 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-05-13 00:44:43,815 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-05-13 00:44:43,819 [ scc.git] DEBUG ## Unique users: []
2025-05-13 00:44:43,819 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:43,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:43,822 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-13 00:44:43,824 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:43,827 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-13 00:44:43,834 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-05-13 00:44:43,834 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-05-13 00:44:43,835 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-13 00:44:43,835 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-13 00:44:43,837 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-13 00:44:43,841 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-05-13 00:44:43,843 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:43,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:44:43,998 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-13 00:44:44,001 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-13 00:44:44,004 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#418](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-05-13 00:44:44,006 [ scc.config] DEBUG Found github.token
2025-05-13 00:44:44,006 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-05-13 00:44:44,006 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-13 00:44:44,044 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:44,044 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:44,046 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-13 00:44:44,083 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-13 00:44:44,086 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bd1c40390> has no local changes
2025-05-13 00:44:44,086 [ 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#418 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/)'
2025-05-13 00:44:44,092 [ scc.git] DEBUG [detached HEAD ecc147e] merge master -Dorg -Ssuccess-only
2025-05-13 00:44:44,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:44:44,092 [ scc.repo] DEBUG ## PRs found:
2025-05-13 00:44:44,249 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:44,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-05-13 00:44:44,431 [ scc.repo] DEBUG ## Branches found:
2025-05-13 00:44:44,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-13 00:44:44,431 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:44,431 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:44,433 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-13 00:44:44,436 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-13 00:44:44,436 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-13 00:44:44,439 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-13 00:44:44,441 [ scc.git] DEBUG Already up to date.
2025-05-13 00:44:44,441 [ scc.git] DEBUG ## Unique users: []
2025-05-13 00:44:44,441 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:44,441 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:44,444 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-13 00:44:44,482 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:44,482 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:44,484 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-13 00:44:44,521 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-13 00:44:44,524 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bd1af9450> has no local changes
2025-05-13 00:44:44,524 [ 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#418 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/)'
2025-05-13 00:44:44,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:44:44,531 [ scc.repo] DEBUG ## PRs found:
2025-05-13 00:44:44,531 [ scc.git] DEBUG [detached HEAD dd0d5f6] merge master -Dorg -Ssuccess-only
2025-05-13 00:44:44,682 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:44,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-05-13 00:44:44,873 [ scc.repo] DEBUG ## Branches found:
2025-05-13 00:44:44,873 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-13 00:44:44,873 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:44,873 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:44,875 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-13 00:44:44,877 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-13 00:44:44,877 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-13 00:44:44,880 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-13 00:44:44,883 [ scc.git] DEBUG Already up to date.
2025-05-13 00:44:44,883 [ scc.git] DEBUG ## Unique users: []
2025-05-13 00:44:44,883 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:44,883 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:44,885 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-13 00:44:44,922 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:44,922 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:44,924 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-13 00:44:44,961 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-13 00:44:44,964 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bd1a79790> has no local changes
2025-05-13 00:44:44,964 [ 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#418 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/)'
2025-05-13 00:44:44,970 [ scc.git] DEBUG [detached HEAD e8ca16a] merge master -Dorg -Ssuccess-only
2025-05-13 00:44:44,970 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:44:44,971 [ scc.repo] DEBUG ## PRs found:
2025-05-13 00:44:45,124 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:45,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-05-13 00:44:45,623 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:45,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-05-13 00:44:46,113 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:46,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-05-13 00:44:46,589 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:46,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-13 00:44:47,144 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:47,379 [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-13 00:44:47,630 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:47,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-13 00:44:48,079 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:48,276 [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-13 00:44:48,276 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-05-13 00:44:48,276 [ scc.repo] DEBUG ## Branches found:
2025-05-13 00:44:48,277 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-13 00:44:48,277 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:48,277 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:48,279 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-13 00:44:48,281 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-13 00:44:48,281 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-13 00:44:48,284 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-13 00:44:48,287 [ scc.git] DEBUG Already up to date.
2025-05-13 00:44:48,287 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-05-13 00:44:48,603 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-05-13 00:44:48,603 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-05-13 00:44:48,607 [ scc.git] DEBUG ## Unique users: []
2025-05-13 00:44:48,607 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:48,607 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:48,609 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-13 00:44:48,612 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:48,614 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-13 00:44:48,623 [ scc.git] DEBUG Auto-merging Dockerfile
2025-05-13 00:44:48,623 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-05-13 00:44:48,623 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-13 00:44:48,624 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-13 00:44:48,627 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-13 00:44:48,631 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-05-13 00:44:48,633 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:48,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:44:48,821 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-13 00:44:48,824 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-13 00:44:48,827 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#418](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-05-13 00:44:48,829 [ scc.config] DEBUG Found github.token
2025-05-13 00:44:48,829 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-05-13 00:44:48,829 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-13 00:44:48,866 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:48,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:48,868 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-13 00:44:48,904 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-13 00:44:48,908 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bd0148910> has no local changes
2025-05-13 00:44:48,908 [ 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#418 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/)'
2025-05-13 00:44:48,914 [ scc.git] DEBUG [detached HEAD c922cd5] merge master -Dorg -Ssuccess-only
2025-05-13 00:44:48,915 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:44:48,915 [ scc.git] INFO Overriding base-branch from master to develop
2025-05-13 00:44:48,915 [ scc.repo] DEBUG ## PRs found:
2025-05-13 00:44:49,072 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:49,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-05-13 00:44:49,649 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:49,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-05-13 00:44:50,221 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:50,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-05-13 00:44:50,684 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:50,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-13 00:44:51,156 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:51,442 [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-13 00:44:51,693 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:51,930 [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-13 00:44:52,182 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:52,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-13 00:44:52,634 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:52,810 [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-13 00:44:52,810 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-13 00:44:53,061 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:53,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-05-13 00:44:53,581 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:53,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-05-13 00:44:54,076 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:54,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-13 00:44:54,517 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:54,725 [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-13 00:44:54,977 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:55,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-13 00:44:55,434 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:55,614 [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-13 00:44:55,614 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-13 00:44:55,865 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:56,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-05-13 00:44:56,353 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:56,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-05-13 00:44:56,894 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:57,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-05-13 00:44:57,358 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:57,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-05-13 00:44:57,610 [ scc.repo] DEBUG ## Branches found:
2025-05-13 00:44:57,610 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-13 00:44:57,610 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:57,610 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:57,612 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-05-13 00:44:57,615 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-13 00:44:57,615 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-05-13 00:44:57,618 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-05-13 00:44:57,626 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-05-13 00:44:57,860 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:58,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-05-13 00:44:58,259 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-05-13 00:44:58,569 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-13 00:44:58,569 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-05-13 00:44:58,574 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-05-13 00:44:58,898 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-13 00:44:58,898 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-05-13 00:44:58,903 [ scc.git] DEBUG ## Unique users: []
2025-05-13 00:44:58,903 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:58,903 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:58,906 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-13 00:44:58,911 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:58,914 [ 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-13 00:44:58,924 [ 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-13 00:44:58,925 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-13 00:44:58,925 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-13 00:44:58,928 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-13 00:44:58,931 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-05-13 00:44:58,933 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:59,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:44:59,095 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-13 00:44:59,101 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-13 00:44:59,105 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#418](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-05-13 00:44:59,107 [ scc.config] DEBUG Found github.token
2025-05-13 00:44:59,107 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-05-13 00:44:59,107 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-05-13 00:44:59,111 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:59,113 [ 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-13 00:44:59,123 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-13 00:44:59,126 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-05-13 00:44:59,126 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-05-13 00:44:59,346 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:59,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:44:59,505 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-13 00:44:59,544 [ scc.git] DEBUG Get sha1 of %s
2025-05-13 00:44:59,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-13 00:44:59,546 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-13 00:44:59,583 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-13 00:44:59,587 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bd1ae9410> has no local changes
2025-05-13 00:44:59,587 [ 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#418 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/)'
2025-05-13 00:44:59,594 [ scc.git] DEBUG [detached HEAD cf1981c] merge master -Dorg -Ssuccess-only
2025-05-13 00:44:59,594 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:44:59,594 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-13 00:44:59,672 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-05-13 00:44:59,756 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:44:59,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:44:59,930 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-05-13 00:44:59,932 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-05-13 00:45:00,177 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:45:00,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:45:00,346 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-05-13 00:45:00,348 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-05-13 00:45:00,593 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:45:00,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:45:00,760 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-05-13 00:45:00,762 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-05-13 00:45:01,007 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:45:01,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:45:01,188 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-05-13 00:45:01,433 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:45:01,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:45:01,603 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-05-13 00:45:01,605 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-05-13 00:45:01,850 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:45:02,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:45:02,014 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-05-13 00:45:02,016 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-05-13 00:45:02,260 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:45:02,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:45:02,422 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-05-13 00:45:02,424 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-05-13 00:45:02,668 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:45:02,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:45:02,851 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-05-13 00:45:02,853 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-05-13 00:45:03,098 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:45:03,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:45:03,263 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-05-13 00:45:03,264 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-05-13 00:45:03,509 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:45:03,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:45:03,673 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-05-13 00:45:03,675 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-05-13 00:45:03,919 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:45:04,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:45:04,093 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-05-13 00:45:04,095 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-05-13 00:45:04,339 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:45:04,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:45:04,517 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-05-13 00:45:04,519 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-05-13 00:45:04,764 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:45:04,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:45:04,959 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-05-13 00:45:05,203 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:45:05,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:45:05,372 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-05-13 00:45:05,616 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:45:05,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:45:05,784 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-05-13 00:45:05,786 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-05-13 00:45:06,030 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:45:06,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:45:06,220 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-05-13 00:45:06,464 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:45:06,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:45:06,638 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-05-13 00:45:06,883 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:45:07,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:45:07,065 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-05-13 00:45:07,067 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-05-13 00:45:07,312 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:45:07,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:45:07,509 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-05-13 00:45:07,511 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-05-13 00:45:07,756 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:45:07,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:45:07,940 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-05-13 00:45:07,942 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-05-13 00:45:08,187 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:45:08,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:45:08,351 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-05-13 00:45:08,353 [ scc.config] DEBUG Found submodule.scripts.url
2025-05-13 00:45:08,598 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-13 00:45:08,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-13 00:45:08,772 [ scc.config] DEBUG Found submodule.scripts.branch
2025-05-13 00:45:08,772 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-13 00:45:08,862 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6bd1ca7990> has local changes
2025-05-13 00:45:08,862 [ 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#418 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/418/)'
2025-05-13 00:45:08,876 [ scc.git] DEBUG [detached HEAD a346b7d] merge master -Dorg -Ssuccess-only
2025-05-13 00:45:08,876 [ scc.merge] INFO Repository: ome/omero-plugins
2025-05-13 00:45:08,876 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-05-13 00:45:08,876 [ scc.merge] INFO Already up to date.
2025-05-13 00:45:08,877 [ scc.merge] INFO
2025-05-13 00:45:08,877 [ scc.merge] INFO Merged PRs:
2025-05-13 00:45:08,877 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-05-13 00:45:08,877 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-05-13 00:45:08,877 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-05-13 00:45:08,877 [ scc.merge] INFO
2025-05-13 00:45:08,877 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-05-13 00:45:08,877 [ scc.merge] INFO Already up to date.
2025-05-13 00:45:08,877 [ scc.merge] INFO
2025-05-13 00:45:08,877 [ scc.merge] INFO
2025-05-13 00:45:08,877 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-05-13 00:45:08,877 [ scc.merge] INFO Excluded PRs:
2025-05-13 00:45:08,877 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-05-13 00:45:08,877 [ scc.merge] INFO Already up to date.
2025-05-13 00:45:08,877 [ scc.merge] INFO
2025-05-13 00:45:08,877 [ scc.merge] INFO
2025-05-13 00:45:08,877 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-05-13 00:45:08,877 [ scc.merge] INFO Excluded PRs:
2025-05-13 00:45:08,877 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-05-13 00:45:08,877 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-05-13 00:45:08,877 [ scc.merge] INFO Already up to date.
2025-05-13 00:45:08,877 [ scc.merge] INFO
2025-05-13 00:45:08,877 [ scc.merge] INFO Merged PRs:
2025-05-13 00:45:08,878 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-05-13 00:45:08,878 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-05-13 00:45:08,878 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-05-13 00:45:08,878 [ scc.merge] INFO
2025-05-13 00:45:08,878 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-05-13 00:45:08,878 [ scc.merge] INFO Excluded PRs:
2025-05-13 00:45:08,878 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-05-13 00:45:08,878 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-05-13 00:45:08,878 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-05-13 00:45:08,878 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-13 00:45:08,878 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-05-13 00:45:08,878 [ scc.merge] INFO Updating 11d3587..5b2ca82
2025-05-13 00:45:08,878 [ scc.merge] INFO Previously merged:
2025-05-13 00:45:08,878 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-05-13 00:45:08,878 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-13 00:45:08,878 [ scc.merge] INFO
2025-05-13 00:45:08,878 [ scc.merge] INFO Merged PRs:
2025-05-13 00:45:08,878 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-05-13 00:45:08,878 [ scc.merge] INFO
2025-05-13 00:45:08,878 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-13 00:45:08,878 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-05-13 00:45:08,878 [ scc.merge] INFO
2025-05-13 00:45:08,878 [ scc.merge] INFO Repository: ome/omero-figure
2025-05-13 00:45:08,878 [ scc.merge] INFO Excluded PRs:
2025-05-13 00:45:08,878 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-05-13 00:45:08,878 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-05-13 00:45:08,878 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-05-13 00:45:08,878 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-05-13 00:45:08,878 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-05-13 00:45:08,878 [ scc.merge] INFO Previously merged:
2025-05-13 00:45:08,878 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-05-13 00:45:08,878 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-05-13 00:45:08,878 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-05-13 00:45:08,878 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-13 00:45:08,878 [ scc.merge] INFO
2025-05-13 00:45:08,878 [ scc.merge] INFO Merged PRs:
2025-05-13 00:45:08,878 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-05-13 00:45:08,878 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-05-13 00:45:08,878 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-05-13 00:45:08,879 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-05-13 00:45:08,879 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-05-13 00:45:08,879 [ scc.merge] INFO
2025-05-13 00:45:08,879 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-13 00:45:08,879 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-05-13 00:45:08,879 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-05-13 00:45:08,879 [ scc.merge] INFO
2025-05-13 00:45:08,879 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-05-13 00:45:08,879 [ scc.merge] INFO Already up to date.
2025-05-13 00:45:08,879 [ scc.merge] INFO
2025-05-13 00:45:08,879 [ scc.merge] INFO Merged PRs:
2025-05-13 00:45:08,879 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-05-13 00:45:08,879 [ scc.merge] INFO
2025-05-13 00:45:08,879 [ scc.merge] INFO Repository: ome/omero-gallery
2025-05-13 00:45:08,879 [ scc.merge] INFO Already up to date.
2025-05-13 00:45:08,879 [ scc.merge] INFO
2025-05-13 00:45:08,879 [ scc.merge] INFO Merged PRs:
2025-05-13 00:45:08,879 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-05-13 00:45:08,879 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-05-13 00:45:08,879 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-05-13 00:45:08,879 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-05-13 00:45:08,879 [ scc.merge] INFO
2025-05-13 00:45:08,879 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-13 00:45:08,879 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-05-13 00:45:08,879 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-05-13 00:45:08,879 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-05-13 00:45:08,879 [ scc.merge] INFO
2025-05-13 00:45:08,879 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-05-13 00:45:08,879 [ scc.merge] INFO Excluded PRs:
2025-05-13 00:45:08,879 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-05-13 00:45:08,879 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-05-13 00:45:08,879 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-05-13 00:45:08,879 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-05-13 00:45:08,879 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-05-13 00:45:08,879 [ scc.merge] INFO Already up to date.
2025-05-13 00:45:08,879 [ scc.merge] INFO
2025-05-13 00:45:08,879 [ scc.merge] INFO Merged PRs:
2025-05-13 00:45:08,879 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-05-13 00:45:08,879 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-05-13 00:45:08,879 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-05-13 00:45:08,880 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-05-13 00:45:08,880 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-13 00:45:08,880 [ scc.merge] INFO
2025-05-13 00:45:08,880 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-13 00:45:08,880 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-05-13 00:45:08,880 [ scc.merge] INFO
2025-05-13 00:45:08,880 [ scc.merge] INFO Repository: ome/omero-mapr
2025-05-13 00:45:08,880 [ scc.merge] INFO Excluded PRs:
2025-05-13 00:45:08,880 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-05-13 00:45:08,880 [ scc.merge] INFO Already up to date.
2025-05-13 00:45:08,880 [ scc.merge] INFO
2025-05-13 00:45:08,880 [ scc.merge] INFO Merged PRs:
2025-05-13 00:45:08,880 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-05-13 00:45:08,880 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-13 00:45:08,880 [ scc.merge] INFO
2025-05-13 00:45:08,880 [ scc.merge] INFO Repository: ome/omero-metadata
2025-05-13 00:45:08,880 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-05-13 00:45:08,880 [ scc.merge] INFO Previously merged:
2025-05-13 00:45:08,880 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-13 00:45:08,880 [ scc.merge] INFO
2025-05-13 00:45:08,880 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-13 00:45:08,880 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-13 00:45:08,880 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-13 00:45:08,880 [ scc.merge] INFO
2025-05-13 00:45:08,880 [ scc.merge] INFO Repository: ome/omero-parade
2025-05-13 00:45:08,880 [ scc.merge] INFO Excluded PRs:
2025-05-13 00:45:08,880 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-05-13 00:45:08,880 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-05-13 00:45:08,880 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-05-13 00:45:08,880 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-05-13 00:45:08,880 [ scc.merge] INFO Already up to date.
2025-05-13 00:45:08,880 [ scc.merge] INFO
2025-05-13 00:45:08,880 [ scc.merge] INFO Merged PRs:
2025-05-13 00:45:08,880 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-13 00:45:08,880 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-13 00:45:08,880 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-13 00:45:08,880 [ scc.merge] INFO
2025-05-13 00:45:08,880 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-05-13 00:45:08,880 [ scc.merge] INFO Already up to date.
2025-05-13 00:45:08,881 [ scc.merge] INFO
2025-05-13 00:45:08,881 [ scc.merge] INFO
2025-05-13 00:45:08,881 [ scc.merge] INFO Repository: ome/omero-rois
2025-05-13 00:45:08,881 [ scc.merge] INFO Excluded PRs:
2025-05-13 00:45:08,881 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-05-13 00:45:08,881 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-13 00:45:08,881 [ scc.merge] INFO Already up to date.
2025-05-13 00:45:08,881 [ scc.merge] INFO
2025-05-13 00:45:08,881 [ scc.merge] INFO
2025-05-13 00:45:08,881 [ scc.merge] INFO Repository: ome/omero-signup
2025-05-13 00:45:08,881 [ scc.merge] INFO Already up to date.
2025-05-13 00:45:08,881 [ scc.merge] INFO
2025-05-13 00:45:08,881 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-13 00:45:08,881 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-13 00:45:08,881 [ scc.merge] INFO
2025-05-13 00:45:08,881 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-05-13 00:45:08,881 [ scc.merge] INFO Excluded PRs:
2025-05-13 00:45:08,881 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-05-13 00:45:08,881 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-05-13 00:45:08,881 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-05-13 00:45:08,881 [ scc.merge] INFO Already up to date.
2025-05-13 00:45:08,881 [ scc.merge] INFO
2025-05-13 00:45:08,881 [ scc.merge] INFO Merged PRs:
2025-05-13 00:45:08,881 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-13 00:45:08,881 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-05-13 00:45:08,881 [ scc.merge] INFO
2025-05-13 00:45:08,881 [ scc.merge] INFO Repository: ome/omero-upload
2025-05-13 00:45:08,881 [ scc.merge] INFO Already up to date.
2025-05-13 00:45:08,881 [ scc.merge] INFO
2025-05-13 00:45:08,881 [ scc.merge] INFO
2025-05-13 00:45:08,881 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-05-13 00:45:08,881 [ scc.merge] INFO Already up to date.
2025-05-13 00:45:08,881 [ scc.merge] INFO
2025-05-13 00:45:08,881 [ scc.merge] INFO Merged PRs:
2025-05-13 00:45:08,881 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-05-13 00:45:08,881 [ scc.merge] INFO
2025-05-13 00:45:08,881 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-05-13 00:45:08,881 [ scc.merge] INFO Excluded PRs:
2025-05-13 00:45:08,881 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-05-13 00:45:08,881 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-05-13 00:45:08,882 [ scc.merge] INFO Already up to date.
2025-05-13 00:45:08,882 [ scc.merge] INFO
2025-05-13 00:45:08,882 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-13 00:45:08,882 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-13 00:45:08,882 [ scc.merge] INFO
2025-05-13 00:45:08,882 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-05-13 00:45:08,882 [ scc.merge] INFO Already up to date.
2025-05-13 00:45:08,882 [ scc.merge] INFO
2025-05-13 00:45:08,882 [ scc.merge] INFO
2025-05-13 00:45:08,882 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-05-13 00:45:08,882 [ scc.merge] INFO Already up to date.
2025-05-13 00:45:08,882 [ scc.merge] INFO
2025-05-13 00:45:08,882 [ scc.merge] INFO
2025-05-13 00:45:08,882 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-05-13 00:45:08,882 [ scc.merge] INFO Already up to date.
2025-05-13 00:45:08,882 [ scc.merge] INFO
2025-05-13 00:45:08,882 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-13 00:45:08,882 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-05-13 00:45:08,882 [ scc.merge] INFO
2025-05-13 00:45:08,882 [ scc.merge] INFO Repository: ome/scripts
2025-05-13 00:45:08,882 [ scc.merge] INFO Excluded PRs:
2025-05-13 00:45:08,882 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-05-13 00:45:08,882 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-05-13 00:45:08,882 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-05-13 00:45:08,882 [ scc.merge] INFO Previously merged:
2025-05-13 00:45:08,882 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-05-13 00:45:08,882 [ scc.merge] INFO
2025-05-13 00:45:08,882 [ scc.merge] INFO Merged PRs:
2025-05-13 00:45:08,882 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-13 00:45:08,882 [ scc.merge] INFO
2025-05-13 00:45:08,882 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-13 00:45:08,882 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-13 00:45:08,882 [ scc.merge] INFO
2025-05-13 00:45:08,882 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-05-13 00:45:08,882 [ scc.git] DEBUG Calling 'git remote'
2025-05-13 00:45:08,884 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-05-13 00:45:08,884 [ scc.git] DEBUG Calling 'git remote'
2025-05-13 00:45:08,887 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:45:08,887 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-05-13 00:45:08,887 [ scc.git] DEBUG Calling 'git remote'
2025-05-13 00:45:08,889 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:45:08,889 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-05-13 00:45:08,889 [ scc.git] DEBUG Calling 'git remote'
2025-05-13 00:45:08,891 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:45:08,891 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-05-13 00:45:08,891 [ scc.git] DEBUG Calling 'git remote'
2025-05-13 00:45:08,893 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:45:08,893 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-05-13 00:45:08,893 [ scc.git] DEBUG Calling 'git remote'
2025-05-13 00:45:08,895 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:45:08,896 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-05-13 00:45:08,896 [ scc.git] DEBUG Calling 'git remote'
2025-05-13 00:45:08,898 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:45:08,898 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-05-13 00:45:08,898 [ scc.git] DEBUG Calling 'git remote'
2025-05-13 00:45:08,900 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:45:08,900 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-05-13 00:45:08,900 [ scc.git] DEBUG Calling 'git remote'
2025-05-13 00:45:08,902 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:45:08,902 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-13 00:45:08,902 [ scc.git] DEBUG Calling 'git remote'
2025-05-13 00:45:08,904 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:45:08,904 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-13 00:45:08,904 [ scc.git] DEBUG Calling 'git remote'
2025-05-13 00:45:08,906 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:45:08,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-13 00:45:08,907 [ scc.git] DEBUG Calling 'git remote'
2025-05-13 00:45:08,909 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:45:08,909 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-13 00:45:08,909 [ scc.git] DEBUG Calling 'git remote'
2025-05-13 00:45:08,911 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:45:08,911 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-13 00:45:08,911 [ scc.git] DEBUG Calling 'git remote'
2025-05-13 00:45:08,913 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:45:08,913 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-13 00:45:08,913 [ scc.git] DEBUG Calling 'git remote'
2025-05-13 00:45:08,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:45:08,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-13 00:45:08,916 [ scc.git] DEBUG Calling 'git remote'
2025-05-13 00:45:08,918 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:45:08,918 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-13 00:45:08,918 [ scc.git] DEBUG Calling 'git remote'
2025-05-13 00:45:08,920 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:45:08,920 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-13 00:45:08,920 [ scc.git] DEBUG Calling 'git remote'
2025-05-13 00:45:08,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:45:08,922 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-13 00:45:08,922 [ scc.git] DEBUG Calling 'git remote'
2025-05-13 00:45:08,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:45:08,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-13 00:45:08,924 [ scc.git] DEBUG Calling 'git remote'
2025-05-13 00:45:08,926 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:45:08,927 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-13 00:45:08,927 [ scc.git] DEBUG Calling 'git remote'
2025-05-13 00:45:08,929 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:45:08,929 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-13 00:45:08,929 [ scc.git] DEBUG Calling 'git remote'
2025-05-13 00:45:08,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-13 00:45:08,931 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-13 00:45:08,931 [ scc.git] DEBUG Calling 'git remote'
2025-05-13 00:45:08,933 [ 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 495d651] 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 e2e79e6] 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-13 00:45:56,391 [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-13 00:46:05,802 [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-13 00:46:08,318 [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-13 00:46:13,249 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-05-13 00:46:52,944 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/9161e9ff/images/svgs/logo.svg){kind=logo}
