Skip to content

Console Output

Skipping 223 KB.. Full Log
2025-04-25 01:14:16,707 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-25 01:14:16,745 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:14:16,745 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:16,747 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-25 01:14:16,784 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-25 01:14:16,788 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f200e0ed250> has no local changes
2025-04-25 01:14:16,788 [     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#399 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/)'
2025-04-25 01:14:16,795 [     scc.git] DEBUG [detached HEAD f598996] merge master -Dorg -Ssuccess-only
2025-04-25 01:14:16,795 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:14:16,795 [    scc.repo] DEBUG ## PRs found:
2025-04-25 01:14:16,958 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:17,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-04-25 01:14:17,495 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:17,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-04-25 01:14:18,037 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:18,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-25 01:14:18,568 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:18,794 [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-04-25 01:14:19,045 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:19,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-25 01:14:19,662 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:19,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-04-25 01:14:19,856 [    scc.repo] DEBUG   - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-25 01:14:20,107 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:20,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-04-25 01:14:20,604 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:20,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-04-25 01:14:21,127 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:21,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-25 01:14:21,648 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:21,891 [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-04-25 01:14:22,143 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:22,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-25 01:14:22,690 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:22,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-04-25 01:14:22,898 [    scc.repo] DEBUG   - PR 74 will-moore 'mapr extension of webclient'
2025-04-25 01:14:22,898 [    scc.repo] DEBUG ## Branches found:
2025-04-25 01:14:22,898 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-25 01:14:22,898 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:14:22,898 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:22,901 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-25 01:14:22,903 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-25 01:14:22,903 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-25 01:14:22,906 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-25 01:14:22,909 [     scc.git] DEBUG Already up to date.

2025-04-25 01:14:22,909 [     scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-04-25 01:14:23,232 [     scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-25 01:14:23,232 [     scc.git] DEBUG  * branch            refs/pull/74/head -> FETCH_HEAD
2025-04-25 01:14:23,236 [     scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-04-25 01:14:23,515 [     scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-25 01:14:23,515 [     scc.git] DEBUG  * branch            refs/pull/94/head -> FETCH_HEAD
2025-04-25 01:14:23,519 [     scc.git] DEBUG ## Unique users: []
2025-04-25 01:14:23,519 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:14:23,519 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:23,521 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-25 01:14:23,526 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:23,528 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-25 01:14:23,537 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-25 01:14:23,541 [     scc.git] DEBUG  .../templates/webclient/base/base_container.html   | 182 +++++++++++++
2025-04-25 01:14:23,541 [     scc.git] DEBUG  .../data/includes/right_plugin.general.js.html     | 290 ---------------------
2025-04-25 01:14:23,541 [     scc.git] DEBUG  requirements.txt                                   |   2 +-
2025-04-25 01:14:23,541 [     scc.git] DEBUG  3 files changed, 183 insertions(+), 291 deletions(-)
2025-04-25 01:14:23,541 [     scc.git] DEBUG  create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-04-25 01:14:23,541 [     scc.git] DEBUG  delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-04-25 01:14:23,542 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:23,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:14:23,717 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-25 01:14:23,721 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:23,723 [     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-04-25 01:14:23,732 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-25 01:14:23,735 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 2 +-
2025-04-25 01:14:23,735 [     scc.git] DEBUG  1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-25 01:14:23,967 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:24,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:14:24,138 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-25 01:14:24,176 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:14:24,176 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:24,179 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-25 01:14:24,215 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-25 01:14:24,219 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f200e0d3f90> has no local changes
2025-04-25 01:14:24,219 [     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#399 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/)'
2025-04-25 01:14:24,225 [     scc.git] DEBUG [detached HEAD bb612e5] merge master -Dorg -Ssuccess-only
2025-04-25 01:14:24,225 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:14:24,225 [    scc.repo] DEBUG ## PRs found:
2025-04-25 01:14:24,389 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:24,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-04-25 01:14:24,978 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:25,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-04-25 01:14:25,476 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:25,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-04-25 01:14:26,056 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:26,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-25 01:14:26,607 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:26,821 [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-04-25 01:14:27,072 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:27,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-25 01:14:27,609 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:27,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-04-25 01:14:27,794 [    scc.repo] DEBUG   - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-25 01:14:28,045 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:28,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-04-25 01:14:28,529 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:28,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-04-25 01:14:29,038 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:29,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-25 01:14:29,578 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:29,818 [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-04-25 01:14:30,069 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:30,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-25 01:14:30,687 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:30,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-04-25 01:14:30,869 [    scc.repo] DEBUG   - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-25 01:14:30,869 [    scc.repo] DEBUG ## Branches found:
2025-04-25 01:14:30,869 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-25 01:14:30,870 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:14:30,870 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:30,872 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-25 01:14:30,875 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-25 01:14:30,875 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-25 01:14:30,878 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-25 01:14:30,885 [     scc.git] DEBUG Updating 3cd120c..55060a2

2025-04-25 01:14:31,120 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:31,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-04-25 01:14:31,562 [     scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-04-25 01:14:31,864 [     scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-25 01:14:31,864 [     scc.git] DEBUG  * branch            refs/pull/55/head -> FETCH_HEAD
2025-04-25 01:14:31,868 [     scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-04-25 01:14:32,134 [     scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-25 01:14:32,134 [     scc.git] DEBUG  * branch            refs/pull/64/head -> FETCH_HEAD
2025-04-25 01:14:32,138 [     scc.git] DEBUG ## Unique users: []
2025-04-25 01:14:32,138 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:14:32,138 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:32,141 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-25 01:14:32,145 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:32,147 [     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-04-25 01:14:32,160 [     scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-04-25 01:14:32,161 [     scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-04-25 01:14:32,161 [     scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-25 01:14:32,161 [     scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-25 01:14:32,161 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-25 01:14:32,161 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-25 01:14:32,164 [     scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-25 01:14:32,168 [     scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-25 01:14:32,170 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:32,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:14:32,332 [     scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-25 01:14:32,336 [     scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-25 01:14:32,339 [     scc.git] INFO    - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#399](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - src/omero_metadata/populate.py
    - src/omero_metadata/cli.py

--conflicts

2025-04-25 01:14:32,341 [  scc.config] DEBUG Found github.token
2025-04-25 01:14:32,341 [     scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-04-25 01:14:32,341 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-25 01:14:32,346 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:32,348 [     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-04-25 01:14:32,363 [     scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-25 01:14:32,363 [     scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-25 01:14:32,363 [     scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-04-25 01:14:32,363 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-25 01:14:32,363 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-25 01:14:32,366 [     scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-25 01:14:32,371 [     scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-25 01:14:32,583 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:32,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:14:32,768 [     scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-25 01:14:32,773 [     scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-25 01:14:32,775 [     scc.git] INFO    - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#399](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/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-04-25 01:14:32,778 [  scc.config] DEBUG Found github.token
2025-04-25 01:14:32,778 [     scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-04-25 01:14:32,778 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-25 01:14:32,815 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:14:32,815 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:32,818 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-25 01:14:32,854 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-25 01:14:32,858 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f200ed36010> has no local changes
2025-04-25 01:14:32,858 [     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#399 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/)'
2025-04-25 01:14:32,865 [     scc.git] DEBUG [detached HEAD ab06b76] merge master -Dorg -Ssuccess-only
2025-04-25 01:14:32,865 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:14:32,866 [    scc.repo] DEBUG ## PRs found:
2025-04-25 01:14:33,019 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:33,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-04-25 01:14:33,663 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:33,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-04-25 01:14:34,165 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:34,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-25 01:14:34,706 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:34,968 [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-04-25 01:14:35,219 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:35,459 [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-04-25 01:14:35,710 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:36,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-25 01:14:36,273 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:36,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-04-25 01:14:36,460 [    scc.repo] DEBUG   - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-25 01:14:36,711 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:36,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-04-25 01:14:36,941 [    scc.repo] DEBUG   # ... Include label: dependencies
2025-04-25 01:14:37,192 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:37,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-25 01:14:37,920 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:38,165 [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-04-25 01:14:38,416 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:38,832 [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-04-25 01:14:39,084 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:39,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-25 01:14:39,572 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:39,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-04-25 01:14:39,758 [    scc.repo] DEBUG   - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-25 01:14:40,008 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:40,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-04-25 01:14:40,258 [    scc.repo] DEBUG   # ... Include label: dependencies
2025-04-25 01:14:40,508 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:40,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-25 01:14:41,065 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:41,384 [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-04-25 01:14:41,636 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:41,918 [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-04-25 01:14:42,170 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:42,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-25 01:14:42,732 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:42,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-04-25 01:14:42,919 [    scc.repo] DEBUG   - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-25 01:14:43,170 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:43,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-04-25 01:14:43,658 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:43,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-04-25 01:14:44,182 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:44,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-04-25 01:14:44,699 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:44,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-04-25 01:14:45,197 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:45,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-04-25 01:14:45,738 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:45,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-04-25 01:14:46,227 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:46,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-04-25 01:14:46,598 [    scc.repo] DEBUG ## Branches found:
2025-04-25 01:14:46,598 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-25 01:14:46,598 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:14:46,598 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:46,601 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-25 01:14:46,604 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-25 01:14:46,604 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-25 01:14:46,607 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-25 01:14:46,610 [     scc.git] DEBUG Already up to date.

2025-04-25 01:14:46,610 [     scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-04-25 01:14:46,891 [     scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-25 01:14:46,892 [     scc.git] DEBUG  * branch            refs/pull/140/head -> FETCH_HEAD
2025-04-25 01:14:46,896 [     scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-04-25 01:14:47,196 [     scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-25 01:14:47,196 [     scc.git] DEBUG  * branch            refs/pull/141/head -> FETCH_HEAD
2025-04-25 01:14:47,199 [     scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-04-25 01:14:47,463 [     scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-25 01:14:47,463 [     scc.git] DEBUG  * branch            refs/pull/142/head -> FETCH_HEAD
2025-04-25 01:14:47,467 [     scc.git] DEBUG ## Unique users: []
2025-04-25 01:14:47,467 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:14:47,467 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:47,469 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-25 01:14:47,472 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:47,474 [     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-04-25 01:14:47,482 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-25 01:14:47,486 [     scc.git] DEBUG  package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-04-25 01:14:47,486 [     scc.git] DEBUG  package.json      |   2 +-
2025-04-25 01:14:47,486 [     scc.git] DEBUG  2 files changed, 138 insertions(+), 153 deletions(-)
2025-04-25 01:14:47,487 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:47,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:14:47,643 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-04-25 01:14:47,646 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:47,648 [     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-04-25 01:14:47,658 [     scc.git] DEBUG Auto-merging package-lock.json
2025-04-25 01:14:47,658 [     scc.git] DEBUG Auto-merging package.json
2025-04-25 01:14:47,659 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-25 01:14:47,662 [     scc.git] DEBUG  package-lock.json | 18 ++++++++++--------
2025-04-25 01:14:47,662 [     scc.git] DEBUG  package.json      |  2 +-
2025-04-25 01:14:47,662 [     scc.git] DEBUG  2 files changed, 11 insertions(+), 9 deletions(-)
2025-04-25 01:14:47,894 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:48,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:14:48,053 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-25 01:14:48,056 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:48,059 [     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-04-25 01:14:48,067 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-25 01:14:48,069 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 2 +-
2025-04-25 01:14:48,070 [     scc.git] DEBUG  1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-25 01:14:48,304 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:48,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:14:48,465 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-25 01:14:48,502 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:14:48,502 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:48,505 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-25 01:14:48,542 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-25 01:14:48,546 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f2010687510> has no local changes
2025-04-25 01:14:48,546 [     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#399 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/)'
2025-04-25 01:14:48,553 [     scc.git] DEBUG [detached HEAD 015171c] merge master -Dorg -Ssuccess-only
2025-04-25 01:14:48,553 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:14:48,553 [    scc.repo] DEBUG ## PRs found:
2025-04-25 01:14:48,716 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:48,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-04-25 01:14:48,903 [    scc.repo] DEBUG ## Branches found:
2025-04-25 01:14:48,903 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-25 01:14:48,903 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:14:48,903 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:48,906 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-25 01:14:48,908 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-25 01:14:48,908 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-25 01:14:48,911 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-25 01:14:48,914 [     scc.git] DEBUG Already up to date.

2025-04-25 01:14:48,914 [     scc.git] DEBUG ## Unique users: []
2025-04-25 01:14:48,914 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:14:48,914 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:48,916 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-25 01:14:48,953 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:14:48,953 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:48,955 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-25 01:14:48,991 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-25 01:14:48,994 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f1ffff02490> has no local changes
2025-04-25 01:14:48,994 [     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#399 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/)'
2025-04-25 01:14:49,000 [     scc.git] DEBUG [detached HEAD a76e8e8] merge master -Dorg -Ssuccess-only
2025-04-25 01:14:49,001 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:14:49,001 [    scc.repo] DEBUG ## PRs found:
2025-04-25 01:14:49,154 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:49,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-04-25 01:14:49,767 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:50,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-04-25 01:14:50,268 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:50,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-04-25 01:14:50,733 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:51,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-04-25 01:14:51,019 [    scc.repo] DEBUG ## Branches found:
2025-04-25 01:14:51,019 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-25 01:14:51,019 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:14:51,019 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:51,022 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-25 01:14:51,024 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-25 01:14:51,024 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-25 01:14:51,027 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-25 01:14:51,031 [     scc.git] DEBUG Already up to date.

2025-04-25 01:14:51,031 [     scc.git] DEBUG ## Unique users: []
2025-04-25 01:14:51,031 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:14:51,031 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:51,033 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-25 01:14:51,072 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:14:51,072 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:51,074 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-25 01:14:51,111 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-25 01:14:51,114 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f200e2cf6d0> has no local changes
2025-04-25 01:14:51,114 [     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#399 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/)'
2025-04-25 01:14:51,121 [     scc.git] DEBUG [detached HEAD c3fe87d] merge master -Dorg -Ssuccess-only
2025-04-25 01:14:51,121 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:14:51,121 [    scc.repo] DEBUG ## PRs found:
2025-04-25 01:14:51,270 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:51,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-04-25 01:14:51,819 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:52,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-04-25 01:14:52,282 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:52,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-04-25 01:14:52,757 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:53,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-25 01:14:53,367 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:53,587 [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-04-25 01:14:53,839 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:54,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-25 01:14:54,333 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:54,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-04-25 01:14:54,523 [    scc.repo] DEBUG   - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-25 01:14:54,523 [    scc.repo] DEBUG ## Branches found:
2025-04-25 01:14:54,523 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-25 01:14:54,523 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:14:54,523 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:54,526 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-25 01:14:54,528 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-25 01:14:54,528 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-25 01:14:54,531 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-25 01:14:54,535 [     scc.git] DEBUG Already up to date.

2025-04-25 01:14:54,535 [     scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-04-25 01:14:54,835 [     scc.git] DEBUG From https://github.com/ome/omero-signup
2025-04-25 01:14:54,835 [     scc.git] DEBUG  * branch            refs/pull/14/head -> FETCH_HEAD
2025-04-25 01:14:54,839 [     scc.git] DEBUG ## Unique users: []
2025-04-25 01:14:54,839 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:14:54,839 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:54,841 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-25 01:14:54,844 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:54,847 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-25 01:14:54,856 [     scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-04-25 01:14:54,856 [     scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-04-25 01:14:54,856 [     scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-04-25 01:14:54,856 [     scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-04-25 01:14:54,856 [     scc.git] DEBUG Auto-merging omero_signup/views.py
2025-04-25 01:14:54,856 [     scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-04-25 01:14:54,856 [     scc.git] DEBUG Auto-merging setup.py
2025-04-25 01:14:54,856 [     scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-04-25 01:14:54,856 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-25 01:14:54,856 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-25 01:14:54,859 [     scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-25 01:14:54,863 [     scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-04-25 01:14:54,864 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:55,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:14:55,032 [     scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-25 01:14:55,035 [     scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-25 01:14:55,038 [     scc.git] INFO    - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#399](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - omero_signup/views.py
    - omero_signup/signup_settings.py
    - setup.py
    - omero_signup/urls.py

--conflicts

2025-04-25 01:14:55,040 [  scc.config] DEBUG Found github.token
2025-04-25 01:14:55,040 [     scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-04-25 01:14:55,040 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-25 01:14:55,078 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:14:55,078 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:14:55,080 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-25 01:14:55,117 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-25 01:14:55,121 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f200e1fd450> has no local changes
2025-04-25 01:14:55,121 [     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#399 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/)'
2025-04-25 01:14:55,128 [     scc.git] DEBUG [detached HEAD a0e986e] merge master -Dorg -Ssuccess-only
2025-04-25 01:14:55,128 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:14:55,128 [    scc.repo] DEBUG ## PRs found:
2025-04-25 01:14:55,283 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:55,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-04-25 01:14:55,859 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:56,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-04-25 01:14:56,377 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:56,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-04-25 01:14:56,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:57,249 [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-04-25 01:14:57,501 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:57,803 [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-04-25 01:14:58,054 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:58,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-04-25 01:14:58,512 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:58,686 [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-04-25 01:14:58,686 [    scc.repo] DEBUG   - PR 76 will-moore 'Run cli deps'
2025-04-25 01:14:58,937 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:59,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-04-25 01:14:59,412 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:14:59,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-04-25 01:14:59,875 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:00,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-04-25 01:15:00,400 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:00,718 [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-04-25 01:15:00,970 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:01,271 [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-04-25 01:15:01,523 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:02,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-04-25 01:15:02,790 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:03,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-04-25 01:15:03,255 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:03,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-04-25 01:15:03,746 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:04,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-04-25 01:15:04,478 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:04,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-25 01:15:05,012 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:05,306 [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-04-25 01:15:05,557 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:05,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-25 01:15:06,146 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:06,351 [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-04-25 01:15:06,351 [    scc.repo] DEBUG   - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-25 01:15:06,351 [    scc.repo] DEBUG ## Branches found:
2025-04-25 01:15:06,352 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-25 01:15:06,352 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:15:06,352 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:06,354 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-25 01:15:06,357 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-25 01:15:06,357 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-25 01:15:06,360 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-25 01:15:06,363 [     scc.git] DEBUG Already up to date.

2025-04-25 01:15:06,363 [     scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-04-25 01:15:06,674 [     scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-25 01:15:06,674 [     scc.git] DEBUG  * branch            refs/pull/12/head -> FETCH_HEAD
2025-04-25 01:15:06,678 [     scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-04-25 01:15:06,963 [     scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-25 01:15:06,963 [     scc.git] DEBUG  * branch            refs/pull/76/head -> FETCH_HEAD
2025-04-25 01:15:06,968 [     scc.git] DEBUG ## Unique users: []
2025-04-25 01:15:06,968 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:15:06,968 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:06,970 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-04-25 01:15:06,975 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:06,977 [     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-04-25 01:15:06,989 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-25 01:15:06,993 [     scc.git] DEBUG  idr-compose.yml                            |  66 ++++++++++++++
2025-04-25 01:15:06,993 [     scc.git] DEBUG  idr-haproxy.yml                            |  58 +++++++++++++
2025-04-25 01:15:06,993 [     scc.git] DEBUG  idr/40-ansible.sh                          |   7 ++
2025-04-25 01:15:06,993 [     scc.git] DEBUG  idr/70-reset-password.sh                   |   1 +
2025-04-25 01:15:06,993 [     scc.git] DEBUG  idr/nginx/conf.d/default.conf              |   1 +
2025-04-25 01:15:06,993 [     scc.git] DEBUG  idr/nginx/conf.d/example_ssl.conf          |   1 +
2025-04-25 01:15:06,993 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-cache.conf          |  53 +++++++++++
2025-04-25 01:15:06,994 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:06,994 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-cachebuster.conf    | 114 ++++++++++++++++++++++++
2025-04-25 01:15:06,994 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-default.conf        | 135 +++++++++++++++++++++++++++++
2025-04-25 01:15:06,995 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-04-25 01:15:06,995 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-redirect.conf       |  15 ++++
2025-04-25 01:15:06,995 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-upstream.conf       |  13 +++
2025-04-25 01:15:06,995 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-v0.conf             |  26 ++++++
2025-04-25 01:15:06,995 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-v1.conf             |  30 +++++++
2025-04-25 01:15:06,995 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-v2.conf             |  30 +++++++
2025-04-25 01:15:06,995 [     scc.git] DEBUG  idr/nginx/conf.d/proxy-websockets.conf     |   6 ++
2025-04-25 01:15:06,995 [     scc.git] DEBUG  idr/nginx/nginx.conf                       |  53 +++++++++++
2025-04-25 01:15:06,995 [     scc.git] DEBUG  idr/omero/Dockerfile                       |   3 +
2025-04-25 01:15:06,995 [     scc.git] DEBUG  idr/omero/playbook.yml                     |  41 +++++++++
2025-04-25 01:15:06,995 [     scc.git] DEBUG  idr/redirect/Dockerfile                    |   6 ++
2025-04-25 01:15:06,995 [     scc.git] DEBUG  idr/web/Dockerfile                         |   5 ++
2025-04-25 01:15:06,995 [     scc.git] DEBUG  idr/web/playbook.yml                       |  45 ++++++++++
2025-04-25 01:15:06,995 [     scc.git] DEBUG  22 files changed, 824 insertions(+)
2025-04-25 01:15:06,995 [     scc.git] DEBUG  create mode 100644 idr-compose.yml
2025-04-25 01:15:06,995 [     scc.git] DEBUG  create mode 100644 idr-haproxy.yml
2025-04-25 01:15:06,995 [     scc.git] DEBUG  create mode 100755 idr/40-ansible.sh
2025-04-25 01:15:06,995 [     scc.git] DEBUG  create mode 100755 idr/70-reset-password.sh
2025-04-25 01:15:06,995 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/default.conf
2025-04-25 01:15:06,995 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-04-25 01:15:06,995 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-04-25 01:15:06,995 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-04-25 01:15:06,995 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-04-25 01:15:06,995 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-04-25 01:15:06,995 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-04-25 01:15:06,995 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-04-25 01:15:06,995 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-04-25 01:15:06,995 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-04-25 01:15:06,995 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-04-25 01:15:06,995 [     scc.git] DEBUG  create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-04-25 01:15:06,995 [     scc.git] DEBUG  create mode 100644 idr/nginx/nginx.conf
2025-04-25 01:15:06,995 [     scc.git] DEBUG  create mode 100644 idr/omero/Dockerfile
2025-04-25 01:15:06,995 [     scc.git] DEBUG  create mode 100644 idr/omero/playbook.yml
2025-04-25 01:15:06,996 [     scc.git] DEBUG  create mode 100644 idr/redirect/Dockerfile
2025-04-25 01:15:06,996 [     scc.git] DEBUG  create mode 100644 idr/web/Dockerfile
2025-04-25 01:15:06,996 [     scc.git] DEBUG  create mode 100644 idr/web/playbook.yml
2025-04-25 01:15:07,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:07,168 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-04-25 01:15:07,173 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:07,175 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-04-25 01:15:07,185 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-25 01:15:07,187 [     scc.git] DEBUG  docker | 1 +
2025-04-25 01:15:07,187 [     scc.git] DEBUG  1 file changed, 1 insertion(+)
2025-04-25 01:15:07,419 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:07,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:07,673 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-25 01:15:07,711 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:15:07,711 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:07,713 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-25 01:15:07,750 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-25 01:15:07,753 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f200e1ff6d0> has no local changes
2025-04-25 01:15:07,753 [     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#399 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/)'
2025-04-25 01:15:07,760 [     scc.git] DEBUG [detached HEAD 43d7dd6] merge master -Dorg -Ssuccess-only
2025-04-25 01:15:07,760 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:07,760 [    scc.repo] DEBUG ## PRs found:
2025-04-25 01:15:07,924 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:08,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-04-25 01:15:08,152 [    scc.repo] DEBUG ## Branches found:
2025-04-25 01:15:08,152 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-25 01:15:08,152 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:15:08,152 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:08,154 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-25 01:15:08,156 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-25 01:15:08,157 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-25 01:15:08,159 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-25 01:15:08,162 [     scc.git] DEBUG Already up to date.

2025-04-25 01:15:08,162 [     scc.git] DEBUG ## Unique users: []
2025-04-25 01:15:08,163 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:15:08,163 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:08,165 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-25 01:15:08,202 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:15:08,202 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:08,204 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-25 01:15:08,243 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-25 01:15:08,246 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f200e041ed0> has no local changes
2025-04-25 01:15:08,246 [     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#399 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/)'
2025-04-25 01:15:08,252 [     scc.git] DEBUG [detached HEAD 9e93e7e] merge master -Dorg -Ssuccess-only
2025-04-25 01:15:08,252 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:08,252 [    scc.repo] DEBUG ## PRs found:
2025-04-25 01:15:08,403 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:08,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-04-25 01:15:08,943 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:09,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-04-25 01:15:09,447 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:09,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-04-25 01:15:09,914 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:10,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-25 01:15:10,464 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:10,721 [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-04-25 01:15:10,973 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:11,253 [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-04-25 01:15:11,505 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:11,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-25 01:15:12,032 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:12,274 [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-04-25 01:15:12,274 [    scc.repo] DEBUG   - PR 20 jburel 'Build'
2025-04-25 01:15:12,274 [    scc.repo] DEBUG ## Branches found:
2025-04-25 01:15:12,274 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-25 01:15:12,274 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:15:12,274 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:12,277 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-25 01:15:12,280 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-25 01:15:12,280 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-25 01:15:12,282 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-25 01:15:12,285 [     scc.git] DEBUG Already up to date.

2025-04-25 01:15:12,286 [     scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-04-25 01:15:12,562 [     scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-04-25 01:15:12,562 [     scc.git] DEBUG  * branch            refs/pull/20/head -> FETCH_HEAD
2025-04-25 01:15:12,567 [     scc.git] DEBUG ## Unique users: []
2025-04-25 01:15:12,567 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:15:12,567 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:12,570 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-04-25 01:15:12,573 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:12,575 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-04-25 01:15:12,582 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-25 01:15:12,585 [     scc.git] DEBUG  .github/workflows/omero_plugin.yml |  2 +-
2025-04-25 01:15:12,585 [     scc.git] DEBUG  .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-04-25 01:15:12,585 [     scc.git] DEBUG  .omeroci/app-build                 | 19 +++++++++++++++++++
2025-04-25 01:15:12,585 [     scc.git] DEBUG  3 files changed, 27 insertions(+), 6 deletions(-)
2025-04-25 01:15:12,585 [     scc.git] DEBUG  create mode 100755 .omeroci/app-build
2025-04-25 01:15:12,586 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:12,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:12,750 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-25 01:15:12,788 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:15:12,788 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:12,791 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-25 01:15:12,827 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-25 01:15:12,830 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f200e313350> has no local changes
2025-04-25 01:15:12,830 [     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#399 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/)'
2025-04-25 01:15:12,837 [     scc.git] DEBUG [detached HEAD 863ff85] merge master -Dorg -Ssuccess-only
2025-04-25 01:15:12,837 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:12,837 [     scc.git] INFO  Overriding base-branch from master to main
2025-04-25 01:15:12,837 [    scc.repo] DEBUG ## PRs found:
2025-04-25 01:15:13,001 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:13,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-04-25 01:15:13,547 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:13,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-04-25 01:15:14,106 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:14,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-04-25 01:15:14,601 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:14,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-04-25 01:15:15,189 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:15,544 [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-04-25 01:15:15,795 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:16,043 [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-04-25 01:15:16,294 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:16,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-04-25 01:15:16,800 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:17,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-04-25 01:15:17,299 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:17,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-04-25 01:15:17,804 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:18,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-25 01:15:18,366 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:18,635 [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-04-25 01:15:18,887 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:19,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-25 01:15:19,485 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:19,721 [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-04-25 01:15:19,721 [    scc.repo] DEBUG   - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-25 01:15:19,722 [    scc.repo] DEBUG ## Branches found:
2025-04-25 01:15:19,722 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-25 01:15:19,722 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:15:19,722 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:19,725 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-04-25 01:15:19,727 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-25 01:15:19,727 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-04-25 01:15:19,730 [     scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-04-25 01:15:19,733 [     scc.git] DEBUG Already up to date.

2025-04-25 01:15:19,733 [     scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-04-25 01:15:20,062 [     scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-04-25 01:15:20,062 [     scc.git] DEBUG  * branch            refs/pull/10/head -> FETCH_HEAD
2025-04-25 01:15:20,066 [     scc.git] DEBUG ## Unique users: []
2025-04-25 01:15:20,066 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:15:20,066 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:20,069 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-25 01:15:20,072 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:20,074 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-25 01:15:20,081 [     scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-04-25 01:15:20,082 [     scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-04-25 01:15:20,082 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-25 01:15:20,082 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-25 01:15:20,085 [     scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-25 01:15:20,089 [     scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-04-25 01:15:20,090 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:20,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:20,277 [     scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-25 01:15:20,280 [     scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-25 01:15:20,283 [     scc.git] INFO    - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#399](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - omero_web_zarr/urls.py

--conflicts

2025-04-25 01:15:20,285 [  scc.config] DEBUG Found github.token
2025-04-25 01:15:20,285 [     scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-04-25 01:15:20,285 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-25 01:15:20,322 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:15:20,322 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:20,324 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-25 01:15:20,360 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-25 01:15:20,364 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f1ffff71e90> has no local changes
2025-04-25 01:15:20,364 [     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#399 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/)'
2025-04-25 01:15:20,370 [     scc.git] DEBUG [detached HEAD a06a090] merge master -Dorg -Ssuccess-only
2025-04-25 01:15:20,371 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:20,371 [    scc.repo] DEBUG ## PRs found:
2025-04-25 01:15:20,528 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:20,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-04-25 01:15:20,724 [    scc.repo] DEBUG ## Branches found:
2025-04-25 01:15:20,724 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-25 01:15:20,724 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:15:20,725 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:20,727 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-25 01:15:20,729 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-25 01:15:20,729 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-25 01:15:20,732 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-25 01:15:20,735 [     scc.git] DEBUG Already up to date.

2025-04-25 01:15:20,735 [     scc.git] DEBUG ## Unique users: []
2025-04-25 01:15:20,735 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:15:20,735 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:20,737 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-25 01:15:20,774 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:15:20,774 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:20,776 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-25 01:15:20,815 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-25 01:15:20,818 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f200e138250> has no local changes
2025-04-25 01:15:20,818 [     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#399 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/)'
2025-04-25 01:15:20,824 [     scc.git] DEBUG [detached HEAD 3d8cbea] merge master -Dorg -Ssuccess-only
2025-04-25 01:15:20,824 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:20,824 [    scc.repo] DEBUG ## PRs found:
2025-04-25 01:15:20,975 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:21,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-04-25 01:15:21,213 [    scc.repo] DEBUG ## Branches found:
2025-04-25 01:15:21,213 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-25 01:15:21,214 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:15:21,214 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:21,216 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-25 01:15:21,218 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-25 01:15:21,218 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-25 01:15:21,221 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-25 01:15:21,224 [     scc.git] DEBUG Already up to date.

2025-04-25 01:15:21,224 [     scc.git] DEBUG ## Unique users: []
2025-04-25 01:15:21,224 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:15:21,224 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:21,226 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-25 01:15:21,263 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:15:21,263 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:21,266 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-25 01:15:21,302 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-25 01:15:21,305 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f200e039e90> has no local changes
2025-04-25 01:15:21,305 [     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#399 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/)'
2025-04-25 01:15:21,312 [     scc.git] DEBUG [detached HEAD b34b076] merge master -Dorg -Ssuccess-only
2025-04-25 01:15:21,312 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:21,312 [    scc.repo] DEBUG ## PRs found:
2025-04-25 01:15:21,464 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:21,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-04-25 01:15:21,998 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:22,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-04-25 01:15:22,495 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:22,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-04-25 01:15:22,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:23,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-25 01:15:23,535 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:23,823 [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-04-25 01:15:24,074 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:24,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-25 01:15:24,564 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:24,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-04-25 01:15:24,791 [    scc.repo] DEBUG   - PR 100 dominikl 'Run tests properly'
2025-04-25 01:15:24,791 [    scc.repo] DEBUG ## Branches found:
2025-04-25 01:15:24,791 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-25 01:15:24,792 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:15:24,792 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:24,794 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-25 01:15:24,797 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-25 01:15:24,797 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-25 01:15:24,799 [     scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-25 01:15:24,802 [     scc.git] DEBUG Already up to date.

2025-04-25 01:15:24,802 [     scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-04-25 01:15:25,075 [     scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-04-25 01:15:25,075 [     scc.git] DEBUG  * branch            refs/pull/100/head -> FETCH_HEAD
2025-04-25 01:15:25,079 [     scc.git] DEBUG ## Unique users: []
2025-04-25 01:15:25,079 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:15:25,079 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:25,081 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-25 01:15:25,084 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:25,087 [     scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-25 01:15:25,095 [     scc.git] DEBUG Auto-merging Dockerfile
2025-04-25 01:15:25,095 [     scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-04-25 01:15:25,096 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-25 01:15:25,096 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-25 01:15:25,099 [     scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-25 01:15:25,103 [     scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-04-25 01:15:25,104 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:25,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:25,270 [     scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-25 01:15:25,272 [     scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-25 01:15:25,275 [     scc.git] INFO    - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#399](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - Dockerfile

--conflicts

2025-04-25 01:15:25,277 [  scc.config] DEBUG Found github.token
2025-04-25 01:15:25,277 [     scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-04-25 01:15:25,277 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-25 01:15:25,314 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:15:25,315 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:25,317 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-25 01:15:25,353 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-25 01:15:25,357 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f200e1ff950> has no local changes
2025-04-25 01:15:25,357 [     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#399 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/)'
2025-04-25 01:15:25,363 [     scc.git] DEBUG [detached HEAD 97fc9b9] merge master -Dorg -Ssuccess-only
2025-04-25 01:15:25,363 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:25,363 [     scc.git] INFO  Overriding base-branch from master to develop
2025-04-25 01:15:25,364 [    scc.repo] DEBUG ## PRs found:
2025-04-25 01:15:25,521 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:25,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-04-25 01:15:26,133 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:26,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-04-25 01:15:26,625 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:26,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-04-25 01:15:27,116 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:27,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-25 01:15:27,601 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:27,869 [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-04-25 01:15:28,121 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:28,384 [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-04-25 01:15:28,635 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:28,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-25 01:15:29,139 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:29,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-04-25 01:15:29,320 [    scc.repo] DEBUG   - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-25 01:15:29,571 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:29,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-04-25 01:15:30,053 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:30,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-04-25 01:15:30,569 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:30,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-25 01:15:31,111 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:31,301 [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-04-25 01:15:31,552 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:31,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-25 01:15:32,045 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:32,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-04-25 01:15:32,255 [    scc.repo] DEBUG   - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-25 01:15:32,506 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:32,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-04-25 01:15:33,009 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:33,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-04-25 01:15:33,604 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:33,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-04-25 01:15:34,088 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:34,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-04-25 01:15:34,459 [    scc.repo] DEBUG ## Branches found:
2025-04-25 01:15:34,459 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-25 01:15:34,459 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:15:34,459 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:34,461 [     scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-04-25 01:15:34,464 [     scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-25 01:15:34,464 [     scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-04-25 01:15:34,467 [     scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-04-25 01:15:34,475 [     scc.git] DEBUG Updating 4b4c755..950b28b

2025-04-25 01:15:34,709 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:35,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-04-25 01:15:35,154 [     scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-04-25 01:15:35,466 [     scc.git] DEBUG From https://github.com/ome/scripts
2025-04-25 01:15:35,466 [     scc.git] DEBUG  * branch            refs/pull/202/head -> FETCH_HEAD
2025-04-25 01:15:35,470 [     scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-04-25 01:15:35,778 [     scc.git] DEBUG From https://github.com/ome/scripts
2025-04-25 01:15:35,778 [     scc.git] DEBUG  * branch            refs/pull/223/head -> FETCH_HEAD
2025-04-25 01:15:35,782 [     scc.git] DEBUG ## Unique users: []
2025-04-25 01:15:35,782 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:15:35,782 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:35,784 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-25 01:15:35,790 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:35,792 [     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-04-25 01:15:35,802 [     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-04-25 01:15:35,803 [     scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-25 01:15:35,803 [     scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-25 01:15:35,806 [     scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-25 01:15:35,809 [     scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-04-25 01:15:35,811 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:35,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:35,972 [     scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-25 01:15:35,977 [     scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-25 01:15:35,981 [     scc.git] INFO    - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#399](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/consoleText) for more details.
Possible conflicts:
  - Upstream changes
    - omero/annotation_scripts/KeyVal_to_csv.py

--conflicts

2025-04-25 01:15:35,983 [  scc.config] DEBUG Found github.token
2025-04-25 01:15:35,983 [     scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-04-25 01:15:35,983 [     scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-25 01:15:35,988 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:35,990 [     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-04-25 01:15:35,999 [     scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-25 01:15:36,002 [     scc.git] DEBUG  omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-04-25 01:15:36,002 [     scc.git] DEBUG  1 file changed, 8 insertions(+), 1 deletion(-)
2025-04-25 01:15:36,223 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:36,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:36,398 [     scc.git] DEBUG Calling 'git submodule update'
2025-04-25 01:15:36,435 [     scc.git] DEBUG Get sha1 of %s
2025-04-25 01:15:36,435 [     scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-25 01:15:36,437 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-25 01:15:36,474 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-25 01:15:36,478 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f1ffff78550> has no local changes
2025-04-25 01:15:36,478 [     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#399 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/)'
2025-04-25 01:15:36,484 [     scc.git] DEBUG [detached HEAD b357355] merge master -Dorg -Ssuccess-only
2025-04-25 01:15:36,484 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:36,484 [     scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-25 01:15:36,556 [  scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-04-25 01:15:36,649 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:36,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:36,830 [  scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-04-25 01:15:36,832 [  scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-04-25 01:15:37,076 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:37,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:37,242 [  scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-04-25 01:15:37,243 [  scc.config] DEBUG Found submodule.omero-cli-render.url
2025-04-25 01:15:37,488 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:37,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:37,661 [  scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-04-25 01:15:37,663 [  scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-04-25 01:15:37,908 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:38,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:38,081 [  scc.config] DEBUG Found submodule.omero-figure.url
2025-04-25 01:15:38,326 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:38,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:38,531 [  scc.config] DEBUG Found submodule.omero-figure.branch
2025-04-25 01:15:38,533 [  scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-04-25 01:15:38,778 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:38,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:38,951 [  scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-04-25 01:15:38,953 [  scc.config] DEBUG Found submodule.omero-gallery.url
2025-04-25 01:15:39,197 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:39,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:39,383 [  scc.config] DEBUG Found submodule.omero-gallery.branch
2025-04-25 01:15:39,385 [  scc.config] DEBUG Found submodule.omero-iviewer.url
2025-04-25 01:15:39,630 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:39,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:39,799 [  scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-04-25 01:15:39,801 [  scc.config] DEBUG Found submodule.omero-mapr.url
2025-04-25 01:15:40,045 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:40,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:40,219 [  scc.config] DEBUG Found submodule.omero-mapr.branch
2025-04-25 01:15:40,221 [  scc.config] DEBUG Found submodule.omero-metadata.url
2025-04-25 01:15:40,466 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:40,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:40,636 [  scc.config] DEBUG Found submodule.omero-metadata.branch
2025-04-25 01:15:40,638 [  scc.config] DEBUG Found submodule.omero-parade.url
2025-04-25 01:15:40,882 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:41,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:41,077 [  scc.config] DEBUG Found submodule.omero-parade.branch
2025-04-25 01:15:41,079 [  scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-04-25 01:15:41,323 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:41,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:41,498 [  scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-04-25 01:15:41,500 [  scc.config] DEBUG Found submodule.omero-rois.url
2025-04-25 01:15:41,745 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:41,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:41,997 [  scc.config] DEBUG Found submodule.omero-signup.url
2025-04-25 01:15:42,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:42,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:42,450 [  scc.config] DEBUG Found submodule.omero-test-infra.url
2025-04-25 01:15:42,695 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:42,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:42,891 [  scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-04-25 01:15:42,893 [  scc.config] DEBUG Found submodule.omero-upload.url
2025-04-25 01:15:43,138 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:43,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:43,309 [  scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-04-25 01:15:43,554 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:43,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:43,728 [  scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-04-25 01:15:43,973 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:44,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:44,146 [  scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-04-25 01:15:44,148 [  scc.config] DEBUG Found submodule.omero-weberror.url
2025-04-25 01:15:44,392 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:44,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:44,560 [  scc.config] DEBUG Found submodule.omero-weberror.branch
2025-04-25 01:15:44,562 [  scc.config] DEBUG Found submodule.omero-webtest.url
2025-04-25 01:15:44,806 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:44,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:44,986 [  scc.config] DEBUG Found submodule.omero-webtest.branch
2025-04-25 01:15:44,988 [  scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-04-25 01:15:45,234 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:45,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:45,403 [  scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-04-25 01:15:45,405 [  scc.config] DEBUG Found submodule.scripts.url
2025-04-25 01:15:45,649 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-25 01:15:45,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-25 01:15:45,827 [  scc.config] DEBUG Found submodule.scripts.branch
2025-04-25 01:15:45,827 [     scc.git] DEBUG Calling 'git status --porcelain'
2025-04-25 01:15:45,914 [     scc.git] DEBUG <scc.git.GitRepository object at 0x7f2010c84890> has local changes
2025-04-25 01:15:45,914 [     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'

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 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#399 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/399/)'
2025-04-25 01:15:45,928 [     scc.git] DEBUG [detached HEAD d2df351] merge master -Dorg -Ssuccess-only
2025-04-25 01:15:45,928 [     scc.git] DEBUG  23 files changed, 44 insertions(+), 44 deletions(-)
2025-04-25 01:15:45,928 [   scc.merge] INFO  Repository: ome/omero-plugins
2025-04-25 01:15:45,928 [   scc.merge] INFO  Already up to date.
2025-04-25 01:15:45,928 [   scc.merge] INFO  
2025-04-25 01:15:45,928 [   scc.merge] INFO  Merged PRs:
2025-04-25 01:15:45,928 [   scc.merge] INFO    - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-04-25 01:15:45,928 [   scc.merge] INFO    - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-04-25 01:15:45,928 [   scc.merge] INFO    - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-04-25 01:15:45,928 [   scc.merge] INFO  
2025-04-25 01:15:45,928 [   scc.merge] INFO  Repository: ome/minimal-omero-client
2025-04-25 01:15:45,928 [   scc.merge] INFO  Already up to date.
2025-04-25 01:15:45,928 [   scc.merge] INFO  
2025-04-25 01:15:45,928 [   scc.merge] INFO  
2025-04-25 01:15:45,929 [   scc.merge] INFO  Repository: ome/omero-cli-duplicate
2025-04-25 01:15:45,929 [   scc.merge] INFO  Excluded PRs:
2025-04-25 01:15:45,929 [   scc.merge] INFO    - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-04-25 01:15:45,929 [   scc.merge] INFO  Already up to date.
2025-04-25 01:15:45,929 [   scc.merge] INFO  
2025-04-25 01:15:45,929 [   scc.merge] INFO  
2025-04-25 01:15:45,929 [   scc.merge] INFO  Repository: ome/omero-cli-render
2025-04-25 01:15:45,929 [   scc.merge] INFO  Excluded PRs:
2025-04-25 01:15:45,929 [   scc.merge] INFO    - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-04-25 01:15:45,929 [   scc.merge] INFO    - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-04-25 01:15:45,929 [   scc.merge] INFO  Already up to date.
2025-04-25 01:15:45,929 [   scc.merge] INFO  
2025-04-25 01:15:45,929 [   scc.merge] INFO  Merged PRs:
2025-04-25 01:15:45,929 [   scc.merge] INFO    - PR 59 will-moore 'Apply settings to Plate'
2025-04-25 01:15:45,929 [   scc.merge] INFO    - PR 69 dominikl 'Fix help text for impo/export commands'
2025-04-25 01:15:45,929 [   scc.merge] INFO  
2025-04-25 01:15:45,929 [   scc.merge] INFO  Repository: ome/omero-cli-zarr
2025-04-25 01:15:45,929 [   scc.merge] INFO  Excluded PRs:
2025-04-25 01:15:45,929 [   scc.merge] INFO    - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-04-25 01:15:45,929 [   scc.merge] INFO    - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-04-25 01:15:45,929 [   scc.merge] INFO    - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-04-25 01:15:45,929 [   scc.merge] INFO    - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-25 01:15:45,929 [   scc.merge] INFO    - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-04-25 01:15:45,929 [   scc.merge] INFO  Updating 11d3587..5b2ca82
2025-04-25 01:15:45,929 [   scc.merge] INFO  Previously merged:
2025-04-25 01:15:45,929 [   scc.merge] INFO    - PR 171 will-moore 'Initial addition of integration tests'
2025-04-25 01:15:45,929 [   scc.merge] INFO    - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-25 01:15:45,929 [   scc.merge] INFO  
2025-04-25 01:15:45,929 [   scc.merge] INFO  Merged PRs:
2025-04-25 01:15:45,929 [   scc.merge] INFO    - PR 147 will-moore 'Name option'
2025-04-25 01:15:45,929 [   scc.merge] INFO  
2025-04-25 01:15:45,929 [   scc.merge] INFO  Conflicting PRs (not included):
2025-04-25 01:15:45,929 [   scc.merge] INFO    - PR 167 dominikl 'Add extinfo command'
2025-04-25 01:15:45,929 [   scc.merge] INFO  
2025-04-25 01:15:45,929 [   scc.merge] INFO  Repository: ome/omero-figure
2025-04-25 01:15:45,929 [   scc.merge] INFO  Excluded PRs:
2025-04-25 01:15:45,929 [   scc.merge] INFO    - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-04-25 01:15:45,930 [   scc.merge] INFO    - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-04-25 01:15:45,930 [   scc.merge] INFO  Updating 9cc36cde..4f0362e2
2025-04-25 01:15:45,930 [   scc.merge] INFO  Previously merged:
2025-04-25 01:15:45,930 [   scc.merge] INFO    - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-25 01:15:45,930 [   scc.merge] INFO  
2025-04-25 01:15:45,930 [   scc.merge] INFO  Merged PRs:
2025-04-25 01:15:45,930 [   scc.merge] INFO    - PR 600 Rdornier 'Label on rois'
2025-04-25 01:15:45,930 [   scc.merge] INFO    - PR 605 Tom-TBT 'Colorbar feature'
2025-04-25 01:15:45,930 [   scc.merge] INFO    - PR 610 will-moore 'Add docs/contributing.rst'
2025-04-25 01:15:45,930 [   scc.merge] INFO    - PR 612 will-moore 'Script version'
2025-04-25 01:15:45,930 [   scc.merge] INFO    - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-04-25 01:15:45,930 [   scc.merge] INFO    - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-04-25 01:15:45,930 [   scc.merge] INFO    - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-04-25 01:15:45,930 [   scc.merge] INFO  
2025-04-25 01:15:45,930 [   scc.merge] INFO  Conflicting PRs (not included):
2025-04-25 01:15:45,930 [   scc.merge] INFO    - PR 616 Rdornier 'Fix labels around border'
2025-04-25 01:15:45,930 [   scc.merge] INFO    - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-04-25 01:15:45,930 [   scc.merge] INFO  
2025-04-25 01:15:45,930 [   scc.merge] INFO  Repository: ome/omero-fpbioimage
2025-04-25 01:15:45,930 [   scc.merge] INFO  Already up to date.
2025-04-25 01:15:45,930 [   scc.merge] INFO  
2025-04-25 01:15:45,930 [   scc.merge] INFO  Merged PRs:
2025-04-25 01:15:45,930 [   scc.merge] INFO    - PR 18 jburel 'default  size z value'
2025-04-25 01:15:45,930 [   scc.merge] INFO  
2025-04-25 01:15:45,930 [   scc.merge] INFO  Repository: ome/omero-gallery
2025-04-25 01:15:45,930 [   scc.merge] INFO  Already up to date.
2025-04-25 01:15:45,930 [   scc.merge] INFO  
2025-04-25 01:15:45,930 [   scc.merge] INFO  Merged PRs:
2025-04-25 01:15:45,930 [   scc.merge] INFO    - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-04-25 01:15:45,930 [   scc.merge] INFO    - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-04-25 01:15:45,930 [   scc.merge] INFO    - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-04-25 01:15:45,930 [   scc.merge] INFO    - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-04-25 01:15:45,930 [   scc.merge] INFO  
2025-04-25 01:15:45,930 [   scc.merge] INFO  Conflicting PRs (not included):
2025-04-25 01:15:45,930 [   scc.merge] INFO    - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-04-25 01:15:45,930 [   scc.merge] INFO    - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-04-25 01:15:45,930 [   scc.merge] INFO    - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-04-25 01:15:45,930 [   scc.merge] INFO  
2025-04-25 01:15:45,931 [   scc.merge] INFO  Repository: ome/omero-iviewer
2025-04-25 01:15:45,931 [   scc.merge] INFO  Excluded PRs:
2025-04-25 01:15:45,931 [   scc.merge] INFO    - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-04-25 01:15:45,931 [   scc.merge] INFO    - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-04-25 01:15:45,931 [   scc.merge] INFO    - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-04-25 01:15:45,931 [   scc.merge] INFO    - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-04-25 01:15:45,931 [   scc.merge] INFO    - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-04-25 01:15:45,931 [   scc.merge] INFO  Already up to date.
2025-04-25 01:15:45,931 [   scc.merge] INFO  
2025-04-25 01:15:45,931 [   scc.merge] INFO  Merged PRs:
2025-04-25 01:15:45,931 [   scc.merge] INFO    - PR 460 will-moore 'Channel min spinner fix'
2025-04-25 01:15:45,931 [   scc.merge] INFO    - PR 465 will-moore 'Save as Figure'
2025-04-25 01:15:45,931 [   scc.merge] INFO    - PR 471 will-moore 'Z projection disabled tooltip'
2025-04-25 01:15:45,931 [   scc.merge] INFO    - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-04-25 01:15:45,931 [   scc.merge] INFO    - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-25 01:15:45,931 [   scc.merge] INFO  
2025-04-25 01:15:45,931 [   scc.merge] INFO  Conflicting PRs (not included):
2025-04-25 01:15:45,931 [   scc.merge] INFO    - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-04-25 01:15:45,931 [   scc.merge] INFO  
2025-04-25 01:15:45,931 [   scc.merge] INFO  Repository: ome/omero-mapr
2025-04-25 01:15:45,931 [   scc.merge] INFO  Excluded PRs:
2025-04-25 01:15:45,931 [   scc.merge] INFO    - PR 79 will-moore 'Right panel title' (exclude comment)
2025-04-25 01:15:45,931 [   scc.merge] INFO  Already up to date.
2025-04-25 01:15:45,931 [   scc.merge] INFO  
2025-04-25 01:15:45,931 [   scc.merge] INFO  Merged PRs:
2025-04-25 01:15:45,931 [   scc.merge] INFO    - PR 74 will-moore 'mapr extension of webclient'
2025-04-25 01:15:45,931 [   scc.merge] INFO    - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-25 01:15:45,931 [   scc.merge] INFO  
2025-04-25 01:15:45,931 [   scc.merge] INFO  Repository: ome/omero-metadata
2025-04-25 01:15:45,931 [   scc.merge] INFO  Updating 3cd120c..55060a2
2025-04-25 01:15:45,931 [   scc.merge] INFO  Previously merged:
2025-04-25 01:15:45,931 [   scc.merge] INFO    - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-25 01:15:45,931 [   scc.merge] INFO  
2025-04-25 01:15:45,931 [   scc.merge] INFO  Conflicting PRs (not included):
2025-04-25 01:15:45,931 [   scc.merge] INFO    - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-25 01:15:45,931 [   scc.merge] INFO    - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-25 01:15:45,931 [   scc.merge] INFO  
2025-04-25 01:15:45,931 [   scc.merge] INFO  Repository: ome/omero-parade
2025-04-25 01:15:45,931 [   scc.merge] INFO  Excluded PRs:
2025-04-25 01:15:45,932 [   scc.merge] INFO    - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-04-25 01:15:45,932 [   scc.merge] INFO    - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-04-25 01:15:45,932 [   scc.merge] INFO    - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-04-25 01:15:45,932 [   scc.merge] INFO    - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-04-25 01:15:45,932 [   scc.merge] INFO  Already up to date.
2025-04-25 01:15:45,932 [   scc.merge] INFO  
2025-04-25 01:15:45,932 [   scc.merge] INFO  Merged PRs:
2025-04-25 01:15:45,932 [   scc.merge] INFO    - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-25 01:15:45,932 [   scc.merge] INFO    - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-25 01:15:45,932 [   scc.merge] INFO    - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-25 01:15:45,932 [   scc.merge] INFO  
2025-04-25 01:15:45,932 [   scc.merge] INFO  Repository: ome/omero-prometheus-tools
2025-04-25 01:15:45,932 [   scc.merge] INFO  Already up to date.
2025-04-25 01:15:45,932 [   scc.merge] INFO  
2025-04-25 01:15:45,932 [   scc.merge] INFO  
2025-04-25 01:15:45,932 [   scc.merge] INFO  Repository: ome/omero-rois
2025-04-25 01:15:45,932 [   scc.merge] INFO  Excluded PRs:
2025-04-25 01:15:45,932 [   scc.merge] INFO    - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-04-25 01:15:45,932 [   scc.merge] INFO    - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-25 01:15:45,932 [   scc.merge] INFO  Already up to date.
2025-04-25 01:15:45,932 [   scc.merge] INFO  
2025-04-25 01:15:45,932 [   scc.merge] INFO  
2025-04-25 01:15:45,932 [   scc.merge] INFO  Repository: ome/omero-signup
2025-04-25 01:15:45,932 [   scc.merge] INFO  Already up to date.
2025-04-25 01:15:45,932 [   scc.merge] INFO  
2025-04-25 01:15:45,932 [   scc.merge] INFO  Conflicting PRs (not included):
2025-04-25 01:15:45,932 [   scc.merge] INFO    - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-25 01:15:45,932 [   scc.merge] INFO  
2025-04-25 01:15:45,932 [   scc.merge] INFO  Repository: openmicroscopy/omero-test-infra
2025-04-25 01:15:45,932 [   scc.merge] INFO  Excluded PRs:
2025-04-25 01:15:45,932 [   scc.merge] INFO    - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-04-25 01:15:45,932 [   scc.merge] INFO    - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-04-25 01:15:45,932 [   scc.merge] INFO    - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-04-25 01:15:45,932 [   scc.merge] INFO  Already up to date.
2025-04-25 01:15:45,932 [   scc.merge] INFO  
2025-04-25 01:15:45,932 [   scc.merge] INFO  Merged PRs:
2025-04-25 01:15:45,932 [   scc.merge] INFO    - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-25 01:15:45,932 [   scc.merge] INFO    - PR 76 will-moore 'Run cli deps'
2025-04-25 01:15:45,933 [   scc.merge] INFO  
2025-04-25 01:15:45,933 [   scc.merge] INFO  Repository: ome/omero-upload
2025-04-25 01:15:45,933 [   scc.merge] INFO  Already up to date.
2025-04-25 01:15:45,933 [   scc.merge] INFO  
2025-04-25 01:15:45,933 [   scc.merge] INFO  
2025-04-25 01:15:45,933 [   scc.merge] INFO  Repository: ome/omero-virtual-microscope
2025-04-25 01:15:45,933 [   scc.merge] INFO  Already up to date.
2025-04-25 01:15:45,933 [   scc.merge] INFO  
2025-04-25 01:15:45,933 [   scc.merge] INFO  Merged PRs:
2025-04-25 01:15:45,933 [   scc.merge] INFO    - PR 20 jburel 'Build'
2025-04-25 01:15:45,933 [   scc.merge] INFO  
2025-04-25 01:15:45,933 [   scc.merge] INFO  Repository: ome/omero-web-zarr
2025-04-25 01:15:45,933 [   scc.merge] INFO  Excluded PRs:
2025-04-25 01:15:45,933 [   scc.merge] INFO    - PR 18 will-moore 'Build' (status: failure)
2025-04-25 01:15:45,933 [   scc.merge] INFO    - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-04-25 01:15:45,933 [   scc.merge] INFO  Already up to date.
2025-04-25 01:15:45,933 [   scc.merge] INFO  
2025-04-25 01:15:45,933 [   scc.merge] INFO  Conflicting PRs (not included):
2025-04-25 01:15:45,933 [   scc.merge] INFO    - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-25 01:15:45,933 [   scc.merge] INFO  
2025-04-25 01:15:45,933 [   scc.merge] INFO  Repository: openmicroscopy/omero-weberror
2025-04-25 01:15:45,933 [   scc.merge] INFO  Already up to date.
2025-04-25 01:15:45,933 [   scc.merge] INFO  
2025-04-25 01:15:45,933 [   scc.merge] INFO  
2025-04-25 01:15:45,933 [   scc.merge] INFO  Repository: openmicroscopy/omero-webtest
2025-04-25 01:15:45,933 [   scc.merge] INFO  Already up to date.
2025-04-25 01:15:45,933 [   scc.merge] INFO  
2025-04-25 01:15:45,933 [   scc.merge] INFO  
2025-04-25 01:15:45,933 [   scc.merge] INFO  Repository: ome/rOMERO-gateway
2025-04-25 01:15:45,933 [   scc.merge] INFO  Already up to date.
2025-04-25 01:15:45,933 [   scc.merge] INFO  
2025-04-25 01:15:45,933 [   scc.merge] INFO  Conflicting PRs (not included):
2025-04-25 01:15:45,933 [   scc.merge] INFO    - PR 100 dominikl 'Run tests properly'
2025-04-25 01:15:45,933 [   scc.merge] INFO  
2025-04-25 01:15:45,933 [   scc.merge] INFO  Repository: ome/scripts
2025-04-25 01:15:45,933 [   scc.merge] INFO  Excluded PRs:
2025-04-25 01:15:45,933 [   scc.merge] INFO    - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-04-25 01:15:45,933 [   scc.merge] INFO    - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-04-25 01:15:45,934 [   scc.merge] INFO  Updating 4b4c755..950b28b
2025-04-25 01:15:45,934 [   scc.merge] INFO  Previously merged:
2025-04-25 01:15:45,934 [   scc.merge] INFO    - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-04-25 01:15:45,934 [   scc.merge] INFO  
2025-04-25 01:15:45,934 [   scc.merge] INFO  Merged PRs:
2025-04-25 01:15:45,934 [   scc.merge] INFO    - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-25 01:15:45,934 [   scc.merge] INFO  
2025-04-25 01:15:45,934 [   scc.merge] INFO  Conflicting PRs (not included):
2025-04-25 01:15:45,934 [   scc.merge] INFO    - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-25 01:15:45,934 [   scc.merge] INFO  
2025-04-25 01:15:45,934 [   scc.merge] DEBUG Cleaning remote branches created for merging
2025-04-25 01:15:45,934 [     scc.git] DEBUG Calling 'git remote'
2025-04-25 01:15:45,936 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-04-25 01:15:45,936 [     scc.git] DEBUG Calling 'git remote'
2025-04-25 01:15:45,938 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:45,938 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-04-25 01:15:45,938 [     scc.git] DEBUG Calling 'git remote'
2025-04-25 01:15:45,940 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:45,940 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-04-25 01:15:45,940 [     scc.git] DEBUG Calling 'git remote'
2025-04-25 01:15:45,943 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:45,943 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-04-25 01:15:45,943 [     scc.git] DEBUG Calling 'git remote'
2025-04-25 01:15:45,945 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:45,945 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-04-25 01:15:45,945 [     scc.git] DEBUG Calling 'git remote'
2025-04-25 01:15:45,947 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:45,947 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-04-25 01:15:45,947 [     scc.git] DEBUG Calling 'git remote'
2025-04-25 01:15:45,949 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:45,949 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-04-25 01:15:45,949 [     scc.git] DEBUG Calling 'git remote'
2025-04-25 01:15:45,951 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:45,952 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-04-25 01:15:45,952 [     scc.git] DEBUG Calling 'git remote'
2025-04-25 01:15:45,954 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:45,954 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-25 01:15:45,954 [     scc.git] DEBUG Calling 'git remote'
2025-04-25 01:15:45,956 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:45,956 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-25 01:15:45,956 [     scc.git] DEBUG Calling 'git remote'
2025-04-25 01:15:45,958 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:45,958 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-25 01:15:45,958 [     scc.git] DEBUG Calling 'git remote'
2025-04-25 01:15:45,960 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:45,960 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-25 01:15:45,960 [     scc.git] DEBUG Calling 'git remote'
2025-04-25 01:15:45,963 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:45,963 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-25 01:15:45,963 [     scc.git] DEBUG Calling 'git remote'
2025-04-25 01:15:45,965 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:45,965 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-25 01:15:45,965 [     scc.git] DEBUG Calling 'git remote'
2025-04-25 01:15:45,967 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:45,967 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-25 01:15:45,967 [     scc.git] DEBUG Calling 'git remote'
2025-04-25 01:15:45,969 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:45,969 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-25 01:15:45,969 [     scc.git] DEBUG Calling 'git remote'
2025-04-25 01:15:45,971 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:45,971 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-25 01:15:45,971 [     scc.git] DEBUG Calling 'git remote'
2025-04-25 01:15:45,973 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:45,974 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-25 01:15:45,974 [     scc.git] DEBUG Calling 'git remote'
2025-04-25 01:15:45,976 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:45,976 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-25 01:15:45,976 [     scc.git] DEBUG Calling 'git remote'
2025-04-25 01:15:45,978 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:45,978 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-25 01:15:45,978 [     scc.git] DEBUG Calling 'git remote'
2025-04-25 01:15:45,980 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:45,980 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-25 01:15:45,980 [     scc.git] DEBUG Calling 'git remote'
2025-04-25 01:15:45,982 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-25 01:15:45,982 [     scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-25 01:15:45,982 [     scc.git] DEBUG Calling 'git remote'
2025-04-25 01:15:45,984 [     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 23d2edd] 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 9172fa7] Update component versions
 1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-04-25 01:16:35,059 [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-04-25 01:16:44,744 [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-04-25 01:16:47,333 [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-04-25 01:16:52,249 [github.Reque] INFO  Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-25 01:17:35,697 [    scc.push] INFO  Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS