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-12 00:49:55,721 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-12 00:49:55,724 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-12 00:49:55,724 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-12 00:49:55,937 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:49:56,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:49:56,104 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-12 00:49:56,144 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:49:56,144 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:49:56,146 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-12 00:49:56,184 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-12 00:49:56,191 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5adb929a10> has no local changes
2025-05-12 00:49:56,191 [ 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#417 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/)'
2025-05-12 00:49:56,198 [ scc.git] DEBUG [detached HEAD e3f2c89] merge master -Dorg -Ssuccess-only
2025-05-12 00:49:56,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:49:56,198 [ scc.repo] DEBUG ## PRs found:
2025-05-12 00:49:56,355 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:49:56,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-05-12 00:49:56,926 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:49:57,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-05-12 00:49:57,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:49:57,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-12 00:49:57,929 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:49:58,157 [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-12 00:49:58,409 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:49:58,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-12 00:49:58,961 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:49:59,141 [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-12 00:49:59,141 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-12 00:49:59,392 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:49:59,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-05-12 00:49:59,865 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:00,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-05-12 00:50:00,400 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:00,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-12 00:50:00,920 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:01,127 [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-12 00:50:01,378 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:01,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-12 00:50:01,897 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:02,087 [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-12 00:50:02,088 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-05-12 00:50:02,088 [ scc.repo] DEBUG ## Branches found:
2025-05-12 00:50:02,088 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-12 00:50:02,088 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:02,088 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:02,091 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-12 00:50:02,093 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-12 00:50:02,094 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-12 00:50:02,097 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-12 00:50:02,100 [ scc.git] DEBUG Already up to date.
2025-05-12 00:50:02,100 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-05-12 00:50:02,393 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-12 00:50:02,393 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-05-12 00:50:02,397 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-05-12 00:50:02,710 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-12 00:50:02,710 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-05-12 00:50:02,714 [ scc.git] DEBUG ## Unique users: []
2025-05-12 00:50:02,714 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:02,714 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:02,716 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-12 00:50:02,720 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:02,723 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-12 00:50:02,731 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-12 00:50:02,735 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-05-12 00:50:02,735 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-05-12 00:50:02,735 [ scc.git] DEBUG requirements.txt | 2 +-
2025-05-12 00:50:02,735 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-05-12 00:50:02,735 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-05-12 00:50:02,735 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-05-12 00:50:02,736 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:02,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:50:02,906 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-05-12 00:50:02,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:02,912 [ 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-12 00:50:02,921 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-12 00:50:02,924 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-12 00:50:02,924 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-12 00:50:03,157 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:03,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:50:03,319 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-12 00:50:03,359 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:03,359 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:03,361 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-12 00:50:03,399 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-12 00:50:03,403 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5adb8d4710> has no local changes
2025-05-12 00:50:03,403 [ 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#417 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/)'
2025-05-12 00:50:03,410 [ scc.git] DEBUG [detached HEAD 75b0139] merge master -Dorg -Ssuccess-only
2025-05-12 00:50:03,410 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:50:03,410 [ scc.repo] DEBUG ## PRs found:
2025-05-12 00:50:03,571 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:03,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-05-12 00:50:04,110 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:04,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-05-12 00:50:04,573 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:04,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-05-12 00:50:05,127 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:05,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-12 00:50:05,662 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:05,882 [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-12 00:50:06,134 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:06,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-12 00:50:06,658 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:06,846 [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-12 00:50:06,846 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-12 00:50:07,097 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:07,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-05-12 00:50:07,564 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:07,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-05-12 00:50:08,060 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:08,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-12 00:50:08,562 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:08,794 [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-12 00:50:09,045 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:09,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-12 00:50:09,502 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:09,697 [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-12 00:50:09,697 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-12 00:50:09,698 [ scc.repo] DEBUG ## Branches found:
2025-05-12 00:50:09,698 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-12 00:50:09,698 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:09,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:09,701 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-12 00:50:09,703 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-12 00:50:09,703 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-12 00:50:09,706 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-12 00:50:09,714 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-05-12 00:50:09,949 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:10,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-05-12 00:50:10,303 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-05-12 00:50:10,633 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-12 00:50:10,633 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-05-12 00:50:10,637 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-05-12 00:50:10,913 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-12 00:50:10,913 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-05-12 00:50:10,917 [ scc.git] DEBUG ## Unique users: []
2025-05-12 00:50:10,917 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:10,917 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:10,919 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-12 00:50:10,924 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:10,926 [ 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-12 00:50:10,939 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-05-12 00:50:10,939 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-05-12 00:50:10,939 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-12 00:50:10,939 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-12 00:50:10,940 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-12 00:50:10,940 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-12 00:50:10,943 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-12 00:50:10,947 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-12 00:50:10,949 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:11,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:50:11,108 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-12 00:50:11,112 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-12 00:50:11,115 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#417](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-05-12 00:50:11,117 [ scc.config] DEBUG Found github.token
2025-05-12 00:50:11,117 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-05-12 00:50:11,117 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-12 00:50:11,122 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:11,124 [ 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-12 00:50:11,139 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-12 00:50:11,139 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-12 00:50:11,139 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-05-12 00:50:11,140 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-12 00:50:11,140 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-12 00:50:11,143 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-12 00:50:11,148 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-12 00:50:11,359 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:11,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:50:11,550 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-12 00:50:11,555 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-12 00:50:11,558 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#417](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/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-12 00:50:11,560 [ scc.config] DEBUG Found github.token
2025-05-12 00:50:11,560 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-05-12 00:50:11,560 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-12 00:50:11,599 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:11,599 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:11,602 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-12 00:50:11,639 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-12 00:50:11,644 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5adb928490> has no local changes
2025-05-12 00:50:11,644 [ 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#417 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/)'
2025-05-12 00:50:11,651 [ scc.git] DEBUG [detached HEAD c96dc17] merge master -Dorg -Ssuccess-only
2025-05-12 00:50:11,652 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:50:11,652 [ scc.repo] DEBUG ## PRs found:
2025-05-12 00:50:11,801 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:12,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-05-12 00:50:12,370 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:12,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-05-12 00:50:12,850 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:13,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-12 00:50:13,406 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:13,689 [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-12 00:50:13,940 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:14,170 [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-12 00:50:14,421 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:14,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-12 00:50:14,864 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:15,042 [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-12 00:50:15,042 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-12 00:50:15,293 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:15,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-05-12 00:50:15,529 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-12 00:50:15,780 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:16,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-12 00:50:16,334 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:16,598 [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-12 00:50:16,850 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:17,213 [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-12 00:50:17,465 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:17,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-12 00:50:18,008 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:18,196 [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-12 00:50:18,196 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-12 00:50:18,447 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:18,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-05-12 00:50:18,670 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-12 00:50:18,921 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:19,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-12 00:50:19,472 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:19,772 [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-12 00:50:20,023 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:20,314 [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-12 00:50:20,566 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:20,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-12 00:50:21,151 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:21,326 [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-12 00:50:21,326 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-12 00:50:21,577 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:21,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-05-12 00:50:22,105 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:22,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-05-12 00:50:22,584 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:22,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-05-12 00:50:23,057 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:23,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-05-12 00:50:23,516 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:23,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-05-12 00:50:24,000 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:24,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-05-12 00:50:24,466 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:24,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-05-12 00:50:24,782 [ scc.repo] DEBUG ## Branches found:
2025-05-12 00:50:24,783 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-12 00:50:24,783 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:24,783 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:24,786 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-12 00:50:24,788 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-12 00:50:24,788 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-12 00:50:24,791 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-12 00:50:24,794 [ scc.git] DEBUG Already up to date.
2025-05-12 00:50:24,794 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-05-12 00:50:25,082 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-12 00:50:25,082 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-05-12 00:50:25,086 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-05-12 00:50:25,370 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-12 00:50:25,370 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-05-12 00:50:25,374 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-05-12 00:50:25,667 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-12 00:50:25,667 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-05-12 00:50:25,671 [ scc.git] DEBUG ## Unique users: []
2025-05-12 00:50:25,671 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:25,671 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:25,673 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-05-12 00:50:25,676 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:25,678 [ 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-12 00:50:25,686 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-12 00:50:25,690 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-05-12 00:50:25,690 [ scc.git] DEBUG package.json | 2 +-
2025-05-12 00:50:25,690 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-05-12 00:50:25,691 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:25,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:50:25,856 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-05-12 00:50:25,859 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:25,861 [ 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-12 00:50:25,871 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-12 00:50:25,871 [ scc.git] DEBUG Auto-merging package.json
2025-05-12 00:50:25,872 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-12 00:50:25,876 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-05-12 00:50:25,876 [ scc.git] DEBUG package.json | 2 +-
2025-05-12 00:50:25,876 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-05-12 00:50:26,107 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:26,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:50:26,269 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-05-12 00:50:26,272 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:26,275 [ 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-12 00:50:26,284 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-12 00:50:26,286 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-12 00:50:26,286 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-12 00:50:26,520 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:26,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:50:26,682 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-12 00:50:26,720 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:26,721 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:26,723 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-12 00:50:26,761 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-12 00:50:26,765 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5adb9257d0> has no local changes
2025-05-12 00:50:26,765 [ 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#417 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/)'
2025-05-12 00:50:26,773 [ scc.git] DEBUG [detached HEAD a3b472a] merge master -Dorg -Ssuccess-only
2025-05-12 00:50:26,773 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:50:26,773 [ scc.repo] DEBUG ## PRs found:
2025-05-12 00:50:26,933 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:27,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-05-12 00:50:27,108 [ scc.repo] DEBUG ## Branches found:
2025-05-12 00:50:27,108 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-12 00:50:27,108 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:27,108 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:27,110 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-12 00:50:27,113 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-12 00:50:27,113 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-12 00:50:27,116 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-12 00:50:27,119 [ scc.git] DEBUG Already up to date.
2025-05-12 00:50:27,119 [ scc.git] DEBUG ## Unique users: []
2025-05-12 00:50:27,119 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:27,119 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:27,121 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-12 00:50:27,160 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:27,160 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:27,162 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-12 00:50:27,200 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-12 00:50:27,203 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5ad9725950> has no local changes
2025-05-12 00:50:27,203 [ 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#417 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/)'
2025-05-12 00:50:27,209 [ scc.git] DEBUG [detached HEAD 1152d3d] merge master -Dorg -Ssuccess-only
2025-05-12 00:50:27,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:50:27,210 [ scc.repo] DEBUG ## PRs found:
2025-05-12 00:50:27,359 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:27,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-05-12 00:50:27,935 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:28,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-05-12 00:50:28,429 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:28,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-05-12 00:50:28,911 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:29,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-05-12 00:50:29,163 [ scc.repo] DEBUG ## Branches found:
2025-05-12 00:50:29,163 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-12 00:50:29,163 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:29,163 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:29,166 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-12 00:50:29,168 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-12 00:50:29,168 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-12 00:50:29,171 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-12 00:50:29,174 [ scc.git] DEBUG Already up to date.
2025-05-12 00:50:29,175 [ scc.git] DEBUG ## Unique users: []
2025-05-12 00:50:29,175 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:29,175 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:29,177 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-12 00:50:29,216 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:29,216 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:29,218 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-12 00:50:29,256 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-12 00:50:29,259 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5ad97252d0> has no local changes
2025-05-12 00:50:29,260 [ 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#417 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/)'
2025-05-12 00:50:29,266 [ scc.git] DEBUG [detached HEAD ff0aa4c] merge master -Dorg -Ssuccess-only
2025-05-12 00:50:29,266 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:50:29,266 [ scc.repo] DEBUG ## PRs found:
2025-05-12 00:50:29,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:29,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-05-12 00:50:29,957 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:30,181 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-05-12 00:50:30,433 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:30,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-05-12 00:50:30,932 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:31,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-12 00:50:31,498 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:31,712 [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-12 00:50:31,963 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:32,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-12 00:50:32,430 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:32,615 [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-12 00:50:32,616 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-12 00:50:32,616 [ scc.repo] DEBUG ## Branches found:
2025-05-12 00:50:32,616 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-12 00:50:32,616 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:32,616 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:32,619 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-12 00:50:32,621 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-12 00:50:32,621 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-12 00:50:32,624 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-12 00:50:32,627 [ scc.git] DEBUG Already up to date.
2025-05-12 00:50:32,627 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-05-12 00:50:32,921 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-05-12 00:50:32,921 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-05-12 00:50:32,925 [ scc.git] DEBUG ## Unique users: []
2025-05-12 00:50:32,925 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:32,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:32,927 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-12 00:50:32,931 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:32,933 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-12 00:50:32,942 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-05-12 00:50:32,942 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-05-12 00:50:32,942 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-05-12 00:50:32,942 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-05-12 00:50:32,942 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-05-12 00:50:32,942 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-05-12 00:50:32,942 [ scc.git] DEBUG Auto-merging setup.py
2025-05-12 00:50:32,942 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-05-12 00:50:32,942 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-12 00:50:32,942 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-12 00:50:32,945 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-12 00:50:32,949 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-05-12 00:50:32,951 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:33,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:50:33,118 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-12 00:50:33,121 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-12 00:50:33,124 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#417](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/urls.py
- setup.py
- omero_signup/views.py
--conflicts
2025-05-12 00:50:33,126 [ scc.config] DEBUG Found github.token
2025-05-12 00:50:33,126 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-05-12 00:50:33,127 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-12 00:50:33,166 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:33,166 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:33,168 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-12 00:50:33,205 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-12 00:50:33,209 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5ad9750f10> has no local changes
2025-05-12 00:50:33,209 [ 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#417 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/)'
2025-05-12 00:50:33,215 [ scc.git] DEBUG [detached HEAD 9b55915] merge master -Dorg -Ssuccess-only
2025-05-12 00:50:33,215 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:50:33,215 [ scc.repo] DEBUG ## PRs found:
2025-05-12 00:50:33,369 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:33,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-05-12 00:50:33,940 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:34,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-05-12 00:50:34,428 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:34,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-12 00:50:35,006 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:35,247 [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-12 00:50:35,498 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:35,715 [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-12 00:50:35,966 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:36,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-12 00:50:36,514 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:36,703 [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-12 00:50:36,703 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-05-12 00:50:36,954 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:37,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-05-12 00:50:37,426 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:37,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-05-12 00:50:37,885 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:38,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-05-12 00:50:38,387 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:38,638 [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-12 00:50:38,890 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:39,130 [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-12 00:50:39,382 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:39,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-05-12 00:50:39,910 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:40,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-05-12 00:50:40,381 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:40,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-05-12 00:50:40,856 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:41,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-05-12 00:50:41,319 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:41,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-12 00:50:41,842 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:42,074 [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-12 00:50:42,325 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:42,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-12 00:50:42,837 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:43,022 [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-12 00:50:43,022 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-12 00:50:43,023 [ scc.repo] DEBUG ## Branches found:
2025-05-12 00:50:43,023 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-12 00:50:43,023 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:43,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:43,026 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-12 00:50:43,028 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-12 00:50:43,028 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-12 00:50:43,031 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-12 00:50:43,034 [ scc.git] DEBUG Already up to date.
2025-05-12 00:50:43,034 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-05-12 00:50:43,346 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-12 00:50:43,346 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-05-12 00:50:43,350 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-05-12 00:50:43,646 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-12 00:50:43,646 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-05-12 00:50:43,651 [ scc.git] DEBUG ## Unique users: []
2025-05-12 00:50:43,651 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:43,651 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:43,653 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-05-12 00:50:43,657 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:43,659 [ 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-12 00:50:43,672 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-12 00:50:43,675 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-05-12 00:50:43,675 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-05-12 00:50:43,675 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-05-12 00:50:43,675 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-05-12 00:50:43,675 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-05-12 00:50:43,675 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-05-12 00:50:43,675 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-05-12 00:50:43,676 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-05-12 00:50:43,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:43,677 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-05-12 00:50:43,677 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-05-12 00:50:43,677 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-05-12 00:50:43,677 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-05-12 00:50:43,677 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-05-12 00:50:43,677 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-05-12 00:50:43,677 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-05-12 00:50:43,677 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-05-12 00:50:43,677 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-05-12 00:50:43,677 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-05-12 00:50:43,677 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-05-12 00:50:43,677 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-05-12 00:50:43,677 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-05-12 00:50:43,677 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-05-12 00:50:43,677 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-05-12 00:50:43,677 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-05-12 00:50:43,677 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-05-12 00:50:43,677 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-05-12 00:50:43,677 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-05-12 00:50:43,677 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-05-12 00:50:43,677 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-05-12 00:50:43,677 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-05-12 00:50:43,677 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-05-12 00:50:43,677 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-05-12 00:50:43,677 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-05-12 00:50:43,677 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-05-12 00:50:43,677 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-05-12 00:50:43,677 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-05-12 00:50:43,677 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-05-12 00:50:43,677 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-05-12 00:50:43,678 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-05-12 00:50:43,678 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-05-12 00:50:43,678 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-05-12 00:50:43,678 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-05-12 00:50:43,678 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-05-12 00:50:43,678 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-05-12 00:50:43,678 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-05-12 00:50:43,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:50:43,845 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-12 00:50:43,849 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:43,852 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-12 00:50:43,862 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-12 00:50:43,865 [ scc.git] DEBUG docker | 1 +
2025-05-12 00:50:43,865 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-05-12 00:50:44,096 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:44,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:50:44,254 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-12 00:50:44,293 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:44,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:44,295 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-12 00:50:44,332 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-12 00:50:44,337 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5ad9724c10> has no local changes
2025-05-12 00:50:44,337 [ 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#417 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/)'
2025-05-12 00:50:44,343 [ scc.git] DEBUG [detached HEAD d82abb5] merge master -Dorg -Ssuccess-only
2025-05-12 00:50:44,343 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:50:44,343 [ scc.repo] DEBUG ## PRs found:
2025-05-12 00:50:44,505 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:44,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-05-12 00:50:44,702 [ scc.repo] DEBUG ## Branches found:
2025-05-12 00:50:44,702 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-12 00:50:44,702 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:44,702 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:44,705 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-12 00:50:44,707 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-12 00:50:44,707 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-12 00:50:44,710 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-12 00:50:44,713 [ scc.git] DEBUG Already up to date.
2025-05-12 00:50:44,713 [ scc.git] DEBUG ## Unique users: []
2025-05-12 00:50:44,713 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:44,713 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:44,715 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-12 00:50:44,754 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:44,754 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:44,756 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-12 00:50:44,794 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-12 00:50:44,798 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5ad978d9d0> has no local changes
2025-05-12 00:50:44,798 [ 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#417 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/)'
2025-05-12 00:50:44,804 [ scc.git] DEBUG [detached HEAD 695880b] merge master -Dorg -Ssuccess-only
2025-05-12 00:50:44,804 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:50:44,804 [ scc.repo] DEBUG ## PRs found:
2025-05-12 00:50:44,953 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:45,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-05-12 00:50:45,480 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:45,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-05-12 00:50:45,945 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:46,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-05-12 00:50:46,430 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:46,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-12 00:50:46,944 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:47,175 [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-12 00:50:47,427 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:47,644 [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-12 00:50:47,896 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:48,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-12 00:50:48,443 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:48,637 [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-12 00:50:48,637 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-05-12 00:50:48,637 [ scc.repo] DEBUG ## Branches found:
2025-05-12 00:50:48,637 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-12 00:50:48,637 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:48,637 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:48,640 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-12 00:50:48,643 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-12 00:50:48,643 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-12 00:50:48,646 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-12 00:50:48,649 [ scc.git] DEBUG Already up to date.
2025-05-12 00:50:48,649 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-05-12 00:50:48,920 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-05-12 00:50:48,920 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-05-12 00:50:48,924 [ scc.git] DEBUG ## Unique users: []
2025-05-12 00:50:48,924 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:48,924 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:48,926 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-05-12 00:50:48,929 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:48,931 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-05-12 00:50:48,939 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-12 00:50:48,942 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-05-12 00:50:48,942 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-05-12 00:50:48,942 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-05-12 00:50:48,942 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-05-12 00:50:48,942 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-05-12 00:50:48,943 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:49,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:50:49,108 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-12 00:50:49,148 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:49,148 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:49,150 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-12 00:50:49,187 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-12 00:50:49,191 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5ad978f510> has no local changes
2025-05-12 00:50:49,191 [ 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#417 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/)'
2025-05-12 00:50:49,197 [ scc.git] DEBUG [detached HEAD 976099f] merge master -Dorg -Ssuccess-only
2025-05-12 00:50:49,197 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:50:49,197 [ scc.git] INFO Overriding base-branch from master to main
2025-05-12 00:50:49,197 [ scc.repo] DEBUG ## PRs found:
2025-05-12 00:50:49,359 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:49,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-05-12 00:50:49,892 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:50,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-05-12 00:50:50,383 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:50,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-05-12 00:50:50,962 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:51,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-05-12 00:50:51,499 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:51,772 [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-12 00:50:52,023 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:52,257 [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-12 00:50:52,509 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:52,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-05-12 00:50:53,019 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:53,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-05-12 00:50:53,524 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:53,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-05-12 00:50:53,978 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:54,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-12 00:50:54,498 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:54,706 [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-12 00:50:54,957 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:55,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-12 00:50:55,473 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:55,659 [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-12 00:50:55,659 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-12 00:50:55,659 [ scc.repo] DEBUG ## Branches found:
2025-05-12 00:50:55,659 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-12 00:50:55,660 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:55,660 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:55,662 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-05-12 00:50:55,665 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-12 00:50:55,665 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-05-12 00:50:55,668 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-05-12 00:50:55,671 [ scc.git] DEBUG Already up to date.
2025-05-12 00:50:55,671 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-05-12 00:50:55,962 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-05-12 00:50:55,962 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-05-12 00:50:55,966 [ scc.git] DEBUG ## Unique users: []
2025-05-12 00:50:55,966 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:55,966 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:55,968 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-12 00:50:55,971 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:55,974 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-12 00:50:55,981 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-05-12 00:50:55,981 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-05-12 00:50:55,981 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-12 00:50:55,982 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-12 00:50:55,984 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-12 00:50:55,988 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-05-12 00:50:55,990 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:56,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:50:56,160 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-12 00:50:56,163 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-12 00:50:56,166 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#417](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-05-12 00:50:56,169 [ scc.config] DEBUG Found github.token
2025-05-12 00:50:56,169 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-05-12 00:50:56,169 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-12 00:50:56,209 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:56,209 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:56,211 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-12 00:50:56,248 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-12 00:50:56,252 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5ad978ee50> has no local changes
2025-05-12 00:50:56,252 [ 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#417 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/)'
2025-05-12 00:50:56,258 [ scc.git] DEBUG [detached HEAD 8b6c95c] merge master -Dorg -Ssuccess-only
2025-05-12 00:50:56,258 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:50:56,259 [ scc.repo] DEBUG ## PRs found:
2025-05-12 00:50:56,411 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:56,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-05-12 00:50:56,623 [ scc.repo] DEBUG ## Branches found:
2025-05-12 00:50:56,624 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-12 00:50:56,624 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:56,624 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:56,626 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-12 00:50:56,628 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-12 00:50:56,628 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-12 00:50:56,631 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-12 00:50:56,634 [ scc.git] DEBUG Already up to date.
2025-05-12 00:50:56,634 [ scc.git] DEBUG ## Unique users: []
2025-05-12 00:50:56,634 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:56,634 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:56,636 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-12 00:50:56,674 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:56,674 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:56,676 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-12 00:50:56,714 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-12 00:50:56,717 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5add393e10> has no local changes
2025-05-12 00:50:56,717 [ 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#417 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/)'
2025-05-12 00:50:56,724 [ scc.git] DEBUG [detached HEAD 5d36382] merge master -Dorg -Ssuccess-only
2025-05-12 00:50:56,724 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:50:56,724 [ scc.repo] DEBUG ## PRs found:
2025-05-12 00:50:56,875 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:57,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-05-12 00:50:57,070 [ scc.repo] DEBUG ## Branches found:
2025-05-12 00:50:57,071 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-12 00:50:57,071 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:57,071 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:57,073 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-12 00:50:57,075 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-12 00:50:57,075 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-12 00:50:57,078 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-12 00:50:57,081 [ scc.git] DEBUG Already up to date.
2025-05-12 00:50:57,081 [ scc.git] DEBUG ## Unique users: []
2025-05-12 00:50:57,081 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:57,081 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:57,084 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-12 00:50:57,123 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:50:57,123 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:50:57,125 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-12 00:50:57,162 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-12 00:50:57,166 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5ad97eb150> has no local changes
2025-05-12 00:50:57,166 [ 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#417 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/)'
2025-05-12 00:50:57,172 [ scc.git] DEBUG [detached HEAD 6ec4431] merge master -Dorg -Ssuccess-only
2025-05-12 00:50:57,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:50:57,173 [ scc.repo] DEBUG ## PRs found:
2025-05-12 00:50:57,322 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:57,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-05-12 00:50:57,852 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:58,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-05-12 00:50:58,324 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:58,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-05-12 00:50:58,789 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:59,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-12 00:50:59,330 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:50:59,544 [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-12 00:50:59,796 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:00,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-12 00:51:00,357 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:00,558 [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-12 00:51:00,559 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-05-12 00:51:00,559 [ scc.repo] DEBUG ## Branches found:
2025-05-12 00:51:00,559 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-12 00:51:00,559 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:51:00,559 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:51:00,562 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-12 00:51:00,564 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-12 00:51:00,564 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-12 00:51:00,567 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-12 00:51:00,570 [ scc.git] DEBUG Already up to date.
2025-05-12 00:51:00,570 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-05-12 00:51:00,858 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-05-12 00:51:00,858 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-05-12 00:51:00,863 [ scc.git] DEBUG ## Unique users: []
2025-05-12 00:51:00,863 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:51:00,863 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:51:00,865 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-12 00:51:00,868 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:51:00,870 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-12 00:51:00,879 [ scc.git] DEBUG Auto-merging Dockerfile
2025-05-12 00:51:00,879 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-05-12 00:51:00,879 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-12 00:51:00,880 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-12 00:51:00,882 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-12 00:51:00,887 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-05-12 00:51:00,888 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:01,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:01,046 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-12 00:51:01,048 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-12 00:51:01,051 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#417](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-05-12 00:51:01,053 [ scc.config] DEBUG Found github.token
2025-05-12 00:51:01,053 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-05-12 00:51:01,053 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-12 00:51:01,091 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:51:01,091 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:51:01,094 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-12 00:51:01,130 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-12 00:51:01,134 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5adb941790> has no local changes
2025-05-12 00:51:01,134 [ 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#417 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/)'
2025-05-12 00:51:01,141 [ scc.git] DEBUG [detached HEAD 6b95085] merge master -Dorg -Ssuccess-only
2025-05-12 00:51:01,141 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:51:01,141 [ scc.git] INFO Overriding base-branch from master to develop
2025-05-12 00:51:01,141 [ scc.repo] DEBUG ## PRs found:
2025-05-12 00:51:01,297 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:01,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-05-12 00:51:01,830 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:02,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-05-12 00:51:02,312 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:02,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-05-12 00:51:02,765 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:02,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-12 00:51:03,215 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:03,471 [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-12 00:51:03,723 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:03,973 [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-12 00:51:04,225 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:04,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-12 00:51:04,669 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:04,862 [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-12 00:51:04,863 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-12 00:51:05,114 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:05,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-05-12 00:51:05,573 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:05,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-05-12 00:51:06,030 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:06,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-12 00:51:06,470 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:06,691 [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-12 00:51:06,942 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:07,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-12 00:51:07,473 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:07,660 [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-12 00:51:07,660 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-12 00:51:07,911 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:08,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-05-12 00:51:08,393 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:08,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-05-12 00:51:08,934 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:09,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-05-12 00:51:09,462 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:09,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-05-12 00:51:09,746 [ scc.repo] DEBUG ## Branches found:
2025-05-12 00:51:09,747 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-12 00:51:09,747 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:51:09,747 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:51:09,749 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-05-12 00:51:09,752 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-12 00:51:09,752 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-05-12 00:51:09,755 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-05-12 00:51:09,763 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-05-12 00:51:09,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:10,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-05-12 00:51:10,420 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-05-12 00:51:10,753 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-12 00:51:10,753 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-05-12 00:51:10,757 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-05-12 00:51:11,105 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-12 00:51:11,105 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-05-12 00:51:11,110 [ scc.git] DEBUG ## Unique users: []
2025-05-12 00:51:11,110 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:51:11,110 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:51:11,113 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-12 00:51:11,118 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:51:11,121 [ 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-12 00:51:11,132 [ 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-12 00:51:11,132 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-12 00:51:11,132 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-12 00:51:11,135 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-12 00:51:11,139 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-05-12 00:51:11,140 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:11,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:11,307 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-12 00:51:11,312 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-12 00:51:11,316 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#417](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-05-12 00:51:11,318 [ scc.config] DEBUG Found github.token
2025-05-12 00:51:11,318 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-05-12 00:51:11,318 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-05-12 00:51:11,323 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:51:11,325 [ 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-12 00:51:11,335 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-12 00:51:11,338 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-05-12 00:51:11,338 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-05-12 00:51:11,558 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:11,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:11,735 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-12 00:51:11,773 [ scc.git] DEBUG Get sha1 of %s
2025-05-12 00:51:11,773 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-12 00:51:11,776 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-12 00:51:11,814 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-12 00:51:11,817 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5adb9196d0> has no local changes
2025-05-12 00:51:11,817 [ 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#417 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/)'
2025-05-12 00:51:11,824 [ scc.git] DEBUG [detached HEAD 15f349a] merge master -Dorg -Ssuccess-only
2025-05-12 00:51:11,824 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:51:11,825 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-12 00:51:11,902 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-05-12 00:51:11,986 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:12,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:12,155 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-05-12 00:51:12,157 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-05-12 00:51:12,401 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:12,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:12,559 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-05-12 00:51:12,561 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-05-12 00:51:12,805 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:12,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:12,970 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-05-12 00:51:12,972 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-05-12 00:51:13,217 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:13,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:13,381 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-05-12 00:51:13,626 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:13,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:13,810 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-05-12 00:51:13,812 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-05-12 00:51:14,056 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:14,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:14,226 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-05-12 00:51:14,228 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-05-12 00:51:14,473 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:14,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:14,634 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-05-12 00:51:14,636 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-05-12 00:51:14,881 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:15,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:15,057 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-05-12 00:51:15,059 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-05-12 00:51:15,304 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:15,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:15,475 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-05-12 00:51:15,477 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-05-12 00:51:15,721 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:15,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:15,910 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-05-12 00:51:15,912 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-05-12 00:51:16,156 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:16,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:16,326 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-05-12 00:51:16,328 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-05-12 00:51:16,573 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:16,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:16,748 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-05-12 00:51:16,750 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-05-12 00:51:16,994 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:17,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:17,158 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-05-12 00:51:17,403 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:17,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:17,596 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-05-12 00:51:17,841 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:17,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:18,000 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-05-12 00:51:18,002 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-05-12 00:51:18,246 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:18,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:18,531 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-05-12 00:51:18,776 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:18,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:18,952 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-05-12 00:51:19,196 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:19,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:19,356 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-05-12 00:51:19,359 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-05-12 00:51:19,602 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:19,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:19,769 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-05-12 00:51:19,771 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-05-12 00:51:20,016 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:20,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:20,701 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-05-12 00:51:20,703 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-05-12 00:51:20,948 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:21,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:21,123 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-05-12 00:51:21,125 [ scc.config] DEBUG Found submodule.scripts.url
2025-05-12 00:51:21,370 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-12 00:51:21,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-12 00:51:21,544 [ scc.config] DEBUG Found submodule.scripts.branch
2025-05-12 00:51:21,544 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-12 00:51:21,635 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f5adc1bcd90> has local changes
2025-05-12 00:51:21,635 [ 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#417 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/417/)'
2025-05-12 00:51:21,649 [ scc.git] DEBUG [detached HEAD c4e22f4] merge master -Dorg -Ssuccess-only
2025-05-12 00:51:21,649 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-05-12 00:51:21,649 [ scc.merge] INFO Repository: ome/omero-plugins
2025-05-12 00:51:21,649 [ scc.merge] INFO Already up to date.
2025-05-12 00:51:21,649 [ scc.merge] INFO
2025-05-12 00:51:21,649 [ scc.merge] INFO Merged PRs:
2025-05-12 00:51:21,649 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-05-12 00:51:21,649 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-05-12 00:51:21,649 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-05-12 00:51:21,649 [ scc.merge] INFO
2025-05-12 00:51:21,649 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-05-12 00:51:21,649 [ scc.merge] INFO Already up to date.
2025-05-12 00:51:21,649 [ scc.merge] INFO
2025-05-12 00:51:21,649 [ scc.merge] INFO
2025-05-12 00:51:21,649 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-05-12 00:51:21,649 [ scc.merge] INFO Excluded PRs:
2025-05-12 00:51:21,649 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-05-12 00:51:21,649 [ scc.merge] INFO Already up to date.
2025-05-12 00:51:21,649 [ scc.merge] INFO
2025-05-12 00:51:21,649 [ scc.merge] INFO
2025-05-12 00:51:21,649 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-05-12 00:51:21,649 [ scc.merge] INFO Excluded PRs:
2025-05-12 00:51:21,649 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-05-12 00:51:21,649 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-05-12 00:51:21,649 [ scc.merge] INFO Already up to date.
2025-05-12 00:51:21,649 [ scc.merge] INFO
2025-05-12 00:51:21,650 [ scc.merge] INFO Merged PRs:
2025-05-12 00:51:21,650 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-05-12 00:51:21,650 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-05-12 00:51:21,650 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-05-12 00:51:21,650 [ scc.merge] INFO
2025-05-12 00:51:21,650 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-05-12 00:51:21,650 [ scc.merge] INFO Excluded PRs:
2025-05-12 00:51:21,650 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-05-12 00:51:21,650 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-05-12 00:51:21,650 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-05-12 00:51:21,650 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-12 00:51:21,650 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-05-12 00:51:21,650 [ scc.merge] INFO Updating 11d3587..5b2ca82
2025-05-12 00:51:21,650 [ scc.merge] INFO Previously merged:
2025-05-12 00:51:21,650 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-05-12 00:51:21,650 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-12 00:51:21,650 [ scc.merge] INFO
2025-05-12 00:51:21,650 [ scc.merge] INFO Merged PRs:
2025-05-12 00:51:21,650 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-05-12 00:51:21,650 [ scc.merge] INFO
2025-05-12 00:51:21,650 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-12 00:51:21,650 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-05-12 00:51:21,650 [ scc.merge] INFO
2025-05-12 00:51:21,650 [ scc.merge] INFO Repository: ome/omero-figure
2025-05-12 00:51:21,650 [ scc.merge] INFO Excluded PRs:
2025-05-12 00:51:21,650 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-05-12 00:51:21,650 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-05-12 00:51:21,650 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-05-12 00:51:21,650 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-05-12 00:51:21,650 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-05-12 00:51:21,650 [ scc.merge] INFO Previously merged:
2025-05-12 00:51:21,650 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-05-12 00:51:21,650 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-05-12 00:51:21,650 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-05-12 00:51:21,650 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-12 00:51:21,650 [ scc.merge] INFO
2025-05-12 00:51:21,650 [ scc.merge] INFO Merged PRs:
2025-05-12 00:51:21,650 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-05-12 00:51:21,650 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-05-12 00:51:21,650 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-05-12 00:51:21,651 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-05-12 00:51:21,651 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-05-12 00:51:21,651 [ scc.merge] INFO
2025-05-12 00:51:21,651 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-12 00:51:21,651 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-05-12 00:51:21,651 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-05-12 00:51:21,651 [ scc.merge] INFO
2025-05-12 00:51:21,651 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-05-12 00:51:21,651 [ scc.merge] INFO Already up to date.
2025-05-12 00:51:21,651 [ scc.merge] INFO
2025-05-12 00:51:21,651 [ scc.merge] INFO Merged PRs:
2025-05-12 00:51:21,651 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-05-12 00:51:21,651 [ scc.merge] INFO
2025-05-12 00:51:21,651 [ scc.merge] INFO Repository: ome/omero-gallery
2025-05-12 00:51:21,651 [ scc.merge] INFO Already up to date.
2025-05-12 00:51:21,651 [ scc.merge] INFO
2025-05-12 00:51:21,651 [ scc.merge] INFO Merged PRs:
2025-05-12 00:51:21,651 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-05-12 00:51:21,651 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-05-12 00:51:21,651 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-05-12 00:51:21,651 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-05-12 00:51:21,651 [ scc.merge] INFO
2025-05-12 00:51:21,651 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-12 00:51:21,651 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-05-12 00:51:21,651 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-05-12 00:51:21,651 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-05-12 00:51:21,651 [ scc.merge] INFO
2025-05-12 00:51:21,651 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-05-12 00:51:21,651 [ scc.merge] INFO Excluded PRs:
2025-05-12 00:51:21,651 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-05-12 00:51:21,651 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-05-12 00:51:21,651 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-05-12 00:51:21,651 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-05-12 00:51:21,651 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-05-12 00:51:21,651 [ scc.merge] INFO Already up to date.
2025-05-12 00:51:21,651 [ scc.merge] INFO
2025-05-12 00:51:21,651 [ scc.merge] INFO Merged PRs:
2025-05-12 00:51:21,651 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-05-12 00:51:21,651 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-05-12 00:51:21,651 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-05-12 00:51:21,652 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-05-12 00:51:21,652 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-12 00:51:21,652 [ scc.merge] INFO
2025-05-12 00:51:21,652 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-12 00:51:21,652 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-05-12 00:51:21,652 [ scc.merge] INFO
2025-05-12 00:51:21,652 [ scc.merge] INFO Repository: ome/omero-mapr
2025-05-12 00:51:21,652 [ scc.merge] INFO Excluded PRs:
2025-05-12 00:51:21,652 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-05-12 00:51:21,652 [ scc.merge] INFO Already up to date.
2025-05-12 00:51:21,652 [ scc.merge] INFO
2025-05-12 00:51:21,652 [ scc.merge] INFO Merged PRs:
2025-05-12 00:51:21,652 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-05-12 00:51:21,652 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-12 00:51:21,652 [ scc.merge] INFO
2025-05-12 00:51:21,652 [ scc.merge] INFO Repository: ome/omero-metadata
2025-05-12 00:51:21,652 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-05-12 00:51:21,652 [ scc.merge] INFO Previously merged:
2025-05-12 00:51:21,652 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-12 00:51:21,652 [ scc.merge] INFO
2025-05-12 00:51:21,652 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-12 00:51:21,652 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-12 00:51:21,652 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-12 00:51:21,652 [ scc.merge] INFO
2025-05-12 00:51:21,652 [ scc.merge] INFO Repository: ome/omero-parade
2025-05-12 00:51:21,652 [ scc.merge] INFO Excluded PRs:
2025-05-12 00:51:21,652 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-05-12 00:51:21,652 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-05-12 00:51:21,652 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-05-12 00:51:21,652 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-05-12 00:51:21,652 [ scc.merge] INFO Already up to date.
2025-05-12 00:51:21,652 [ scc.merge] INFO
2025-05-12 00:51:21,652 [ scc.merge] INFO Merged PRs:
2025-05-12 00:51:21,652 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-12 00:51:21,652 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-12 00:51:21,652 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-12 00:51:21,652 [ scc.merge] INFO
2025-05-12 00:51:21,652 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-05-12 00:51:21,652 [ scc.merge] INFO Already up to date.
2025-05-12 00:51:21,652 [ scc.merge] INFO
2025-05-12 00:51:21,653 [ scc.merge] INFO
2025-05-12 00:51:21,653 [ scc.merge] INFO Repository: ome/omero-rois
2025-05-12 00:51:21,653 [ scc.merge] INFO Excluded PRs:
2025-05-12 00:51:21,653 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-05-12 00:51:21,653 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-12 00:51:21,653 [ scc.merge] INFO Already up to date.
2025-05-12 00:51:21,653 [ scc.merge] INFO
2025-05-12 00:51:21,653 [ scc.merge] INFO
2025-05-12 00:51:21,653 [ scc.merge] INFO Repository: ome/omero-signup
2025-05-12 00:51:21,653 [ scc.merge] INFO Already up to date.
2025-05-12 00:51:21,653 [ scc.merge] INFO
2025-05-12 00:51:21,653 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-12 00:51:21,653 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-12 00:51:21,653 [ scc.merge] INFO
2025-05-12 00:51:21,653 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-05-12 00:51:21,653 [ scc.merge] INFO Excluded PRs:
2025-05-12 00:51:21,653 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-05-12 00:51:21,653 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-05-12 00:51:21,653 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-05-12 00:51:21,653 [ scc.merge] INFO Already up to date.
2025-05-12 00:51:21,653 [ scc.merge] INFO
2025-05-12 00:51:21,653 [ scc.merge] INFO Merged PRs:
2025-05-12 00:51:21,653 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-12 00:51:21,653 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-05-12 00:51:21,653 [ scc.merge] INFO
2025-05-12 00:51:21,653 [ scc.merge] INFO Repository: ome/omero-upload
2025-05-12 00:51:21,653 [ scc.merge] INFO Already up to date.
2025-05-12 00:51:21,653 [ scc.merge] INFO
2025-05-12 00:51:21,653 [ scc.merge] INFO
2025-05-12 00:51:21,653 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-05-12 00:51:21,653 [ scc.merge] INFO Already up to date.
2025-05-12 00:51:21,653 [ scc.merge] INFO
2025-05-12 00:51:21,653 [ scc.merge] INFO Merged PRs:
2025-05-12 00:51:21,653 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-05-12 00:51:21,653 [ scc.merge] INFO
2025-05-12 00:51:21,653 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-05-12 00:51:21,653 [ scc.merge] INFO Excluded PRs:
2025-05-12 00:51:21,653 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-05-12 00:51:21,653 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-05-12 00:51:21,653 [ scc.merge] INFO Already up to date.
2025-05-12 00:51:21,654 [ scc.merge] INFO
2025-05-12 00:51:21,654 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-12 00:51:21,654 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-12 00:51:21,654 [ scc.merge] INFO
2025-05-12 00:51:21,654 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-05-12 00:51:21,654 [ scc.merge] INFO Already up to date.
2025-05-12 00:51:21,654 [ scc.merge] INFO
2025-05-12 00:51:21,654 [ scc.merge] INFO
2025-05-12 00:51:21,654 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-05-12 00:51:21,654 [ scc.merge] INFO Already up to date.
2025-05-12 00:51:21,654 [ scc.merge] INFO
2025-05-12 00:51:21,654 [ scc.merge] INFO
2025-05-12 00:51:21,654 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-05-12 00:51:21,654 [ scc.merge] INFO Already up to date.
2025-05-12 00:51:21,654 [ scc.merge] INFO
2025-05-12 00:51:21,654 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-12 00:51:21,654 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-05-12 00:51:21,654 [ scc.merge] INFO
2025-05-12 00:51:21,654 [ scc.merge] INFO Repository: ome/scripts
2025-05-12 00:51:21,654 [ scc.merge] INFO Excluded PRs:
2025-05-12 00:51:21,654 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-05-12 00:51:21,654 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-05-12 00:51:21,654 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-05-12 00:51:21,654 [ scc.merge] INFO Previously merged:
2025-05-12 00:51:21,654 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-05-12 00:51:21,654 [ scc.merge] INFO
2025-05-12 00:51:21,654 [ scc.merge] INFO Merged PRs:
2025-05-12 00:51:21,654 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-12 00:51:21,654 [ scc.merge] INFO
2025-05-12 00:51:21,654 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-12 00:51:21,654 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-12 00:51:21,654 [ scc.merge] INFO
2025-05-12 00:51:21,654 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-05-12 00:51:21,654 [ scc.git] DEBUG Calling 'git remote'
2025-05-12 00:51:21,657 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-05-12 00:51:21,657 [ scc.git] DEBUG Calling 'git remote'
2025-05-12 00:51:21,659 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:51:21,659 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-05-12 00:51:21,659 [ scc.git] DEBUG Calling 'git remote'
2025-05-12 00:51:21,661 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:51:21,661 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-05-12 00:51:21,661 [ scc.git] DEBUG Calling 'git remote'
2025-05-12 00:51:21,663 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:51:21,663 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-05-12 00:51:21,663 [ scc.git] DEBUG Calling 'git remote'
2025-05-12 00:51:21,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:51:21,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-05-12 00:51:21,666 [ scc.git] DEBUG Calling 'git remote'
2025-05-12 00:51:21,668 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:51:21,668 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-05-12 00:51:21,668 [ scc.git] DEBUG Calling 'git remote'
2025-05-12 00:51:21,670 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:51:21,670 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-05-12 00:51:21,670 [ scc.git] DEBUG Calling 'git remote'
2025-05-12 00:51:21,672 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:51:21,673 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-05-12 00:51:21,673 [ scc.git] DEBUG Calling 'git remote'
2025-05-12 00:51:21,675 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:51:21,675 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-12 00:51:21,675 [ scc.git] DEBUG Calling 'git remote'
2025-05-12 00:51:21,677 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:51:21,677 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-12 00:51:21,677 [ scc.git] DEBUG Calling 'git remote'
2025-05-12 00:51:21,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:51:21,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-12 00:51:21,679 [ scc.git] DEBUG Calling 'git remote'
2025-05-12 00:51:21,681 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:51:21,681 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-12 00:51:21,681 [ scc.git] DEBUG Calling 'git remote'
2025-05-12 00:51:21,684 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:51:21,684 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-12 00:51:21,684 [ scc.git] DEBUG Calling 'git remote'
2025-05-12 00:51:21,686 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:51:21,686 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-12 00:51:21,686 [ scc.git] DEBUG Calling 'git remote'
2025-05-12 00:51:21,688 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:51:21,688 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-12 00:51:21,688 [ scc.git] DEBUG Calling 'git remote'
2025-05-12 00:51:21,690 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:51:21,690 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-12 00:51:21,690 [ scc.git] DEBUG Calling 'git remote'
2025-05-12 00:51:21,692 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:51:21,692 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-12 00:51:21,692 [ scc.git] DEBUG Calling 'git remote'
2025-05-12 00:51:21,694 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:51:21,695 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-12 00:51:21,695 [ scc.git] DEBUG Calling 'git remote'
2025-05-12 00:51:21,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:51:21,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-12 00:51:21,697 [ scc.git] DEBUG Calling 'git remote'
2025-05-12 00:51:21,699 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:51:21,699 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-12 00:51:21,699 [ scc.git] DEBUG Calling 'git remote'
2025-05-12 00:51:21,701 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:51:21,701 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-12 00:51:21,701 [ scc.git] DEBUG Calling 'git remote'
2025-05-12 00:51:21,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-12 00:51:21,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-12 00:51:21,703 [ scc.git] DEBUG Calling 'git remote'
2025-05-12 00:51:21,705 [ 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 ba6d5d4] 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 70f7697] 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-12 00:52:09,244 [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-12 00:52:18,674 [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-12 00:52:21,187 [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-12 00:52:26,164 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-05-12 00:53:11,257 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/0cb5541d/images/svgs/logo.svg){kind=logo}
