Skipping 220 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-05-19 17:30:48,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-05-19 17:30:49,148 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:30:49,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-05-19 17:30:49,703 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:30:49,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-19 17:30:50,246 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:30:50,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-19 17:30:50,726 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:30:51,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-05-19 17:30:51,317 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:30:51,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-05-19 17:30:51,526 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-19 17:30:51,777 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:30:52,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-05-19 17:30:52,290 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:30:52,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-05-19 17:30:52,882 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:30:53,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-19 17:30:53,615 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:30:53,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-19 17:30:54,106 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:30:54,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-05-19 17:30:54,573 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:30:54,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-05-19 17:30:54,744 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-05-19 17:30:54,744 [ scc.repo] DEBUG ## Branches found:
2025-05-19 17:30:54,744 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-19 17:30:54,744 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:30:54,744 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:30:54,747 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-19 17:30:54,749 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 17:30:54,749 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-19 17:30:54,753 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-19 17:30:54,756 [ scc.git] DEBUG Already up to date.
2025-05-19 17:30:54,756 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-05-19 17:30:55,073 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-19 17:30:55,073 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-05-19 17:30:55,078 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-05-19 17:30:55,378 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-05-19 17:30:55,378 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-05-19 17:30:55,383 [ scc.git] DEBUG ## Unique users: []
2025-05-19 17:30:55,383 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:30:55,383 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:30:55,386 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-19 17:30:55,390 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:30:55,392 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-05-19 17:30:55,402 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-19 17:30:55,405 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-05-19 17:30:55,405 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-05-19 17:30:55,405 [ scc.git] DEBUG requirements.txt | 2 +-
2025-05-19 17:30:55,405 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-05-19 17:30:55,405 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-05-19 17:30:55,405 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-05-19 17:30:55,407 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:30:55,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:30:55,576 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-05-19 17:30:55,581 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:30:55,584 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 94 (Use the release/v1 branch for the PyPA action publishing to PyPI) 1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-05-19 17:30:55,594 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-19 17:30:55,596 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-19 17:30:55,596 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-19 17:30:55,827 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:30:55,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:30:55,995 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 17:30:56,038 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:30:56,038 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:30:56,040 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 17:30:56,079 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 17:30:56,083 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0868b23810> has no local changes
2025-05-19 17:30:56,083 [ 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#429 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/)'
2025-05-19 17:30:56,115 [ scc.git] DEBUG [detached HEAD ac2f728] merge master -Dorg -Ssuccess-only
2025-05-19 17:30:56,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:30:56,115 [ scc.repo] DEBUG ## PRs found:
2025-05-19 17:30:56,246 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:30:56,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-05-19 17:30:56,835 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:30:57,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-05-19 17:30:57,344 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:30:57,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-05-19 17:30:57,951 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:30:58,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-19 17:30:58,494 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:30:58,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-19 17:30:59,011 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:30:59,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-05-19 17:30:59,577 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:30:59,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-05-19 17:30:59,760 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-19 17:31:00,012 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:00,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-05-19 17:31:00,505 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:00,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-05-19 17:31:01,014 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:01,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-19 17:31:01,699 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:01,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-19 17:31:02,174 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:02,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-05-19 17:31:02,726 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:02,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-05-19 17:31:02,929 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-19 17:31:02,929 [ scc.repo] DEBUG ## Branches found:
2025-05-19 17:31:02,929 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-19 17:31:02,929 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:02,929 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:02,932 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-19 17:31:02,934 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 17:31:02,934 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-19 17:31:02,938 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-19 17:31:02,946 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-05-19 17:31:03,180 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:03,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-05-19 17:31:03,637 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-05-19 17:31:04,209 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-19 17:31:04,209 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-05-19 17:31:04,215 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-05-19 17:31:04,844 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-05-19 17:31:04,844 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-05-19 17:31:04,849 [ scc.git] DEBUG ## Unique users: []
2025-05-19 17:31:04,849 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:04,849 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:04,851 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-19 17:31:04,856 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:04,858 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-19 17:31:05,018 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-05-19 17:31:05,018 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-05-19 17:31:05,018 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-19 17:31:05,018 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-19 17:31:05,018 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-19 17:31:05,019 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-19 17:31:05,022 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-19 17:31:05,026 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-19 17:31:05,028 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:05,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:31:05,203 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-05-19 17:31:05,209 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-19 17:31:05,302 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#429](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-05-19 17:31:05,304 [ scc.config] DEBUG Found github.token
2025-05-19 17:31:05,304 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-05-19 17:31:05,304 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-19 17:31:05,309 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:05,311 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-19 17:31:05,454 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-05-19 17:31:05,454 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-05-19 17:31:05,454 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-05-19 17:31:05,455 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-19 17:31:05,455 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-19 17:31:05,459 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-19 17:31:05,465 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-05-19 17:31:05,466 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:05,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:31:05,632 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-05-19 17:31:05,637 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-05-19 17:31:05,641 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#429](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2025-05-19 17:31:05,643 [ scc.config] DEBUG Found github.token
2025-05-19 17:31:05,643 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-05-19 17:31:05,643 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 17:31:05,684 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:05,684 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:05,686 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 17:31:05,724 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 17:31:05,729 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0868a12610> has no local changes
2025-05-19 17:31:05,729 [ 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#429 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/)'
2025-05-19 17:31:05,736 [ scc.git] DEBUG [detached HEAD e0e6d6b] merge master -Dorg -Ssuccess-only
2025-05-19 17:31:05,737 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:31:05,737 [ scc.repo] DEBUG ## PRs found:
2025-05-19 17:31:05,883 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:06,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-05-19 17:31:06,482 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:06,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-05-19 17:31:06,985 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:07,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-19 17:31:07,516 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:07,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-19 17:31:08,027 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:08,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-19 17:31:08,525 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:08,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-05-19 17:31:09,094 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:09,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-05-19 17:31:09,299 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-19 17:31:09,550 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:09,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-05-19 17:31:09,799 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-19 17:31:10,050 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:10,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-19 17:31:10,624 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:10,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-19 17:31:11,221 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:11,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-19 17:31:11,781 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:12,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-05-19 17:31:12,377 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:12,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-05-19 17:31:12,568 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-19 17:31:12,819 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:13,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-05-19 17:31:13,095 [ scc.repo] DEBUG # ... Include label: dependencies
2025-05-19 17:31:13,347 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:13,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-19 17:31:13,917 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:14,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-19 17:31:14,434 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:14,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-19 17:31:15,018 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:15,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-05-19 17:31:15,619 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:15,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-05-19 17:31:15,847 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-19 17:31:16,098 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:16,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-05-19 17:31:16,627 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:16,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-05-19 17:31:17,133 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:17,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-05-19 17:31:17,631 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:17,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-05-19 17:31:18,106 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:18,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-05-19 17:31:18,637 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:18,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-05-19 17:31:19,120 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:19,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-05-19 17:31:19,477 [ scc.repo] DEBUG ## Branches found:
2025-05-19 17:31:19,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-19 17:31:19,477 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:19,477 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:19,480 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-19 17:31:19,483 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 17:31:19,483 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-19 17:31:19,486 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-19 17:31:19,489 [ scc.git] DEBUG Already up to date.
2025-05-19 17:31:19,489 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-05-19 17:31:19,828 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-19 17:31:19,828 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-05-19 17:31:19,833 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-05-19 17:31:20,109 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-19 17:31:20,109 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-05-19 17:31:20,114 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-05-19 17:31:20,387 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-05-19 17:31:20,387 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-05-19 17:31:20,392 [ scc.git] DEBUG ## Unique users: []
2025-05-19 17:31:20,392 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:20,392 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:20,395 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-05-19 17:31:20,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:20,400 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 140 (Bump vite from 4.2.3 to 4.5.9) 6301bc61b0a877104173846d526382bf15cc70a0'
2025-05-19 17:31:20,408 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-19 17:31:20,412 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-05-19 17:31:20,412 [ scc.git] DEBUG package.json | 2 +-
2025-05-19 17:31:20,412 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-05-19 17:31:20,413 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:20,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:31:20,572 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-05-19 17:31:20,576 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:20,578 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 141 (Bump axios from 1.6.0 to 1.8.2) de7db17cd62b498179713df276cff151a1f36d80'
2025-05-19 17:31:20,589 [ scc.git] DEBUG Auto-merging package-lock.json
2025-05-19 17:31:20,589 [ scc.git] DEBUG Auto-merging package.json
2025-05-19 17:31:20,590 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-19 17:31:20,593 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-05-19 17:31:20,593 [ scc.git] DEBUG package.json | 2 +-
2025-05-19 17:31:20,593 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-05-19 17:31:20,823 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:20,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:31:20,985 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-05-19 17:31:20,989 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:20,992 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 142 (Use the release/v1 branch for the PyPA action publishing to PyPI) 16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-05-19 17:31:21,018 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-19 17:31:21,021 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-05-19 17:31:21,021 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-05-19 17:31:21,237 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:21,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:31:21,405 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 17:31:21,448 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:21,448 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:21,450 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 17:31:21,490 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 17:31:21,494 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0868104b50> has no local changes
2025-05-19 17:31:21,494 [ 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#429 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/)'
2025-05-19 17:31:21,501 [ scc.git] DEBUG [detached HEAD 1250a43] merge master -Dorg -Ssuccess-only
2025-05-19 17:31:21,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:31:21,501 [ scc.repo] DEBUG ## PRs found:
2025-05-19 17:31:21,656 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:21,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-05-19 17:31:21,867 [ scc.repo] DEBUG ## Branches found:
2025-05-19 17:31:21,867 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-19 17:31:21,867 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:21,867 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:21,870 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-19 17:31:21,872 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 17:31:21,872 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-19 17:31:21,875 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-19 17:31:21,878 [ scc.git] DEBUG Already up to date.
2025-05-19 17:31:21,878 [ scc.git] DEBUG ## Unique users: []
2025-05-19 17:31:21,878 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:21,878 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:21,881 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 17:31:21,920 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:21,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:21,923 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 17:31:21,962 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 17:31:21,965 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0868b13750> has no local changes
2025-05-19 17:31:21,965 [ 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#429 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/)'
2025-05-19 17:31:21,972 [ scc.git] DEBUG [detached HEAD 9caa05c] merge master -Dorg -Ssuccess-only
2025-05-19 17:31:21,973 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:31:21,973 [ scc.repo] DEBUG ## PRs found:
2025-05-19 17:31:22,118 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:22,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-05-19 17:31:22,650 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:22,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-05-19 17:31:23,171 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:23,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-05-19 17:31:23,673 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:23,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-05-19 17:31:23,906 [ scc.repo] DEBUG ## Branches found:
2025-05-19 17:31:23,906 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-19 17:31:23,906 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:23,906 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:23,909 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-19 17:31:23,912 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 17:31:23,912 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-19 17:31:23,915 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-19 17:31:23,918 [ scc.git] DEBUG Already up to date.
2025-05-19 17:31:23,918 [ scc.git] DEBUG ## Unique users: []
2025-05-19 17:31:23,918 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:23,918 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:23,920 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 17:31:23,960 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:23,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:23,962 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 17:31:24,002 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 17:31:24,006 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08681132d0> has no local changes
2025-05-19 17:31:24,006 [ 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#429 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/)'
2025-05-19 17:31:24,012 [ scc.git] DEBUG [detached HEAD 1162f69] merge master -Dorg -Ssuccess-only
2025-05-19 17:31:24,013 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:31:24,013 [ scc.repo] DEBUG ## PRs found:
2025-05-19 17:31:24,157 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:24,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-05-19 17:31:24,718 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:24,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-05-19 17:31:25,210 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:25,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-05-19 17:31:25,672 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:25,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-19 17:31:26,249 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:26,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-19 17:31:26,719 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:27,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-05-19 17:31:27,319 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:27,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-05-19 17:31:27,530 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-19 17:31:27,530 [ scc.repo] DEBUG ## Branches found:
2025-05-19 17:31:27,530 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-19 17:31:27,530 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:27,530 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:27,533 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-19 17:31:27,535 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 17:31:27,535 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-19 17:31:27,538 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-19 17:31:27,541 [ scc.git] DEBUG Already up to date.
2025-05-19 17:31:27,542 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-05-19 17:31:27,925 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-05-19 17:31:27,925 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-05-19 17:31:27,930 [ scc.git] DEBUG ## Unique users: []
2025-05-19 17:31:27,930 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:27,930 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:27,932 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-19 17:31:27,936 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:27,938 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-19 17:31:28,135 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-05-19 17:31:28,135 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-05-19 17:31:28,135 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-05-19 17:31:28,135 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-05-19 17:31:28,135 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-05-19 17:31:28,135 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-05-19 17:31:28,135 [ scc.git] DEBUG Auto-merging setup.py
2025-05-19 17:31:28,135 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-05-19 17:31:28,135 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-19 17:31:28,136 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-19 17:31:28,139 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-19 17:31:28,144 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-05-19 17:31:28,145 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:28,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:31:28,303 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-05-19 17:31:28,307 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-05-19 17:31:28,425 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#429](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/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-05-19 17:31:28,428 [ scc.config] DEBUG Found github.token
2025-05-19 17:31:28,428 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-05-19 17:31:28,428 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 17:31:28,468 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:28,468 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:28,471 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 17:31:28,512 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 17:31:28,516 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0868b13650> has no local changes
2025-05-19 17:31:28,516 [ 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#429 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/)'
2025-05-19 17:31:28,523 [ scc.git] DEBUG [detached HEAD eb5c7d5] merge master -Dorg -Ssuccess-only
2025-05-19 17:31:28,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:31:28,523 [ scc.repo] DEBUG ## PRs found:
2025-05-19 17:31:28,554 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:28,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-05-19 17:31:29,122 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:29,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-05-19 17:31:29,621 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:29,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-19 17:31:30,197 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:30,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-19 17:31:30,722 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:31,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-19 17:31:31,259 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:31,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-05-19 17:31:31,760 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:31,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6?per_page=1 HTTP/1.1" 200 2
2025-05-19 17:31:31,968 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-05-19 17:31:32,220 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:32,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-05-19 17:31:32,725 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:32,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-05-19 17:31:33,203 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:33,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-05-19 17:31:33,749 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:34,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-19 17:31:34,253 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:34,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-19 17:31:34,764 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:34,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-05-19 17:31:35,249 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:35,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-05-19 17:31:35,724 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:35,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-05-19 17:31:36,232 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:36,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-05-19 17:31:36,698 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:36,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-19 17:31:37,215 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:37,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-19 17:31:37,699 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:37,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-05-19 17:31:38,156 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:38,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2025-05-19 17:31:38,332 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-19 17:31:38,332 [ scc.repo] DEBUG ## Branches found:
2025-05-19 17:31:38,332 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-19 17:31:38,332 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:38,332 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:38,335 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-19 17:31:38,338 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 17:31:38,338 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-19 17:31:38,341 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-19 17:31:38,344 [ scc.git] DEBUG Already up to date.
2025-05-19 17:31:38,344 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-05-19 17:31:38,640 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-19 17:31:38,641 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-05-19 17:31:38,645 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-05-19 17:31:38,924 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-05-19 17:31:38,924 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-05-19 17:31:38,929 [ scc.git] DEBUG ## Unique users: []
2025-05-19 17:31:38,929 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:38,929 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:38,931 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-05-19 17:31:38,936 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:38,938 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2025-05-19 17:31:39,085 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-19 17:31:39,089 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-05-19 17:31:39,089 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-05-19 17:31:39,089 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-05-19 17:31:39,089 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-05-19 17:31:39,089 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-05-19 17:31:39,089 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-05-19 17:31:39,089 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-05-19 17:31:39,089 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-05-19 17:31:39,090 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-05-19 17:31:39,090 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-05-19 17:31:39,090 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:39,090 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-05-19 17:31:39,091 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-05-19 17:31:39,091 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-05-19 17:31:39,091 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-05-19 17:31:39,091 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-05-19 17:31:39,091 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-05-19 17:31:39,091 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-05-19 17:31:39,091 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-05-19 17:31:39,091 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-05-19 17:31:39,091 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-05-19 17:31:39,091 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-05-19 17:31:39,091 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-05-19 17:31:39,091 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-05-19 17:31:39,091 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-05-19 17:31:39,091 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-05-19 17:31:39,091 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-05-19 17:31:39,091 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-05-19 17:31:39,091 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-05-19 17:31:39,091 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-05-19 17:31:39,091 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-05-19 17:31:39,091 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-05-19 17:31:39,091 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-05-19 17:31:39,091 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-05-19 17:31:39,091 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-05-19 17:31:39,091 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-05-19 17:31:39,091 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-05-19 17:31:39,091 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-05-19 17:31:39,091 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-05-19 17:31:39,091 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-05-19 17:31:39,091 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-05-19 17:31:39,091 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-05-19 17:31:39,092 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-05-19 17:31:39,092 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-05-19 17:31:39,092 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-05-19 17:31:39,092 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-05-19 17:31:39,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:31:39,269 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-19 17:31:39,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:39,276 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-05-19 17:31:39,526 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-19 17:31:39,529 [ scc.git] DEBUG docker | 1 +
2025-05-19 17:31:39,529 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-05-19 17:31:39,531 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:39,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:31:39,703 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 17:31:39,744 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:39,744 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:39,747 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 17:31:39,786 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 17:31:39,791 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0868159610> has no local changes
2025-05-19 17:31:39,791 [ 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#429 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/)'
2025-05-19 17:31:39,799 [ scc.git] DEBUG [detached HEAD aa6fb0f] merge master -Dorg -Ssuccess-only
2025-05-19 17:31:39,799 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:31:39,799 [ scc.repo] DEBUG ## PRs found:
2025-05-19 17:31:39,954 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:40,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-05-19 17:31:40,167 [ scc.repo] DEBUG ## Branches found:
2025-05-19 17:31:40,167 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-19 17:31:40,167 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:40,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:40,170 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-19 17:31:40,172 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 17:31:40,173 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-19 17:31:40,175 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-19 17:31:40,178 [ scc.git] DEBUG Already up to date.
2025-05-19 17:31:40,178 [ scc.git] DEBUG ## Unique users: []
2025-05-19 17:31:40,178 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:40,179 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:40,181 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 17:31:40,220 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:40,220 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:40,222 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 17:31:40,261 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 17:31:40,264 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f086811a390> has no local changes
2025-05-19 17:31:40,264 [ 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#429 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/)'
2025-05-19 17:31:40,271 [ scc.git] DEBUG [detached HEAD 1a5e226] merge master -Dorg -Ssuccess-only
2025-05-19 17:31:40,271 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:31:40,271 [ scc.repo] DEBUG ## PRs found:
2025-05-19 17:31:40,418 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:40,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-05-19 17:31:40,934 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:41,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/21 HTTP/1.1" 200 None
2025-05-19 17:31:41,436 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:41,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/8e63305c98c9fc79b613b09473d00ec66d7b7fe8 HTTP/1.1" 200 None
2025-05-19 17:31:41,975 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:42,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/8e63305c98c9fc79b613b09473d00ec66d7b7fe8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-19 17:31:42,471 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:42,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/8e63305c98c9fc79b613b09473d00ec66d7b7fe8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-19 17:31:42,968 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:43,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-05-19 17:31:43,462 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:43,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-05-19 17:31:43,934 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:44,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-19 17:31:44,451 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:44,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-19 17:31:44,967 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:45,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-19 17:31:45,449 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:45,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-05-19 17:31:45,971 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:46,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-05-19 17:31:46,163 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-05-19 17:31:46,163 [ scc.repo] DEBUG ## Branches found:
2025-05-19 17:31:46,163 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-19 17:31:46,163 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:46,163 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:46,166 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-19 17:31:46,169 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 17:31:46,169 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-19 17:31:46,171 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-19 17:31:46,174 [ scc.git] DEBUG Already up to date.
2025-05-19 17:31:46,175 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-05-19 17:31:46,542 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-05-19 17:31:46,542 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-05-19 17:31:46,547 [ scc.git] DEBUG ## Unique users: []
2025-05-19 17:31:46,547 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:46,547 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:46,549 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-05-19 17:31:46,553 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:46,555 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-05-19 17:31:46,573 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-19 17:31:46,576 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-05-19 17:31:46,576 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-05-19 17:31:46,576 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-05-19 17:31:46,576 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-05-19 17:31:46,576 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-05-19 17:31:46,577 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:46,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:31:46,748 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 17:31:46,788 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:46,789 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:46,791 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 17:31:46,831 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 17:31:46,834 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f086afd1bd0> has no local changes
2025-05-19 17:31:46,835 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-virtual-microscope
Excluded PRs:
- PR 21 pwalczysko 'Test' (status: failure)
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Generated by OMERO-plugins-push#429 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/)'
2025-05-19 17:31:46,841 [ scc.git] DEBUG [detached HEAD 0228bb5] merge master -Dorg -Ssuccess-only
2025-05-19 17:31:46,841 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:31:46,841 [ scc.git] INFO Overriding base-branch from master to main
2025-05-19 17:31:46,841 [ scc.repo] DEBUG ## PRs found:
2025-05-19 17:31:46,999 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:47,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-05-19 17:31:47,576 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:47,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-05-19 17:31:48,076 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:48,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-05-19 17:31:48,611 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:48,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-05-19 17:31:49,171 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:49,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-19 17:31:49,690 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:49,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-19 17:31:50,184 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:50,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-05-19 17:31:50,682 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:50,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-05-19 17:31:51,191 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:51,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-05-19 17:31:51,671 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:51,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-19 17:31:52,193 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:52,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-19 17:31:52,656 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:52,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-05-19 17:31:53,113 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:53,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-05-19 17:31:53,299 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-19 17:31:53,300 [ scc.repo] DEBUG ## Branches found:
2025-05-19 17:31:53,300 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-19 17:31:53,300 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:53,300 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:53,303 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-05-19 17:31:53,305 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 17:31:53,305 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-05-19 17:31:53,308 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-05-19 17:31:53,311 [ scc.git] DEBUG Already up to date.
2025-05-19 17:31:53,311 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-05-19 17:31:53,655 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-05-19 17:31:53,655 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-05-19 17:31:53,660 [ scc.git] DEBUG ## Unique users: []
2025-05-19 17:31:53,660 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:53,660 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:53,663 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-19 17:31:53,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:53,668 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-19 17:31:53,676 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-05-19 17:31:53,676 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-05-19 17:31:53,677 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-19 17:31:53,677 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-19 17:31:53,680 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-19 17:31:53,684 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-05-19 17:31:53,685 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:53,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:31:53,858 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-05-19 17:31:53,862 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-05-19 17:31:53,864 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#429](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-05-19 17:31:53,867 [ scc.config] DEBUG Found github.token
2025-05-19 17:31:53,867 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-05-19 17:31:53,867 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 17:31:53,909 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:53,909 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:53,911 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 17:31:53,950 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 17:31:53,954 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0868bd6a50> has no local changes
2025-05-19 17:31:53,954 [ 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#429 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/)'
2025-05-19 17:31:53,961 [ scc.git] DEBUG [detached HEAD bd54ab8] merge master -Dorg -Ssuccess-only
2025-05-19 17:31:53,961 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:31:53,961 [ scc.repo] DEBUG ## PRs found:
2025-05-19 17:31:54,109 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:54,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-05-19 17:31:54,339 [ scc.repo] DEBUG ## Branches found:
2025-05-19 17:31:54,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-19 17:31:54,340 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:54,340 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:54,343 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-19 17:31:54,345 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 17:31:54,345 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-19 17:31:54,348 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-19 17:31:54,351 [ scc.git] DEBUG Already up to date.
2025-05-19 17:31:54,351 [ scc.git] DEBUG ## Unique users: []
2025-05-19 17:31:54,351 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:54,351 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:54,354 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 17:31:54,393 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:54,393 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:54,395 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 17:31:54,432 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 17:31:54,436 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f08680f6ad0> has no local changes
2025-05-19 17:31:54,436 [ 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#429 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/)'
2025-05-19 17:31:54,442 [ scc.git] DEBUG [detached HEAD f01cb78] merge master -Dorg -Ssuccess-only
2025-05-19 17:31:54,442 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:31:54,442 [ scc.repo] DEBUG ## PRs found:
2025-05-19 17:31:54,591 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:54,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-05-19 17:31:54,824 [ scc.repo] DEBUG ## Branches found:
2025-05-19 17:31:54,824 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-19 17:31:54,825 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:54,825 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:54,827 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-19 17:31:54,830 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 17:31:54,830 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-19 17:31:54,833 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-19 17:31:54,836 [ scc.git] DEBUG Already up to date.
2025-05-19 17:31:54,836 [ scc.git] DEBUG ## Unique users: []
2025-05-19 17:31:54,836 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:54,836 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:54,838 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 17:31:54,879 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:54,879 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:54,882 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 17:31:54,920 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 17:31:54,924 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f086817b890> has no local changes
2025-05-19 17:31:54,924 [ 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#429 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/)'
2025-05-19 17:31:54,930 [ scc.git] DEBUG [detached HEAD cb5d70e] merge master -Dorg -Ssuccess-only
2025-05-19 17:31:54,930 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:31:54,930 [ scc.repo] DEBUG ## PRs found:
2025-05-19 17:31:55,076 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:55,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-05-19 17:31:55,576 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:55,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-05-19 17:31:56,083 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:56,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-05-19 17:31:56,582 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:56,873 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-19 17:31:57,125 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:57,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-19 17:31:57,616 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:57,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-05-19 17:31:58,077 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:58,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-05-19 17:31:58,279 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-05-19 17:31:58,279 [ scc.repo] DEBUG ## Branches found:
2025-05-19 17:31:58,279 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-19 17:31:58,279 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:58,280 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:58,282 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-05-19 17:31:58,285 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 17:31:58,285 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-05-19 17:31:58,288 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-05-19 17:31:58,291 [ scc.git] DEBUG Already up to date.
2025-05-19 17:31:58,291 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-05-19 17:31:58,676 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-05-19 17:31:58,676 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-05-19 17:31:58,681 [ scc.git] DEBUG ## Unique users: []
2025-05-19 17:31:58,681 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:58,681 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:58,683 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-19 17:31:58,686 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:58,689 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-19 17:31:58,809 [ scc.git] DEBUG Auto-merging Dockerfile
2025-05-19 17:31:58,809 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-05-19 17:31:58,810 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-19 17:31:58,810 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-19 17:31:58,813 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-19 17:31:58,818 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-05-19 17:31:58,819 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:58,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:31:58,978 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-05-19 17:31:58,982 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-05-19 17:31:58,985 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#429](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-05-19 17:31:58,987 [ scc.config] DEBUG Found github.token
2025-05-19 17:31:58,987 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-05-19 17:31:58,987 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 17:31:59,028 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:31:59,028 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:31:59,031 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 17:31:59,071 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 17:31:59,075 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0868bcb990> has no local changes
2025-05-19 17:31:59,075 [ 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#429 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/)'
2025-05-19 17:31:59,081 [ scc.git] DEBUG [detached HEAD b2057ed] merge master -Dorg -Ssuccess-only
2025-05-19 17:31:59,082 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:31:59,082 [ scc.git] INFO Overriding base-branch from master to develop
2025-05-19 17:31:59,082 [ scc.repo] DEBUG ## PRs found:
2025-05-19 17:31:59,229 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:31:59,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-05-19 17:31:59,852 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:00,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-05-19 17:32:00,337 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:00,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-05-19 17:32:00,823 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:01,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-19 17:32:01,344 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:01,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-19 17:32:01,821 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:02,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-05-19 17:32:02,318 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:03,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-05-19 17:32:03,812 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:03,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-05-19 17:32:03,991 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-19 17:32:04,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:04,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-05-19 17:32:04,728 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:04,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-05-19 17:32:05,232 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:05,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-19 17:32:05,784 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:05,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-05-19 17:32:06,244 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:06,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-05-19 17:32:06,734 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:06,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-05-19 17:32:06,928 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-19 17:32:07,179 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:07,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-05-19 17:32:07,696 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:08,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-05-19 17:32:08,260 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:08,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-05-19 17:32:08,769 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:09,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-05-19 17:32:09,058 [ scc.repo] DEBUG ## Branches found:
2025-05-19 17:32:09,058 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-19 17:32:09,058 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:32:09,058 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:32:09,061 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-05-19 17:32:09,064 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-05-19 17:32:09,064 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-05-19 17:32:09,067 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-05-19 17:32:09,076 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-05-19 17:32:09,308 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:09,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-05-19 17:32:09,770 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-05-19 17:32:10,097 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-19 17:32:10,097 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-05-19 17:32:10,102 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-05-19 17:32:10,375 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-05-19 17:32:10,375 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-05-19 17:32:10,380 [ scc.git] DEBUG ## Unique users: []
2025-05-19 17:32:10,380 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:32:10,380 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:32:10,382 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-19 17:32:10,388 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:32:10,390 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-19 17:32:10,500 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-05-19 17:32:10,501 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-05-19 17:32:10,501 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-05-19 17:32:10,504 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-19 17:32:10,508 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-05-19 17:32:10,510 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:10,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:32:10,679 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-05-19 17:32:10,686 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-05-19 17:32:10,690 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#429](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-05-19 17:32:10,692 [ scc.config] DEBUG Found github.token
2025-05-19 17:32:10,692 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-05-19 17:32:10,692 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-05-19 17:32:10,697 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:32:10,699 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-05-19 17:32:10,709 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-05-19 17:32:10,712 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-05-19 17:32:10,712 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-05-19 17:32:10,931 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:11,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:32:11,094 [ scc.git] DEBUG Calling 'git submodule update'
2025-05-19 17:32:11,135 [ scc.git] DEBUG Get sha1 of %s
2025-05-19 17:32:11,135 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-05-19 17:32:11,137 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 17:32:11,175 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 17:32:11,179 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f086817f5d0> has no local changes
2025-05-19 17:32:11,179 [ 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#429 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/)'
2025-05-19 17:32:11,185 [ scc.git] DEBUG [detached HEAD eb2d7af] merge master -Dorg -Ssuccess-only
2025-05-19 17:32:11,186 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:32:11,186 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-05-19 17:32:11,265 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-05-19 17:32:11,345 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:11,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:32:11,509 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-05-19 17:32:11,511 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-05-19 17:32:11,754 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:11,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:32:11,934 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-05-19 17:32:11,936 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-05-19 17:32:12,180 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:12,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:32:12,349 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-05-19 17:32:12,352 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-05-19 17:32:12,595 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:12,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:32:12,771 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-05-19 17:32:13,015 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:13,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:32:13,184 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-05-19 17:32:13,186 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-05-19 17:32:13,430 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:13,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:32:13,581 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-05-19 17:32:13,583 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-05-19 17:32:13,827 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:13,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:32:13,996 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-05-19 17:32:13,998 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-05-19 17:32:14,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:14,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:32:14,417 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-05-19 17:32:14,419 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-05-19 17:32:14,663 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:14,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:32:14,825 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-05-19 17:32:14,827 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-05-19 17:32:15,071 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:15,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:32:15,243 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-05-19 17:32:15,245 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-05-19 17:32:15,489 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:15,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:32:15,659 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-05-19 17:32:15,661 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-05-19 17:32:15,905 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:16,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:32:16,093 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-05-19 17:32:16,095 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-05-19 17:32:16,339 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:16,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:32:16,506 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-05-19 17:32:16,750 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:16,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:32:16,936 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-05-19 17:32:17,179 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:17,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:32:17,356 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-05-19 17:32:17,358 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-05-19 17:32:17,602 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:17,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:32:17,776 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-05-19 17:32:18,020 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:18,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:32:18,203 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-05-19 17:32:18,447 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:18,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:32:18,617 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-05-19 17:32:18,619 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-05-19 17:32:18,863 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:19,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:32:19,039 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-05-19 17:32:19,041 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-05-19 17:32:19,285 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:19,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:32:19,456 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-05-19 17:32:19,458 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-05-19 17:32:19,702 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:19,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:32:19,918 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-05-19 17:32:19,920 [ scc.config] DEBUG Found submodule.scripts.url
2025-05-19 17:32:20,164 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-05-19 17:32:20,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-05-19 17:32:20,324 [ scc.config] DEBUG Found submodule.scripts.branch
2025-05-19 17:32:20,324 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-05-19 17:32:20,418 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0868cd6310> has local changes
2025-05-19 17:32:20,418 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
- PR 71 dominikl 'Escape slash character in image names'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 167 dominikl 'Add extinfo command' (status: failure)
- 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'
Repository: ome/omero-figure
Excluded PRs:
- PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
- PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..3e8fa730
Previously merged:
- PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
- PR 635 dependabot[bot] 'Bump esbuild and vite'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
- PR 76 will-moore 'Run cli deps'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Excluded PRs:
- PR 21 pwalczysko 'Test' (status: failure)
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#429 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/429/)'
2025-05-19 17:32:20,516 [ scc.git] DEBUG [detached HEAD 0cba22d] merge master -Dorg -Ssuccess-only
2025-05-19 17:32:20,516 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-05-19 17:32:20,516 [ scc.merge] INFO Repository: ome/omero-plugins
2025-05-19 17:32:20,516 [ scc.merge] INFO Already up to date.
2025-05-19 17:32:20,516 [ scc.merge] INFO
2025-05-19 17:32:20,516 [ scc.merge] INFO Merged PRs:
2025-05-19 17:32:20,516 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-05-19 17:32:20,516 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-05-19 17:32:20,516 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-05-19 17:32:20,516 [ scc.merge] INFO
2025-05-19 17:32:20,516 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-05-19 17:32:20,517 [ scc.merge] INFO Already up to date.
2025-05-19 17:32:20,517 [ scc.merge] INFO
2025-05-19 17:32:20,517 [ scc.merge] INFO
2025-05-19 17:32:20,517 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-05-19 17:32:20,517 [ scc.merge] INFO Excluded PRs:
2025-05-19 17:32:20,517 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-05-19 17:32:20,517 [ scc.merge] INFO Already up to date.
2025-05-19 17:32:20,517 [ scc.merge] INFO
2025-05-19 17:32:20,517 [ scc.merge] INFO
2025-05-19 17:32:20,517 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-05-19 17:32:20,517 [ scc.merge] INFO Excluded PRs:
2025-05-19 17:32:20,517 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-05-19 17:32:20,517 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-05-19 17:32:20,517 [ scc.merge] INFO Already up to date.
2025-05-19 17:32:20,517 [ scc.merge] INFO
2025-05-19 17:32:20,517 [ scc.merge] INFO Merged PRs:
2025-05-19 17:32:20,517 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-05-19 17:32:20,517 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-05-19 17:32:20,517 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-05-19 17:32:20,517 [ scc.merge] INFO
2025-05-19 17:32:20,517 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-05-19 17:32:20,517 [ scc.merge] INFO Excluded PRs:
2025-05-19 17:32:20,517 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-05-19 17:32:20,517 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-05-19 17:32:20,517 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (status: failure)
2025-05-19 17:32:20,517 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-05-19 17:32:20,517 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-19 17:32:20,517 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-05-19 17:32:20,517 [ scc.merge] INFO Updating 11d3587..5b2ca82
2025-05-19 17:32:20,517 [ scc.merge] INFO Previously merged:
2025-05-19 17:32:20,517 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-05-19 17:32:20,517 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-19 17:32:20,517 [ scc.merge] INFO
2025-05-19 17:32:20,517 [ scc.merge] INFO Merged PRs:
2025-05-19 17:32:20,517 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-05-19 17:32:20,517 [ scc.merge] INFO
2025-05-19 17:32:20,517 [ scc.merge] INFO Repository: ome/omero-figure
2025-05-19 17:32:20,517 [ scc.merge] INFO Excluded PRs:
2025-05-19 17:32:20,518 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-05-19 17:32:20,518 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-05-19 17:32:20,518 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-05-19 17:32:20,518 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-05-19 17:32:20,518 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-05-19 17:32:20,518 [ scc.merge] INFO Previously merged:
2025-05-19 17:32:20,518 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-05-19 17:32:20,518 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-05-19 17:32:20,518 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-05-19 17:32:20,518 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-19 17:32:20,518 [ scc.merge] INFO
2025-05-19 17:32:20,518 [ scc.merge] INFO Merged PRs:
2025-05-19 17:32:20,518 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-05-19 17:32:20,518 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-05-19 17:32:20,518 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-05-19 17:32:20,518 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-05-19 17:32:20,518 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-05-19 17:32:20,518 [ scc.merge] INFO
2025-05-19 17:32:20,518 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-19 17:32:20,518 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-05-19 17:32:20,518 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-05-19 17:32:20,518 [ scc.merge] INFO
2025-05-19 17:32:20,518 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-05-19 17:32:20,518 [ scc.merge] INFO Already up to date.
2025-05-19 17:32:20,518 [ scc.merge] INFO
2025-05-19 17:32:20,518 [ scc.merge] INFO Merged PRs:
2025-05-19 17:32:20,518 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-05-19 17:32:20,518 [ scc.merge] INFO
2025-05-19 17:32:20,518 [ scc.merge] INFO Repository: ome/omero-gallery
2025-05-19 17:32:20,518 [ scc.merge] INFO Already up to date.
2025-05-19 17:32:20,518 [ scc.merge] INFO
2025-05-19 17:32:20,518 [ scc.merge] INFO Merged PRs:
2025-05-19 17:32:20,518 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-05-19 17:32:20,518 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-05-19 17:32:20,518 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-05-19 17:32:20,518 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-05-19 17:32:20,518 [ scc.merge] INFO
2025-05-19 17:32:20,518 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-19 17:32:20,519 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-05-19 17:32:20,519 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-05-19 17:32:20,519 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-05-19 17:32:20,519 [ scc.merge] INFO
2025-05-19 17:32:20,519 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-05-19 17:32:20,519 [ scc.merge] INFO Excluded PRs:
2025-05-19 17:32:20,519 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-05-19 17:32:20,519 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-05-19 17:32:20,519 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-05-19 17:32:20,519 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-05-19 17:32:20,519 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-05-19 17:32:20,519 [ scc.merge] INFO Already up to date.
2025-05-19 17:32:20,519 [ scc.merge] INFO
2025-05-19 17:32:20,519 [ scc.merge] INFO Merged PRs:
2025-05-19 17:32:20,519 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-05-19 17:32:20,519 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-05-19 17:32:20,519 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-05-19 17:32:20,519 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-05-19 17:32:20,519 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-19 17:32:20,519 [ scc.merge] INFO
2025-05-19 17:32:20,519 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-19 17:32:20,519 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-05-19 17:32:20,519 [ scc.merge] INFO
2025-05-19 17:32:20,519 [ scc.merge] INFO Repository: ome/omero-mapr
2025-05-19 17:32:20,519 [ scc.merge] INFO Excluded PRs:
2025-05-19 17:32:20,519 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-05-19 17:32:20,519 [ scc.merge] INFO Already up to date.
2025-05-19 17:32:20,519 [ scc.merge] INFO
2025-05-19 17:32:20,519 [ scc.merge] INFO Merged PRs:
2025-05-19 17:32:20,519 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-05-19 17:32:20,519 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-19 17:32:20,519 [ scc.merge] INFO
2025-05-19 17:32:20,519 [ scc.merge] INFO Repository: ome/omero-metadata
2025-05-19 17:32:20,519 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-05-19 17:32:20,519 [ scc.merge] INFO Previously merged:
2025-05-19 17:32:20,519 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-19 17:32:20,519 [ scc.merge] INFO
2025-05-19 17:32:20,519 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-19 17:32:20,520 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-05-19 17:32:20,520 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-05-19 17:32:20,520 [ scc.merge] INFO
2025-05-19 17:32:20,520 [ scc.merge] INFO Repository: ome/omero-parade
2025-05-19 17:32:20,520 [ scc.merge] INFO Excluded PRs:
2025-05-19 17:32:20,520 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-05-19 17:32:20,520 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-05-19 17:32:20,520 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-05-19 17:32:20,520 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-05-19 17:32:20,520 [ scc.merge] INFO Already up to date.
2025-05-19 17:32:20,520 [ scc.merge] INFO
2025-05-19 17:32:20,520 [ scc.merge] INFO Merged PRs:
2025-05-19 17:32:20,520 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-05-19 17:32:20,520 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-05-19 17:32:20,520 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-05-19 17:32:20,520 [ scc.merge] INFO
2025-05-19 17:32:20,520 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-05-19 17:32:20,520 [ scc.merge] INFO Already up to date.
2025-05-19 17:32:20,520 [ scc.merge] INFO
2025-05-19 17:32:20,520 [ scc.merge] INFO
2025-05-19 17:32:20,520 [ scc.merge] INFO Repository: ome/omero-rois
2025-05-19 17:32:20,520 [ scc.merge] INFO Excluded PRs:
2025-05-19 17:32:20,520 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-05-19 17:32:20,520 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-05-19 17:32:20,520 [ scc.merge] INFO Already up to date.
2025-05-19 17:32:20,520 [ scc.merge] INFO
2025-05-19 17:32:20,520 [ scc.merge] INFO
2025-05-19 17:32:20,520 [ scc.merge] INFO Repository: ome/omero-signup
2025-05-19 17:32:20,520 [ scc.merge] INFO Already up to date.
2025-05-19 17:32:20,520 [ scc.merge] INFO
2025-05-19 17:32:20,520 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-19 17:32:20,520 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-05-19 17:32:20,520 [ scc.merge] INFO
2025-05-19 17:32:20,520 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-05-19 17:32:20,520 [ scc.merge] INFO Excluded PRs:
2025-05-19 17:32:20,520 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-05-19 17:32:20,520 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-05-19 17:32:20,520 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-05-19 17:32:20,520 [ scc.merge] INFO Already up to date.
2025-05-19 17:32:20,521 [ scc.merge] INFO
2025-05-19 17:32:20,521 [ scc.merge] INFO Merged PRs:
2025-05-19 17:32:20,521 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-05-19 17:32:20,521 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-05-19 17:32:20,521 [ scc.merge] INFO
2025-05-19 17:32:20,521 [ scc.merge] INFO Repository: ome/omero-upload
2025-05-19 17:32:20,521 [ scc.merge] INFO Already up to date.
2025-05-19 17:32:20,521 [ scc.merge] INFO
2025-05-19 17:32:20,521 [ scc.merge] INFO
2025-05-19 17:32:20,521 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-05-19 17:32:20,521 [ scc.merge] INFO Excluded PRs:
2025-05-19 17:32:20,521 [ scc.merge] INFO - PR 21 pwalczysko 'Test' (status: failure)
2025-05-19 17:32:20,521 [ scc.merge] INFO Already up to date.
2025-05-19 17:32:20,521 [ scc.merge] INFO
2025-05-19 17:32:20,521 [ scc.merge] INFO Merged PRs:
2025-05-19 17:32:20,521 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-05-19 17:32:20,521 [ scc.merge] INFO
2025-05-19 17:32:20,521 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-05-19 17:32:20,521 [ scc.merge] INFO Excluded PRs:
2025-05-19 17:32:20,521 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-05-19 17:32:20,521 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-05-19 17:32:20,521 [ scc.merge] INFO Already up to date.
2025-05-19 17:32:20,521 [ scc.merge] INFO
2025-05-19 17:32:20,521 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-19 17:32:20,521 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-05-19 17:32:20,521 [ scc.merge] INFO
2025-05-19 17:32:20,521 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-05-19 17:32:20,521 [ scc.merge] INFO Already up to date.
2025-05-19 17:32:20,521 [ scc.merge] INFO
2025-05-19 17:32:20,521 [ scc.merge] INFO
2025-05-19 17:32:20,521 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-05-19 17:32:20,521 [ scc.merge] INFO Already up to date.
2025-05-19 17:32:20,521 [ scc.merge] INFO
2025-05-19 17:32:20,521 [ scc.merge] INFO
2025-05-19 17:32:20,521 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-05-19 17:32:20,521 [ scc.merge] INFO Already up to date.
2025-05-19 17:32:20,521 [ scc.merge] INFO
2025-05-19 17:32:20,521 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-19 17:32:20,521 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-05-19 17:32:20,522 [ scc.merge] INFO
2025-05-19 17:32:20,522 [ scc.merge] INFO Repository: ome/scripts
2025-05-19 17:32:20,522 [ scc.merge] INFO Excluded PRs:
2025-05-19 17:32:20,522 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-05-19 17:32:20,522 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-05-19 17:32:20,522 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-05-19 17:32:20,522 [ scc.merge] INFO Previously merged:
2025-05-19 17:32:20,522 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-05-19 17:32:20,522 [ scc.merge] INFO
2025-05-19 17:32:20,522 [ scc.merge] INFO Merged PRs:
2025-05-19 17:32:20,522 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-05-19 17:32:20,522 [ scc.merge] INFO
2025-05-19 17:32:20,522 [ scc.merge] INFO Conflicting PRs (not included):
2025-05-19 17:32:20,522 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-05-19 17:32:20,522 [ scc.merge] INFO
2025-05-19 17:32:20,522 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-05-19 17:32:20,522 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 17:32:20,524 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-05-19 17:32:20,524 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 17:32:20,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:32:20,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-05-19 17:32:20,527 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 17:32:20,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:32:20,529 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-05-19 17:32:20,529 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 17:32:20,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:32:20,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-05-19 17:32:20,531 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 17:32:20,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:32:20,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-05-19 17:32:20,534 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 17:32:20,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:32:20,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-05-19 17:32:20,536 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 17:32:20,538 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:32:20,538 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-05-19 17:32:20,538 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 17:32:20,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:32:20,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-05-19 17:32:20,541 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 17:32:20,543 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:32:20,543 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-05-19 17:32:20,543 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 17:32:20,545 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:32:20,545 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-05-19 17:32:20,545 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 17:32:20,548 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:32:20,548 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-05-19 17:32:20,548 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 17:32:20,550 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:32:20,550 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-05-19 17:32:20,550 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 17:32:20,552 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:32:20,552 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-05-19 17:32:20,552 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 17:32:20,554 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:32:20,554 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-05-19 17:32:20,554 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 17:32:20,557 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:32:20,557 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-05-19 17:32:20,557 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 17:32:20,559 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:32:20,559 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-05-19 17:32:20,559 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 17:32:20,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:32:20,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-05-19 17:32:20,562 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 17:32:20,564 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:32:20,564 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-05-19 17:32:20,564 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 17:32:20,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:32:20,566 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-05-19 17:32:20,566 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 17:32:20,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:32:20,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-05-19 17:32:20,568 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 17:32:20,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:32:20,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-05-19 17:32:20,571 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 17:32:20,573 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-05-19 17:32:20,573 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-05-19 17:32:20,573 [ scc.git] DEBUG Calling 'git remote'
2025-05-19 17:32:20,575 [ 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 d229e7a] 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 808dbb3] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-05-19 17:33:09,577 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2025-05-19 17:33:19,319 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2025-05-19 17:33:21,876 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-05-19 17:33:26,691 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-05-19 17:34:06,393 [ 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
![[Jenkins]](/jenkins/static/daea91b1/images/svgs/logo.svg){kind=logo}
