Console Output
Skipping 208 KB..
Full Log705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-05-08 13:27:32,762 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:27:32,764 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 506 (Use the release/v1 branch for the PyPA action publishing to PyPI) 7705b58a7a2049651eb10142e2260cf73dcc29fe'
2025-05-08 13:27:32,788 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-08 13:27:32,790 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-08 13:27:32,790 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-08 13:27:32,998 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:33,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:27:33,161 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-08 13:27:33,200 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:27:33,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:27:33,202 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-08 13:27:33,240 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-08 13:27:33,248 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff62c01490> has no local changes
2025-05-08 13:27:33,248 [ 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#411 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/)'
2025-05-08 13:27:33,254 [ scc.git] DEBUG [detached HEAD 3d51d07] merge master -Dorg -Ssuccess-only
2025-05-08 13:27:33,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:27:33,255 [ scc.repo] DEBUG ## PRs found:
2025-05-08 13:27:33,412 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:33,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-05-08 13:27:33,952 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:34,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-05-08 13:27:34,455 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:34,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-08 13:27:34,982 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:35,252 [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-08 13:27:35,504 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:35,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-08 13:27:36,022 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:36,203 [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-08 13:27:36,204 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-08 13:27:36,455 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:36,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-05-08 13:27:36,941 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:37,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-05-08 13:27:37,531 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:37,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-08 13:27:38,075 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:38,305 [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-08 13:27:38,557 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:38,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-08 13:27:39,049 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:39,243 [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-08 13:27:39,243 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-05-08 13:27:39,243 [ scc.repo] DEBUG ## Branches found:
2025-05-08 13:27:39,243 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-08 13:27:39,244 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:27:39,244 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:27:39,246 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-08 13:27:39,249 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-08 13:27:39,249 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-08 13:27:39,252 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-08 13:27:39,255 [ scc.git] DEBUG Already up to date.
2025-05-08 13:27:39,255 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-05-08 13:27:39,561 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-08 13:27:39,561 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-05-08 13:27:39,565 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-05-08 13:27:39,872 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-08 13:27:39,872 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-05-08 13:27:39,876 [ scc.git] DEBUG ## Unique users: []
2025-05-08 13:27:39,877 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:27:39,877 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:27:39,879 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-08 13:27:39,883 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:27:39,885 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-08 13:27:39,960 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-08 13:27:39,964 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-05-08 13:27:39,964 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-05-08 13:27:39,964 [ scc.git] DEBUG requirements.txt | 2 +-
2025-05-08 13:27:39,964 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-05-08 13:27:39,964 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-05-08 13:27:39,964 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-05-08 13:27:39,965 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:40,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:27:40,158 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-05-08 13:27:40,163 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:27:40,165 [ 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-08 13:27:40,174 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-08 13:27:40,177 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-08 13:27:40,177 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-08 13:27:40,409 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:40,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:27:40,596 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-08 13:27:40,634 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:27:40,634 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:27:40,636 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-08 13:27:40,673 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-08 13:27:40,676 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff62be9350> has no local changes
2025-05-08 13:27:40,677 [ 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#411 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/)'
2025-05-08 13:27:40,683 [ scc.git] DEBUG [detached HEAD 0fea4ab] merge master -Dorg -Ssuccess-only
2025-05-08 13:27:40,683 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:27:40,684 [ scc.repo] DEBUG ## PRs found:
2025-05-08 13:27:40,847 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:41,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-05-08 13:27:41,406 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:41,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-05-08 13:27:41,890 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:42,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-05-08 13:27:42,447 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:42,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-08 13:27:42,990 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:43,231 [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-08 13:27:43,482 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:43,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-08 13:27:44,011 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:44,205 [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-08 13:27:44,205 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-08 13:27:44,456 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:44,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-05-08 13:27:44,949 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:45,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-05-08 13:27:45,438 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:45,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-08 13:27:45,999 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:46,243 [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-08 13:27:46,495 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:46,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-08 13:27:47,011 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:47,202 [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-08 13:27:47,202 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-08 13:27:47,202 [ scc.repo] DEBUG ## Branches found:
2025-05-08 13:27:47,202 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-08 13:27:47,203 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:27:47,203 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:27:47,205 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-08 13:27:47,208 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-08 13:27:47,208 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-08 13:27:47,211 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-08 13:27:47,218 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-05-08 13:27:47,453 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:47,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-05-08 13:27:47,924 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-05-08 13:27:48,393 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-08 13:27:48,393 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-05-08 13:27:48,397 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-05-08 13:27:49,022 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-08 13:27:49,022 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-05-08 13:27:49,026 [ scc.git] DEBUG ## Unique users: []
2025-05-08 13:27:49,026 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:27:49,026 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:27:49,029 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-08 13:27:49,033 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:27:49,035 [ 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-08 13:27:49,109 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-05-08 13:27:49,109 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-05-08 13:27:49,109 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-08 13:27:49,109 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-08 13:27:49,109 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-08 13:27:49,109 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-08 13:27:49,112 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-08 13:27:49,117 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-08 13:27:49,118 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:49,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:27:49,285 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-08 13:27:49,290 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-08 13:27:49,293 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#411](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-05-08 13:27:49,295 [ scc.config] DEBUG Found github.token
2025-05-08 13:27:49,295 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-05-08 13:27:49,295 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-08 13:27:49,300 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:27:49,302 [ 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-08 13:27:49,398 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-08 13:27:49,398 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-08 13:27:49,398 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-05-08 13:27:49,398 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-08 13:27:49,399 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-08 13:27:49,402 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-08 13:27:49,407 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-08 13:27:49,536 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:49,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:27:49,698 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-08 13:27:49,703 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-08 13:27:49,706 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#411](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/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-08 13:27:49,708 [ scc.config] DEBUG Found github.token
2025-05-08 13:27:49,708 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-05-08 13:27:49,708 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-08 13:27:49,745 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:27:49,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:27:49,747 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-08 13:27:49,783 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-08 13:27:49,788 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff63b63490> has no local changes
2025-05-08 13:27:49,788 [ 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#411 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/)'
2025-05-08 13:27:49,795 [ scc.git] DEBUG [detached HEAD 46c8bd9] merge master -Dorg -Ssuccess-only
2025-05-08 13:27:49,795 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:27:49,796 [ scc.repo] DEBUG ## PRs found:
2025-05-08 13:27:49,949 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:50,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-05-08 13:27:50,545 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:50,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-05-08 13:27:51,041 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:51,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-08 13:27:51,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:51,871 [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-08 13:27:52,123 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:52,368 [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-08 13:27:52,620 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:52,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-08 13:27:53,142 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:53,324 [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-08 13:27:53,324 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-08 13:27:53,575 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:53,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-05-08 13:27:53,826 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-08 13:27:54,076 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:54,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-08 13:27:54,660 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:54,941 [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-08 13:27:55,193 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:55,449 [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-08 13:27:55,700 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:55,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-08 13:27:56,181 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:56,367 [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-08 13:27:56,368 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-08 13:27:56,619 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:56,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-05-08 13:27:56,865 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-08 13:27:57,116 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:57,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-08 13:27:57,663 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:57,963 [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-08 13:27:58,215 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:58,492 [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-08 13:27:58,743 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:59,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-08 13:27:59,290 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:59,479 [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-08 13:27:59,479 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-08 13:27:59,730 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:27:59,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-05-08 13:28:00,216 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:00,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-05-08 13:28:00,727 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:00,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-05-08 13:28:01,225 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:01,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-05-08 13:28:01,747 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:02,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-05-08 13:28:02,300 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:02,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-05-08 13:28:02,786 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:03,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-05-08 13:28:03,159 [ scc.repo] DEBUG ## Branches found:
2025-05-08 13:28:03,159 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-08 13:28:03,159 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:03,159 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:03,161 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-08 13:28:03,164 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-08 13:28:03,164 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-08 13:28:03,167 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-08 13:28:03,170 [ scc.git] DEBUG Already up to date.
2025-05-08 13:28:03,170 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-05-08 13:28:03,494 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-08 13:28:03,494 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-05-08 13:28:03,498 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-05-08 13:28:03,773 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-08 13:28:03,773 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-05-08 13:28:03,777 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-05-08 13:28:04,055 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-08 13:28:04,055 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-05-08 13:28:04,060 [ scc.git] DEBUG ## Unique users: []
2025-05-08 13:28:04,060 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:04,060 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:04,062 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-05-08 13:28:04,117 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:04,119 [ 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-08 13:28:04,152 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-08 13:28:04,156 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-05-08 13:28:04,156 [ scc.git] DEBUG package.json | 2 +-
2025-05-08 13:28:04,156 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-05-08 13:28:04,157 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:04,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:04,331 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-05-08 13:28:04,388 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:04,390 [ 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-08 13:28:04,584 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-08 13:28:04,585 [ scc.git] DEBUG Auto-merging package.json
2025-05-08 13:28:04,586 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-08 13:28:04,589 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-05-08 13:28:04,589 [ scc.git] DEBUG package.json | 2 +-
2025-05-08 13:28:04,589 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-05-08 13:28:04,590 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:04,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:04,750 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-05-08 13:28:04,753 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:04,755 [ 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-08 13:28:04,777 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-08 13:28:04,779 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-08 13:28:04,780 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-08 13:28:05,001 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:05,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:05,166 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-08 13:28:05,206 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:05,206 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:05,209 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-08 13:28:05,246 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-08 13:28:05,250 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff62b19090> has no local changes
2025-05-08 13:28:05,250 [ 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#411 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/)'
2025-05-08 13:28:05,257 [ scc.git] DEBUG [detached HEAD 11858c2] merge master -Dorg -Ssuccess-only
2025-05-08 13:28:05,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:28:05,257 [ scc.repo] DEBUG ## PRs found:
2025-05-08 13:28:05,417 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:05,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-05-08 13:28:05,641 [ scc.repo] DEBUG ## Branches found:
2025-05-08 13:28:05,641 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-08 13:28:05,641 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:05,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:05,643 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-08 13:28:05,645 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-08 13:28:05,645 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-08 13:28:05,648 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-08 13:28:05,651 [ scc.git] DEBUG Already up to date.
2025-05-08 13:28:05,651 [ scc.git] DEBUG ## Unique users: []
2025-05-08 13:28:05,651 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:05,651 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:05,653 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-08 13:28:05,692 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:05,692 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:05,694 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-08 13:28:05,732 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-08 13:28:05,735 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff62becb90> has no local changes
2025-05-08 13:28:05,735 [ 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#411 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/)'
2025-05-08 13:28:05,742 [ scc.git] DEBUG [detached HEAD fead05e] merge master -Dorg -Ssuccess-only
2025-05-08 13:28:05,742 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:28:05,742 [ scc.repo] DEBUG ## PRs found:
2025-05-08 13:28:05,892 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:06,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-05-08 13:28:06,442 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:06,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-05-08 13:28:06,961 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:07,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-05-08 13:28:07,475 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:07,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-05-08 13:28:07,718 [ scc.repo] DEBUG ## Branches found:
2025-05-08 13:28:07,718 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-08 13:28:07,718 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:07,718 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:07,721 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-08 13:28:07,723 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-08 13:28:07,723 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-08 13:28:07,726 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-08 13:28:07,729 [ scc.git] DEBUG Already up to date.
2025-05-08 13:28:07,729 [ scc.git] DEBUG ## Unique users: []
2025-05-08 13:28:07,730 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:07,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:07,732 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-08 13:28:07,771 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:07,771 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:07,773 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-08 13:28:07,810 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-08 13:28:07,813 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff601f8090> has no local changes
2025-05-08 13:28:07,813 [ 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#411 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/)'
2025-05-08 13:28:07,820 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:28:07,820 [ scc.git] DEBUG [detached HEAD 8caebe0] merge master -Dorg -Ssuccess-only
2025-05-08 13:28:07,820 [ scc.repo] DEBUG ## PRs found:
2025-05-08 13:28:07,969 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:08,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-05-08 13:28:08,542 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:08,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-05-08 13:28:09,033 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:09,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-05-08 13:28:09,505 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:09,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-08 13:28:10,089 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:10,326 [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-08 13:28:10,578 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:10,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-08 13:28:11,172 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:11,361 [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-08 13:28:11,362 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-08 13:28:11,362 [ scc.repo] DEBUG ## Branches found:
2025-05-08 13:28:11,362 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-08 13:28:11,362 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:11,362 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:11,364 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-08 13:28:11,367 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-08 13:28:11,367 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-08 13:28:11,370 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-08 13:28:11,373 [ scc.git] DEBUG Already up to date.
2025-05-08 13:28:11,373 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-05-08 13:28:11,782 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-05-08 13:28:11,782 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-05-08 13:28:11,786 [ scc.git] DEBUG ## Unique users: []
2025-05-08 13:28:11,786 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:11,786 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:11,789 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-08 13:28:11,792 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:11,794 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-08 13:28:11,975 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-05-08 13:28:11,975 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-05-08 13:28:11,975 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-05-08 13:28:11,975 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-05-08 13:28:11,975 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-05-08 13:28:11,975 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-05-08 13:28:11,975 [ scc.git] DEBUG Auto-merging setup.py
2025-05-08 13:28:11,975 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-05-08 13:28:11,975 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-08 13:28:11,975 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-08 13:28:11,978 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-08 13:28:11,982 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-05-08 13:28:11,983 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:12,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:12,149 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-08 13:28:12,152 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-08 13:28:12,156 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#411](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/urls.py
- omero_signup/views.py
- setup.py
--conflicts
2025-05-08 13:28:12,158 [ scc.config] DEBUG Found github.token
2025-05-08 13:28:12,158 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-05-08 13:28:12,158 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-08 13:28:12,196 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:12,196 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:12,198 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-08 13:28:12,235 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-08 13:28:12,238 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff62b5c390> has no local changes
2025-05-08 13:28:12,238 [ 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#411 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/)'
2025-05-08 13:28:12,245 [ scc.git] DEBUG [detached HEAD 0d7659f] merge master -Dorg -Ssuccess-only
2025-05-08 13:28:12,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:28:12,245 [ scc.repo] DEBUG ## PRs found:
2025-05-08 13:28:12,400 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:12,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-05-08 13:28:13,008 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:13,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-05-08 13:28:13,560 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:13,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-08 13:28:14,098 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:14,393 [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-08 13:28:14,644 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:14,945 [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-08 13:28:15,197 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:15,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-08 13:28:15,772 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:15,954 [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-08 13:28:15,954 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-05-08 13:28:16,205 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:16,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-05-08 13:28:16,751 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:16,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-05-08 13:28:17,231 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:17,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-05-08 13:28:17,813 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:18,068 [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-08 13:28:18,319 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:18,579 [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-08 13:28:18,830 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:19,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-05-08 13:28:19,337 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:19,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-05-08 13:28:19,798 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:20,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-05-08 13:28:20,384 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:20,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-05-08 13:28:20,893 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:21,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-08 13:28:21,523 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:21,750 [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-08 13:28:22,001 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:22,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-08 13:28:22,539 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:22,731 [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-08 13:28:22,731 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-08 13:28:22,731 [ scc.repo] DEBUG ## Branches found:
2025-05-08 13:28:22,732 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-08 13:28:22,732 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:22,732 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:22,734 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-08 13:28:22,737 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-08 13:28:22,737 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-08 13:28:22,740 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-08 13:28:22,743 [ scc.git] DEBUG Already up to date.
2025-05-08 13:28:22,743 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-05-08 13:28:23,118 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-08 13:28:23,118 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-05-08 13:28:23,122 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-05-08 13:28:23,445 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-08 13:28:23,445 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-05-08 13:28:23,448 [ scc.git] DEBUG ## Unique users: []
2025-05-08 13:28:23,448 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:23,449 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:23,451 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-05-08 13:28:23,455 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:23,457 [ 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-08 13:28:23,488 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-08 13:28:23,492 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-05-08 13:28:23,492 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-05-08 13:28:23,492 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-05-08 13:28:23,492 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-05-08 13:28:23,492 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-05-08 13:28:23,492 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-05-08 13:28:23,492 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-05-08 13:28:23,492 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-05-08 13:28:23,492 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-05-08 13:28:23,492 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-05-08 13:28:23,492 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-05-08 13:28:23,493 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:23,493 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-05-08 13:28:23,493 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-05-08 13:28:23,493 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-05-08 13:28:23,493 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-05-08 13:28:23,494 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-05-08 13:28:23,494 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-05-08 13:28:23,494 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-05-08 13:28:23,494 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-05-08 13:28:23,494 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-05-08 13:28:23,494 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-05-08 13:28:23,494 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-05-08 13:28:23,494 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-05-08 13:28:23,494 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-05-08 13:28:23,494 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-05-08 13:28:23,494 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-05-08 13:28:23,494 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-05-08 13:28:23,494 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-05-08 13:28:23,494 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-05-08 13:28:23,494 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-05-08 13:28:23,494 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-05-08 13:28:23,494 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-05-08 13:28:23,494 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-05-08 13:28:23,494 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-05-08 13:28:23,494 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-05-08 13:28:23,494 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-05-08 13:28:23,494 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-05-08 13:28:23,494 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-05-08 13:28:23,494 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-05-08 13:28:23,494 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-05-08 13:28:23,494 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-05-08 13:28:23,494 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-05-08 13:28:23,494 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-05-08 13:28:23,494 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-05-08 13:28:23,494 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-05-08 13:28:23,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:23,663 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-08 13:28:23,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:23,669 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-08 13:28:23,679 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-08 13:28:23,681 [ scc.git] DEBUG docker | 1 +
2025-05-08 13:28:23,681 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-05-08 13:28:23,913 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:24,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:24,075 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-08 13:28:24,114 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:24,114 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:24,116 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-08 13:28:24,156 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-08 13:28:24,160 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff62cad150> has no local changes
2025-05-08 13:28:24,160 [ 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#411 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/)'
2025-05-08 13:28:24,166 [ scc.git] DEBUG [detached HEAD b96c384] merge master -Dorg -Ssuccess-only
2025-05-08 13:28:24,167 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:28:24,167 [ scc.repo] DEBUG ## PRs found:
2025-05-08 13:28:24,326 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:24,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-05-08 13:28:24,551 [ scc.repo] DEBUG ## Branches found:
2025-05-08 13:28:24,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-08 13:28:24,551 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:24,551 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:24,553 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-08 13:28:24,556 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-08 13:28:24,556 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-08 13:28:24,559 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-08 13:28:24,561 [ scc.git] DEBUG Already up to date.
2025-05-08 13:28:24,562 [ scc.git] DEBUG ## Unique users: []
2025-05-08 13:28:24,562 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:24,562 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:24,564 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-08 13:28:24,602 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:24,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:24,604 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-08 13:28:24,641 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-08 13:28:24,645 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff6020f850> has no local changes
2025-05-08 13:28:24,645 [ 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#411 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/)'
2025-05-08 13:28:24,651 [ scc.git] DEBUG [detached HEAD 0a010d8] merge master -Dorg -Ssuccess-only
2025-05-08 13:28:24,652 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:28:24,652 [ scc.repo] DEBUG ## PRs found:
2025-05-08 13:28:24,802 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:25,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-05-08 13:28:25,339 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:25,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-05-08 13:28:25,815 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:26,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-05-08 13:28:26,291 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:26,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-08 13:28:26,834 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:27,089 [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-08 13:28:27,340 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:27,575 [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-08 13:28:27,826 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:28,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-08 13:28:28,334 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:28,549 [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-08 13:28:28,550 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-05-08 13:28:28,550 [ scc.repo] DEBUG ## Branches found:
2025-05-08 13:28:28,550 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-08 13:28:28,550 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:28,550 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:28,553 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-08 13:28:28,556 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-08 13:28:28,556 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-08 13:28:28,558 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-08 13:28:28,561 [ scc.git] DEBUG Already up to date.
2025-05-08 13:28:28,561 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-05-08 13:28:29,004 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-05-08 13:28:29,005 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-05-08 13:28:29,009 [ scc.git] DEBUG ## Unique users: []
2025-05-08 13:28:29,009 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:29,009 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:29,011 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-05-08 13:28:29,014 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:29,017 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-05-08 13:28:29,024 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-08 13:28:29,027 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-05-08 13:28:29,027 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-05-08 13:28:29,027 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-05-08 13:28:29,027 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-05-08 13:28:29,027 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-05-08 13:28:29,029 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:29,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:29,190 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-08 13:28:29,229 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:29,229 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:29,231 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-08 13:28:29,269 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-08 13:28:29,273 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff62becad0> has no local changes
2025-05-08 13:28:29,273 [ 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#411 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/)'
2025-05-08 13:28:29,280 [ scc.git] DEBUG [detached HEAD 8146058] merge master -Dorg -Ssuccess-only
2025-05-08 13:28:29,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:28:29,280 [ scc.git] INFO Overriding base-branch from master to main
2025-05-08 13:28:29,280 [ scc.repo] DEBUG ## PRs found:
2025-05-08 13:28:29,441 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:29,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-05-08 13:28:30,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:30,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-05-08 13:28:30,583 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:30,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-05-08 13:28:31,140 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:31,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-05-08 13:28:31,674 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:31,972 [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-08 13:28:32,224 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:32,521 [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-08 13:28:32,772 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:33,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-05-08 13:28:33,289 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:33,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-05-08 13:28:33,778 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:34,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-05-08 13:28:34,272 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:34,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-08 13:28:34,812 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:35,040 [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-08 13:28:35,291 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:35,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-08 13:28:35,815 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:36,007 [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-08 13:28:36,007 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-08 13:28:36,008 [ scc.repo] DEBUG ## Branches found:
2025-05-08 13:28:36,008 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-08 13:28:36,008 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:36,008 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:36,011 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-05-08 13:28:36,013 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-08 13:28:36,013 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-05-08 13:28:36,016 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-05-08 13:28:36,019 [ scc.git] DEBUG Already up to date.
2025-05-08 13:28:36,019 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-05-08 13:28:36,410 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-05-08 13:28:36,410 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-05-08 13:28:36,414 [ scc.git] DEBUG ## Unique users: []
2025-05-08 13:28:36,414 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:36,414 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:36,417 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-08 13:28:36,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:36,423 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-08 13:28:36,502 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-05-08 13:28:36,502 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-05-08 13:28:36,502 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-08 13:28:36,503 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-08 13:28:36,505 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-08 13:28:36,509 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-05-08 13:28:36,511 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:36,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:36,685 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-08 13:28:36,689 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-08 13:28:36,692 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#411](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-05-08 13:28:36,695 [ scc.config] DEBUG Found github.token
2025-05-08 13:28:36,695 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-05-08 13:28:36,695 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-08 13:28:36,734 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:36,734 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:36,737 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-08 13:28:36,774 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-08 13:28:36,778 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff62bee050> has no local changes
2025-05-08 13:28:36,778 [ 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#411 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/)'
2025-05-08 13:28:36,785 [ scc.git] DEBUG [detached HEAD 6027811] merge master -Dorg -Ssuccess-only
2025-05-08 13:28:36,785 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:28:36,785 [ scc.repo] DEBUG ## PRs found:
2025-05-08 13:28:36,936 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:37,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-05-08 13:28:37,134 [ scc.repo] DEBUG ## Branches found:
2025-05-08 13:28:37,134 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-08 13:28:37,134 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:37,134 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:37,137 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-08 13:28:37,139 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-08 13:28:37,139 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-08 13:28:37,142 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-08 13:28:37,145 [ scc.git] DEBUG Already up to date.
2025-05-08 13:28:37,145 [ scc.git] DEBUG ## Unique users: []
2025-05-08 13:28:37,145 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:37,145 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:37,147 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-08 13:28:37,187 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:37,187 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:37,189 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-08 13:28:37,228 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-08 13:28:37,232 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff62be8a90> has no local changes
2025-05-08 13:28:37,232 [ 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#411 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/)'
2025-05-08 13:28:37,238 [ scc.git] DEBUG [detached HEAD 40759a3] merge master -Dorg -Ssuccess-only
2025-05-08 13:28:37,239 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:28:37,239 [ scc.repo] DEBUG ## PRs found:
2025-05-08 13:28:37,385 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:37,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-05-08 13:28:37,571 [ scc.repo] DEBUG ## Branches found:
2025-05-08 13:28:37,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-08 13:28:37,571 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:37,571 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:37,573 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-08 13:28:37,575 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-08 13:28:37,575 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-08 13:28:37,579 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-08 13:28:37,582 [ scc.git] DEBUG Already up to date.
2025-05-08 13:28:37,582 [ scc.git] DEBUG ## Unique users: []
2025-05-08 13:28:37,582 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:37,582 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:37,584 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-08 13:28:37,622 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:37,622 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:37,624 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-08 13:28:37,662 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-08 13:28:37,665 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff602afc10> has no local changes
2025-05-08 13:28:37,665 [ 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#411 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/)'
2025-05-08 13:28:37,671 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:28:37,672 [ scc.repo] DEBUG ## PRs found:
2025-05-08 13:28:37,672 [ scc.git] DEBUG [detached HEAD ceba652] merge master -Dorg -Ssuccess-only
2025-05-08 13:28:37,822 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:38,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-05-08 13:28:38,361 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:38,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-05-08 13:28:38,856 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:39,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-05-08 13:28:39,317 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:39,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-08 13:28:39,848 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:40,056 [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-08 13:28:40,308 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:40,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-08 13:28:40,836 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:41,095 [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-08 13:28:41,095 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-05-08 13:28:41,096 [ scc.repo] DEBUG ## Branches found:
2025-05-08 13:28:41,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-08 13:28:41,096 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:41,096 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:41,098 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-08 13:28:41,101 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-08 13:28:41,101 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-08 13:28:41,103 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-08 13:28:41,106 [ scc.git] DEBUG Already up to date.
2025-05-08 13:28:41,106 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-05-08 13:28:41,404 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-05-08 13:28:41,404 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-05-08 13:28:41,408 [ scc.git] DEBUG ## Unique users: []
2025-05-08 13:28:41,408 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:41,408 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:41,411 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-08 13:28:41,414 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:41,416 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-08 13:28:41,469 [ scc.git] DEBUG Auto-merging Dockerfile
2025-05-08 13:28:41,469 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-05-08 13:28:41,470 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-08 13:28:41,470 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-08 13:28:41,473 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-08 13:28:41,478 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-05-08 13:28:41,479 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:41,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:41,652 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-08 13:28:41,655 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-08 13:28:41,657 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#411](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-05-08 13:28:41,659 [ scc.config] DEBUG Found github.token
2025-05-08 13:28:41,660 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-05-08 13:28:41,660 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-08 13:28:41,698 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:41,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:41,700 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-08 13:28:41,738 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-08 13:28:41,742 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff63b638d0> has no local changes
2025-05-08 13:28:41,742 [ 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#411 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/)'
2025-05-08 13:28:41,749 [ scc.git] DEBUG [detached HEAD 64e509d] merge master -Dorg -Ssuccess-only
2025-05-08 13:28:41,749 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:28:41,749 [ scc.git] INFO Overriding base-branch from master to develop
2025-05-08 13:28:41,749 [ scc.repo] DEBUG ## PRs found:
2025-05-08 13:28:41,902 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:42,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-05-08 13:28:42,535 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:42,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-05-08 13:28:43,008 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:43,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-05-08 13:28:43,480 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:43,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-08 13:28:43,957 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:44,203 [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-08 13:28:44,454 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:44,702 [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-08 13:28:44,953 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:45,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-08 13:28:45,447 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:45,634 [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-08 13:28:45,635 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-08 13:28:45,886 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:46,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-05-08 13:28:46,393 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:46,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-05-08 13:28:46,881 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:47,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-08 13:28:47,376 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:47,580 [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-08 13:28:47,832 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:48,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-08 13:28:48,305 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:48,495 [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-08 13:28:48,496 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-08 13:28:48,746 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:49,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-05-08 13:28:49,308 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:49,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-05-08 13:28:49,841 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:50,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-05-08 13:28:50,367 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:50,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-05-08 13:28:50,684 [ scc.repo] DEBUG ## Branches found:
2025-05-08 13:28:50,684 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-08 13:28:50,684 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:50,684 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:50,687 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-05-08 13:28:50,689 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-08 13:28:50,689 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-05-08 13:28:50,692 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-05-08 13:28:50,701 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-05-08 13:28:50,934 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:51,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-05-08 13:28:51,383 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-05-08 13:28:52,329 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-08 13:28:52,329 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-05-08 13:28:52,334 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-05-08 13:28:53,104 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-08 13:28:53,104 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-05-08 13:28:53,108 [ scc.git] DEBUG ## Unique users: []
2025-05-08 13:28:53,108 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:53,108 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:53,111 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-08 13:28:53,116 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:53,119 [ 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-08 13:28:53,164 [ 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-08 13:28:53,165 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-08 13:28:53,165 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-08 13:28:53,167 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-08 13:28:53,171 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-05-08 13:28:53,173 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:53,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:53,352 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-08 13:28:53,358 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-08 13:28:53,362 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#411](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-05-08 13:28:53,364 [ scc.config] DEBUG Found github.token
2025-05-08 13:28:53,364 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-05-08 13:28:53,364 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-05-08 13:28:53,368 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:53,370 [ 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-08 13:28:53,380 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-08 13:28:53,383 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-05-08 13:28:53,383 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-05-08 13:28:53,603 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:53,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:53,761 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-08 13:28:53,799 [ scc.git] DEBUG Get sha1 of %s
2025-05-08 13:28:53,799 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-08 13:28:53,801 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-08 13:28:53,837 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-08 13:28:53,841 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff62dd0890> has no local changes
2025-05-08 13:28:53,841 [ 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#411 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/)'
2025-05-08 13:28:53,848 [ scc.git] DEBUG [detached HEAD 554631c] merge master -Dorg -Ssuccess-only
2025-05-08 13:28:53,849 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:28:53,849 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-08 13:28:53,927 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-05-08 13:28:54,012 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:54,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:54,185 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-05-08 13:28:54,187 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-05-08 13:28:54,431 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:54,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:54,599 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-05-08 13:28:54,601 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-05-08 13:28:54,846 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:55,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:55,044 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-05-08 13:28:55,046 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-05-08 13:28:55,291 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:55,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:55,460 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-05-08 13:28:55,704 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:55,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:55,896 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-05-08 13:28:55,898 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-05-08 13:28:56,142 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:56,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:56,325 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-05-08 13:28:56,327 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-05-08 13:28:56,572 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:56,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:56,739 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-05-08 13:28:56,741 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-05-08 13:28:56,985 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:57,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:57,165 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-05-08 13:28:57,167 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-05-08 13:28:57,411 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:57,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:57,586 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-05-08 13:28:57,588 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-05-08 13:28:57,833 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:58,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:58,015 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-05-08 13:28:58,017 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-05-08 13:28:58,261 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:58,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:58,430 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-05-08 13:28:58,432 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-05-08 13:28:58,677 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:58,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:58,854 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-05-08 13:28:58,856 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-05-08 13:28:59,100 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:59,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:59,294 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-05-08 13:28:59,538 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:28:59,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:28:59,711 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-05-08 13:28:59,955 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:29:00,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:29:00,128 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-05-08 13:29:00,130 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-05-08 13:29:00,375 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:29:00,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:29:00,540 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-05-08 13:29:00,785 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:29:00,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:29:00,961 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-05-08 13:29:01,206 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:29:01,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:29:01,371 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-05-08 13:29:01,373 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-05-08 13:29:01,617 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:29:01,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:29:01,794 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-05-08 13:29:01,796 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-05-08 13:29:02,041 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:29:02,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:29:02,214 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-05-08 13:29:02,216 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-05-08 13:29:02,461 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:29:02,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:29:02,639 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-05-08 13:29:02,641 [ scc.config] DEBUG Found submodule.scripts.url
2025-05-08 13:29:02,885 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-08 13:29:03,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-08 13:29:03,053 [ scc.config] DEBUG Found submodule.scripts.branch
2025-05-08 13:29:03,053 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-08 13:29:03,143 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7eff63ca0f10> has local changes
2025-05-08 13:29:03,143 [ 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..4f0362e2
Previously merged:
- 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 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
- PR 635 dependabot[bot] 'Bump esbuild and vite'
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#411 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/411/)'
2025-05-08 13:29:03,158 [ scc.git] DEBUG [detached HEAD 6d5c859] merge master -Dorg -Ssuccess-only
2025-05-08 13:29:03,158 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-05-08 13:29:03,158 [ scc.merge] INFO Repository: ome/omero-plugins
2025-05-08 13:29:03,158 [ scc.merge] INFO Already up to date.
2025-05-08 13:29:03,158 [ scc.merge] INFO
2025-05-08 13:29:03,158 [ scc.merge] INFO Merged PRs:
2025-05-08 13:29:03,158 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-05-08 13:29:03,158 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-05-08 13:29:03,158 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-05-08 13:29:03,158 [ scc.merge] INFO
2025-05-08 13:29:03,158 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-05-08 13:29:03,158 [ scc.merge] INFO Already up to date.
2025-05-08 13:29:03,158 [ scc.merge] INFO
2025-05-08 13:29:03,158 [ scc.merge] INFO
2025-05-08 13:29:03,158 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-05-08 13:29:03,159 [ scc.merge] INFO Excluded PRs:
2025-05-08 13:29:03,159 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-05-08 13:29:03,159 [ scc.merge] INFO Already up to date.
2025-05-08 13:29:03,159 [ scc.merge] INFO
2025-05-08 13:29:03,159 [ scc.merge] INFO
2025-05-08 13:29:03,159 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-05-08 13:29:03,159 [ scc.merge] INFO Excluded PRs:
2025-05-08 13:29:03,159 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-05-08 13:29:03,159 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-05-08 13:29:03,159 [ scc.merge] INFO Already up to date.
2025-05-08 13:29:03,159 [ scc.merge] INFO
2025-05-08 13:29:03,159 [ scc.merge] INFO Merged PRs:
2025-05-08 13:29:03,159 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-05-08 13:29:03,159 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-05-08 13:29:03,159 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-05-08 13:29:03,159 [ scc.merge] INFO
2025-05-08 13:29:03,159 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-05-08 13:29:03,159 [ scc.merge] INFO Excluded PRs:
2025-05-08 13:29:03,159 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-05-08 13:29:03,159 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-05-08 13:29:03,159 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-05-08 13:29:03,159 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-08 13:29:03,159 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-05-08 13:29:03,159 [ scc.merge] INFO Updating 11d3587..5b2ca82
2025-05-08 13:29:03,159 [ scc.merge] INFO Previously merged:
2025-05-08 13:29:03,159 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-05-08 13:29:03,159 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-08 13:29:03,159 [ scc.merge] INFO
2025-05-08 13:29:03,159 [ scc.merge] INFO Merged PRs:
2025-05-08 13:29:03,159 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-05-08 13:29:03,159 [ scc.merge] INFO
2025-05-08 13:29:03,159 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-08 13:29:03,159 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-05-08 13:29:03,159 [ scc.merge] INFO
2025-05-08 13:29:03,159 [ scc.merge] INFO Repository: ome/omero-figure
2025-05-08 13:29:03,159 [ scc.merge] INFO Excluded PRs:
2025-05-08 13:29:03,159 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-05-08 13:29:03,159 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-05-08 13:29:03,159 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-05-08 13:29:03,160 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-05-08 13:29:03,160 [ scc.merge] INFO Updating 9cc36cde..4f0362e2
2025-05-08 13:29:03,160 [ scc.merge] INFO Previously merged:
2025-05-08 13:29:03,160 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-08 13:29:03,160 [ scc.merge] INFO
2025-05-08 13:29:03,160 [ scc.merge] INFO Merged PRs:
2025-05-08 13:29:03,160 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-05-08 13:29:03,160 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-05-08 13:29:03,160 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-05-08 13:29:03,160 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-05-08 13:29:03,160 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-05-08 13:29:03,160 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-05-08 13:29:03,160 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-05-08 13:29:03,160 [ scc.merge] INFO
2025-05-08 13:29:03,160 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-08 13:29:03,160 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-05-08 13:29:03,160 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-05-08 13:29:03,160 [ scc.merge] INFO
2025-05-08 13:29:03,160 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-05-08 13:29:03,160 [ scc.merge] INFO Already up to date.
2025-05-08 13:29:03,160 [ scc.merge] INFO
2025-05-08 13:29:03,160 [ scc.merge] INFO Merged PRs:
2025-05-08 13:29:03,160 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-05-08 13:29:03,160 [ scc.merge] INFO
2025-05-08 13:29:03,160 [ scc.merge] INFO Repository: ome/omero-gallery
2025-05-08 13:29:03,160 [ scc.merge] INFO Already up to date.
2025-05-08 13:29:03,160 [ scc.merge] INFO
2025-05-08 13:29:03,160 [ scc.merge] INFO Merged PRs:
2025-05-08 13:29:03,160 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-05-08 13:29:03,160 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-05-08 13:29:03,160 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-05-08 13:29:03,160 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-05-08 13:29:03,160 [ scc.merge] INFO
2025-05-08 13:29:03,160 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-08 13:29:03,160 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-05-08 13:29:03,160 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-05-08 13:29:03,160 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-05-08 13:29:03,160 [ scc.merge] INFO
2025-05-08 13:29:03,160 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-05-08 13:29:03,160 [ scc.merge] INFO Excluded PRs:
2025-05-08 13:29:03,161 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-05-08 13:29:03,161 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-05-08 13:29:03,161 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-05-08 13:29:03,161 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-05-08 13:29:03,161 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-05-08 13:29:03,161 [ scc.merge] INFO Already up to date.
2025-05-08 13:29:03,161 [ scc.merge] INFO
2025-05-08 13:29:03,161 [ scc.merge] INFO Merged PRs:
2025-05-08 13:29:03,161 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-05-08 13:29:03,161 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-05-08 13:29:03,161 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-05-08 13:29:03,161 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-05-08 13:29:03,161 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-08 13:29:03,161 [ scc.merge] INFO
2025-05-08 13:29:03,161 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-08 13:29:03,161 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-05-08 13:29:03,161 [ scc.merge] INFO
2025-05-08 13:29:03,161 [ scc.merge] INFO Repository: ome/omero-mapr
2025-05-08 13:29:03,161 [ scc.merge] INFO Excluded PRs:
2025-05-08 13:29:03,161 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-05-08 13:29:03,161 [ scc.merge] INFO Already up to date.
2025-05-08 13:29:03,161 [ scc.merge] INFO
2025-05-08 13:29:03,161 [ scc.merge] INFO Merged PRs:
2025-05-08 13:29:03,161 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-05-08 13:29:03,161 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-08 13:29:03,161 [ scc.merge] INFO
2025-05-08 13:29:03,161 [ scc.merge] INFO Repository: ome/omero-metadata
2025-05-08 13:29:03,161 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-05-08 13:29:03,161 [ scc.merge] INFO Previously merged:
2025-05-08 13:29:03,161 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-08 13:29:03,161 [ scc.merge] INFO
2025-05-08 13:29:03,161 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-08 13:29:03,161 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-08 13:29:03,161 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-08 13:29:03,161 [ scc.merge] INFO
2025-05-08 13:29:03,161 [ scc.merge] INFO Repository: ome/omero-parade
2025-05-08 13:29:03,161 [ scc.merge] INFO Excluded PRs:
2025-05-08 13:29:03,161 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-05-08 13:29:03,161 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-05-08 13:29:03,161 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-05-08 13:29:03,162 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-05-08 13:29:03,162 [ scc.merge] INFO Already up to date.
2025-05-08 13:29:03,162 [ scc.merge] INFO
2025-05-08 13:29:03,162 [ scc.merge] INFO Merged PRs:
2025-05-08 13:29:03,162 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-08 13:29:03,162 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-08 13:29:03,162 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-08 13:29:03,162 [ scc.merge] INFO
2025-05-08 13:29:03,162 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-05-08 13:29:03,162 [ scc.merge] INFO Already up to date.
2025-05-08 13:29:03,162 [ scc.merge] INFO
2025-05-08 13:29:03,162 [ scc.merge] INFO
2025-05-08 13:29:03,162 [ scc.merge] INFO Repository: ome/omero-rois
2025-05-08 13:29:03,162 [ scc.merge] INFO Excluded PRs:
2025-05-08 13:29:03,162 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-05-08 13:29:03,162 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-08 13:29:03,162 [ scc.merge] INFO Already up to date.
2025-05-08 13:29:03,162 [ scc.merge] INFO
2025-05-08 13:29:03,162 [ scc.merge] INFO
2025-05-08 13:29:03,162 [ scc.merge] INFO Repository: ome/omero-signup
2025-05-08 13:29:03,162 [ scc.merge] INFO Already up to date.
2025-05-08 13:29:03,162 [ scc.merge] INFO
2025-05-08 13:29:03,162 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-08 13:29:03,162 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-08 13:29:03,162 [ scc.merge] INFO
2025-05-08 13:29:03,162 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-05-08 13:29:03,162 [ scc.merge] INFO Excluded PRs:
2025-05-08 13:29:03,162 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-05-08 13:29:03,162 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-05-08 13:29:03,162 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-05-08 13:29:03,162 [ scc.merge] INFO Already up to date.
2025-05-08 13:29:03,162 [ scc.merge] INFO
2025-05-08 13:29:03,162 [ scc.merge] INFO Merged PRs:
2025-05-08 13:29:03,162 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-08 13:29:03,162 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-05-08 13:29:03,162 [ scc.merge] INFO
2025-05-08 13:29:03,162 [ scc.merge] INFO Repository: ome/omero-upload
2025-05-08 13:29:03,162 [ scc.merge] INFO Already up to date.
2025-05-08 13:29:03,162 [ scc.merge] INFO
2025-05-08 13:29:03,162 [ scc.merge] INFO
2025-05-08 13:29:03,163 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-05-08 13:29:03,163 [ scc.merge] INFO Already up to date.
2025-05-08 13:29:03,163 [ scc.merge] INFO
2025-05-08 13:29:03,163 [ scc.merge] INFO Merged PRs:
2025-05-08 13:29:03,163 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-05-08 13:29:03,163 [ scc.merge] INFO
2025-05-08 13:29:03,163 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-05-08 13:29:03,163 [ scc.merge] INFO Excluded PRs:
2025-05-08 13:29:03,163 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-05-08 13:29:03,163 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-05-08 13:29:03,163 [ scc.merge] INFO Already up to date.
2025-05-08 13:29:03,163 [ scc.merge] INFO
2025-05-08 13:29:03,163 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-08 13:29:03,163 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-08 13:29:03,163 [ scc.merge] INFO
2025-05-08 13:29:03,163 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-05-08 13:29:03,163 [ scc.merge] INFO Already up to date.
2025-05-08 13:29:03,163 [ scc.merge] INFO
2025-05-08 13:29:03,163 [ scc.merge] INFO
2025-05-08 13:29:03,163 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-05-08 13:29:03,163 [ scc.merge] INFO Already up to date.
2025-05-08 13:29:03,163 [ scc.merge] INFO
2025-05-08 13:29:03,163 [ scc.merge] INFO
2025-05-08 13:29:03,163 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-05-08 13:29:03,163 [ scc.merge] INFO Already up to date.
2025-05-08 13:29:03,163 [ scc.merge] INFO
2025-05-08 13:29:03,163 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-08 13:29:03,163 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-05-08 13:29:03,163 [ scc.merge] INFO
2025-05-08 13:29:03,163 [ scc.merge] INFO Repository: ome/scripts
2025-05-08 13:29:03,163 [ scc.merge] INFO Excluded PRs:
2025-05-08 13:29:03,163 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-05-08 13:29:03,163 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-05-08 13:29:03,163 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-05-08 13:29:03,163 [ scc.merge] INFO Previously merged:
2025-05-08 13:29:03,163 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-05-08 13:29:03,163 [ scc.merge] INFO
2025-05-08 13:29:03,163 [ scc.merge] INFO Merged PRs:
2025-05-08 13:29:03,163 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-08 13:29:03,164 [ scc.merge] INFO
2025-05-08 13:29:03,164 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-08 13:29:03,164 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-08 13:29:03,164 [ scc.merge] INFO
2025-05-08 13:29:03,164 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-05-08 13:29:03,164 [ scc.git] DEBUG Calling 'git remote'
2025-05-08 13:29:03,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-05-08 13:29:03,166 [ scc.git] DEBUG Calling 'git remote'
2025-05-08 13:29:03,169 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:29:03,169 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-05-08 13:29:03,169 [ scc.git] DEBUG Calling 'git remote'
2025-05-08 13:29:03,171 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:29:03,171 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-05-08 13:29:03,171 [ scc.git] DEBUG Calling 'git remote'
2025-05-08 13:29:03,173 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:29:03,173 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-05-08 13:29:03,173 [ scc.git] DEBUG Calling 'git remote'
2025-05-08 13:29:03,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:29:03,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-05-08 13:29:03,175 [ scc.git] DEBUG Calling 'git remote'
2025-05-08 13:29:03,177 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:29:03,178 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-05-08 13:29:03,178 [ scc.git] DEBUG Calling 'git remote'
2025-05-08 13:29:03,180 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:29:03,180 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-05-08 13:29:03,180 [ scc.git] DEBUG Calling 'git remote'
2025-05-08 13:29:03,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:29:03,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-05-08 13:29:03,182 [ scc.git] DEBUG Calling 'git remote'
2025-05-08 13:29:03,184 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:29:03,184 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-08 13:29:03,184 [ scc.git] DEBUG Calling 'git remote'
2025-05-08 13:29:03,186 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:29:03,186 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-08 13:29:03,186 [ scc.git] DEBUG Calling 'git remote'
2025-05-08 13:29:03,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:29:03,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-08 13:29:03,189 [ scc.git] DEBUG Calling 'git remote'
2025-05-08 13:29:03,191 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:29:03,191 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-08 13:29:03,191 [ scc.git] DEBUG Calling 'git remote'
2025-05-08 13:29:03,193 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:29:03,193 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-08 13:29:03,193 [ scc.git] DEBUG Calling 'git remote'
2025-05-08 13:29:03,195 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:29:03,195 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-08 13:29:03,195 [ scc.git] DEBUG Calling 'git remote'
2025-05-08 13:29:03,197 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:29:03,197 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-08 13:29:03,197 [ scc.git] DEBUG Calling 'git remote'
2025-05-08 13:29:03,200 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:29:03,200 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-08 13:29:03,200 [ scc.git] DEBUG Calling 'git remote'
2025-05-08 13:29:03,202 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:29:03,202 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-08 13:29:03,202 [ scc.git] DEBUG Calling 'git remote'
2025-05-08 13:29:03,204 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:29:03,204 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-08 13:29:03,204 [ scc.git] DEBUG Calling 'git remote'
2025-05-08 13:29:03,206 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:29:03,206 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-08 13:29:03,206 [ scc.git] DEBUG Calling 'git remote'
2025-05-08 13:29:03,208 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:29:03,208 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-08 13:29:03,208 [ scc.git] DEBUG Calling 'git remote'
2025-05-08 13:29:03,210 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:29:03,211 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-08 13:29:03,211 [ scc.git] DEBUG Calling 'git remote'
2025-05-08 13:29:03,213 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-08 13:29:03,213 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-08 13:29:03,213 [ scc.git] DEBUG Calling 'git remote'
2025-05-08 13:29:03,215 [ 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 2daeaed] 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 bf240a1] 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-08 13:29:53,198 [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-08 13:30:03,004 [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-08 13:30:05,572 [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-08 13:30:10,521 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-05-08 13:31:03,421 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/e865dcf2/images/svgs/logo.svg){kind=logo}
