Skipping 229 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTest
2025-04-24 01:02:41,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:02:41,490 [ scc.repo] DEBUG ## PRs found:
2025-04-24 01:02:41,652 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:41,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-04-24 01:02:42,184 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:42,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-04-24 01:02:42,679 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:42,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-24 01:02:43,226 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:43,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-24 01:02:43,701 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:43,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-24 01:02:44,216 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:44,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-04-24 01:02:44,396 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-24 01:02:44,647 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:44,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-04-24 01:02:45,152 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:45,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-04-24 01:02:45,687 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:45,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-24 01:02:46,229 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:46,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-24 01:02:46,703 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:46,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-24 01:02:47,218 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:47,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-04-24 01:02:47,407 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-04-24 01:02:47,407 [ scc.repo] DEBUG ## Branches found:
2025-04-24 01:02:47,407 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-24 01:02:47,407 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:02:47,407 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:02:47,410 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-24 01:02:47,412 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 01:02:47,412 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-24 01:02:47,415 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-24 01:02:47,418 [ scc.git] DEBUG Already up to date.
2025-04-24 01:02:47,418 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-04-24 01:02:47,692 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-24 01:02:47,692 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-04-24 01:02:47,696 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-04-24 01:02:47,989 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-24 01:02:47,989 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-04-24 01:02:47,993 [ scc.git] DEBUG ## Unique users: []
2025-04-24 01:02:47,993 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:02:47,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:02:47,995 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-24 01:02:47,999 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:02:48,002 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-24 01:02:48,010 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-24 01:02:48,013 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-04-24 01:02:48,013 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-04-24 01:02:48,013 [ scc.git] DEBUG requirements.txt | 2 +-
2025-04-24 01:02:48,013 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-04-24 01:02:48,014 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-04-24 01:02:48,014 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-04-24 01:02:48,015 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:48,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:02:48,174 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-24 01:02:48,179 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:02:48,181 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 94 (Use the release/v1 branch for the PyPA action publishing to PyPI) 1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-24 01:02:48,190 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-24 01:02:48,193 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-24 01:02:48,193 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-24 01:02:48,425 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:48,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:02:48,605 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 01:02:48,644 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:02:48,644 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:02:48,646 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 01:02:48,684 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 01:02:48,688 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1155dda790> has no local changes
2025-04-24 01:02:48,688 [ 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#397 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/)'
2025-04-24 01:02:48,694 [ scc.git] DEBUG [detached HEAD d64f989] merge master -Dorg -Ssuccess-only
2025-04-24 01:02:48,695 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:02:48,695 [ scc.repo] DEBUG ## PRs found:
2025-04-24 01:02:48,856 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:49,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-04-24 01:02:49,391 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:49,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-04-24 01:02:49,898 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:50,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-04-24 01:02:50,468 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:50,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-24 01:02:50,995 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:51,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-24 01:02:51,468 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:51,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-24 01:02:52,018 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:52,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-04-24 01:02:52,235 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-24 01:02:52,486 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:52,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-04-24 01:02:52,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:53,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-04-24 01:02:53,498 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:53,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-24 01:02:54,021 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:54,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-24 01:02:54,523 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:54,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-24 01:02:55,072 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:55,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-04-24 01:02:55,247 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-24 01:02:55,247 [ scc.repo] DEBUG ## Branches found:
2025-04-24 01:02:55,248 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-24 01:02:55,248 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:02:55,248 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:02:55,250 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-24 01:02:55,253 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 01:02:55,253 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-24 01:02:55,256 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-24 01:02:55,263 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-04-24 01:02:55,499 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:55,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-04-24 01:02:55,959 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-04-24 01:02:56,260 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-24 01:02:56,261 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-04-24 01:02:56,265 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-04-24 01:02:56,541 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-24 01:02:56,541 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-04-24 01:02:56,546 [ scc.git] DEBUG ## Unique users: []
2025-04-24 01:02:56,546 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:02:56,546 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:02:56,548 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-24 01:02:56,553 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:02:56,555 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-24 01:02:56,568 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-04-24 01:02:56,568 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-04-24 01:02:56,568 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-24 01:02:56,568 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-24 01:02:56,568 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-24 01:02:56,569 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-24 01:02:56,572 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-24 01:02:56,576 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-24 01:02:56,577 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:56,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:02:56,742 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-24 01:02:56,746 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-24 01:02:56,749 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#397](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/populate.py
- src/omero_metadata/cli.py
--conflicts
2025-04-24 01:02:56,752 [ scc.config] DEBUG Found github.token
2025-04-24 01:02:56,752 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-04-24 01:02:56,752 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-24 01:02:56,757 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:02:56,759 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-24 01:02:56,773 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-24 01:02:56,773 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-24 01:02:56,773 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-04-24 01:02:56,773 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-24 01:02:56,774 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-24 01:02:56,776 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-24 01:02:56,781 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-24 01:02:56,992 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:57,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:02:57,171 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-24 01:02:57,175 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-24 01:02:57,178 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#397](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2025-04-24 01:02:57,180 [ scc.config] DEBUG Found github.token
2025-04-24 01:02:57,180 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-04-24 01:02:57,180 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 01:02:57,219 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:02:57,219 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:02:57,221 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 01:02:57,259 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 01:02:57,263 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1155cb74d0> has no local changes
2025-04-24 01:02:57,263 [ 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#397 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/)'
2025-04-24 01:02:57,270 [ scc.git] DEBUG [detached HEAD 6bed8b6] merge master -Dorg -Ssuccess-only
2025-04-24 01:02:57,270 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:02:57,270 [ scc.repo] DEBUG ## PRs found:
2025-04-24 01:02:57,422 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:57,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-04-24 01:02:57,977 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:58,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-04-24 01:02:58,491 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:58,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-24 01:02:59,053 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:59,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-24 01:02:59,601 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:02:59,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-24 01:03:00,088 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:00,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-24 01:03:00,634 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:00,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-04-24 01:03:00,832 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-24 01:03:01,083 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:01,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-04-24 01:03:01,432 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-24 01:03:01,683 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:02,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-24 01:03:02,353 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:02,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-24 01:03:02,866 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:03,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-24 01:03:03,434 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:03,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-24 01:03:03,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:04,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-04-24 01:03:04,194 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-24 01:03:04,445 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:04,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-04-24 01:03:04,681 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-24 01:03:04,932 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:05,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-24 01:03:05,491 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:05,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-24 01:03:06,025 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:06,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-24 01:03:06,518 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:06,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-24 01:03:07,108 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:07,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-04-24 01:03:07,286 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-24 01:03:07,538 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:07,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-04-24 01:03:08,036 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:08,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-04-24 01:03:08,598 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:08,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-04-24 01:03:09,076 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:09,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-04-24 01:03:09,560 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:09,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-04-24 01:03:10,083 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:10,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-04-24 01:03:10,564 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:10,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-04-24 01:03:10,905 [ scc.repo] DEBUG ## Branches found:
2025-04-24 01:03:10,905 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-24 01:03:10,905 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:10,905 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:10,908 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-24 01:03:10,910 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 01:03:10,911 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-24 01:03:10,914 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-24 01:03:10,917 [ scc.git] DEBUG Already up to date.
2025-04-24 01:03:10,917 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-04-24 01:03:11,211 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-24 01:03:11,211 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-04-24 01:03:11,215 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-04-24 01:03:11,506 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-24 01:03:11,506 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-04-24 01:03:11,510 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-04-24 01:03:11,798 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-24 01:03:11,798 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-04-24 01:03:11,802 [ scc.git] DEBUG ## Unique users: []
2025-04-24 01:03:11,802 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:11,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:11,804 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-24 01:03:11,807 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:11,809 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 140 (Bump vite from 4.2.3 to 4.5.9) 6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-24 01:03:11,817 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-24 01:03:11,821 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-04-24 01:03:11,821 [ scc.git] DEBUG package.json | 2 +-
2025-04-24 01:03:11,821 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-04-24 01:03:11,822 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:11,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:03:11,978 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-04-24 01:03:11,981 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:11,983 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 141 (Bump axios from 1.6.0 to 1.8.2) de7db17cd62b498179713df276cff151a1f36d80'
2025-04-24 01:03:11,992 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-24 01:03:11,993 [ scc.git] DEBUG Auto-merging package.json
2025-04-24 01:03:11,993 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-24 01:03:11,997 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-04-24 01:03:11,997 [ scc.git] DEBUG package.json | 2 +-
2025-04-24 01:03:11,997 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-04-24 01:03:12,229 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:12,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:03:12,406 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-24 01:03:12,410 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:12,412 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 142 (Use the release/v1 branch for the PyPA action publishing to PyPI) 16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-24 01:03:12,420 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-24 01:03:12,423 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-24 01:03:12,423 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-24 01:03:12,657 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:12,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:03:12,860 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 01:03:12,899 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:12,899 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:12,901 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 01:03:12,939 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 01:03:12,943 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1155bb5550> has no local changes
2025-04-24 01:03:12,943 [ 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#397 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/)'
2025-04-24 01:03:12,950 [ scc.git] DEBUG [detached HEAD a49c631] merge master -Dorg -Ssuccess-only
2025-04-24 01:03:12,950 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:03:12,950 [ scc.repo] DEBUG ## PRs found:
2025-04-24 01:03:13,111 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:13,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-04-24 01:03:13,305 [ scc.repo] DEBUG ## Branches found:
2025-04-24 01:03:13,305 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-24 01:03:13,305 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:13,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:13,308 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-24 01:03:13,310 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 01:03:13,310 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-24 01:03:13,313 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-24 01:03:13,316 [ scc.git] DEBUG Already up to date.
2025-04-24 01:03:13,316 [ scc.git] DEBUG ## Unique users: []
2025-04-24 01:03:13,316 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:13,316 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:13,318 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 01:03:13,356 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:13,356 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:13,358 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 01:03:13,396 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 01:03:13,399 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1155bd2590> has no local changes
2025-04-24 01:03:13,399 [ 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#397 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/)'
2025-04-24 01:03:13,405 [ scc.git] DEBUG [detached HEAD 650f412] merge master -Dorg -Ssuccess-only
2025-04-24 01:03:13,405 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:03:13,405 [ scc.repo] DEBUG ## PRs found:
2025-04-24 01:03:13,556 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:13,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-04-24 01:03:14,116 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:14,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-04-24 01:03:14,645 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:14,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-04-24 01:03:15,109 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:15,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-04-24 01:03:15,346 [ scc.repo] DEBUG ## Branches found:
2025-04-24 01:03:15,346 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-24 01:03:15,346 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:15,346 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:15,348 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-24 01:03:15,351 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 01:03:15,351 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-24 01:03:15,353 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-24 01:03:15,357 [ scc.git] DEBUG Already up to date.
2025-04-24 01:03:15,357 [ scc.git] DEBUG ## Unique users: []
2025-04-24 01:03:15,357 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:15,357 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:15,360 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 01:03:15,399 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:15,399 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:15,401 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 01:03:15,439 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 01:03:15,442 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1157848d90> has no local changes
2025-04-24 01:03:15,442 [ 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#397 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/)'
2025-04-24 01:03:15,448 [ scc.git] DEBUG [detached HEAD cce0e84] merge master -Dorg -Ssuccess-only
2025-04-24 01:03:15,449 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:03:15,449 [ scc.repo] DEBUG ## PRs found:
2025-04-24 01:03:15,596 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:15,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-04-24 01:03:16,171 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:16,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-04-24 01:03:16,651 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:16,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-04-24 01:03:17,122 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:17,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-24 01:03:17,682 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:17,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-24 01:03:18,246 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:18,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-24 01:03:18,827 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:19,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-04-24 01:03:19,022 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-24 01:03:19,022 [ scc.repo] DEBUG ## Branches found:
2025-04-24 01:03:19,022 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-24 01:03:19,022 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:19,022 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:19,025 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-24 01:03:19,027 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 01:03:19,027 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-24 01:03:19,030 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-24 01:03:19,033 [ scc.git] DEBUG Already up to date.
2025-04-24 01:03:19,033 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-04-24 01:03:19,353 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-04-24 01:03:19,353 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-04-24 01:03:19,357 [ scc.git] DEBUG ## Unique users: []
2025-04-24 01:03:19,358 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:19,358 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:19,360 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-24 01:03:19,363 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:19,365 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-24 01:03:19,374 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-04-24 01:03:19,374 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-04-24 01:03:19,374 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-04-24 01:03:19,374 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-04-24 01:03:19,374 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-04-24 01:03:19,374 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-04-24 01:03:19,374 [ scc.git] DEBUG Auto-merging setup.py
2025-04-24 01:03:19,374 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-04-24 01:03:19,374 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-24 01:03:19,375 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-24 01:03:19,377 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-24 01:03:19,382 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-04-24 01:03:19,383 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:19,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:03:19,556 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-24 01:03:19,559 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-24 01:03:19,562 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#397](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/signup_settings.py
- omero_signup/urls.py
- setup.py
- omero_signup/views.py
--conflicts
2025-04-24 01:03:19,564 [ scc.config] DEBUG Found github.token
2025-04-24 01:03:19,564 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-04-24 01:03:19,565 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 01:03:19,603 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:19,603 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:19,605 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 01:03:19,643 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 01:03:19,646 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f11580e3b10> has no local changes
2025-04-24 01:03:19,646 [ 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#397 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/)'
2025-04-24 01:03:19,654 [ scc.git] DEBUG [detached HEAD c35474f] merge master -Dorg -Ssuccess-only
2025-04-24 01:03:19,654 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:03:19,655 [ scc.repo] DEBUG ## PRs found:
2025-04-24 01:03:19,807 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:20,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-04-24 01:03:20,440 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:20,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-04-24 01:03:20,914 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:21,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-04-24 01:03:21,514 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:21,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-24 01:03:21,999 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:22,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-24 01:03:22,494 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:22,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-04-24 01:03:23,038 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:23,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6?per_page=1 HTTP/1.1" 200 2
2025-04-24 01:03:23,212 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-04-24 01:03:23,463 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:23,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-04-24 01:03:23,954 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:24,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-04-24 01:03:24,439 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:24,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-04-24 01:03:24,995 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:25,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-24 01:03:25,493 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:25,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-24 01:03:25,990 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:26,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-04-24 01:03:26,490 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:26,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-04-24 01:03:26,968 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:27,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-04-24 01:03:27,479 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:27,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-04-24 01:03:27,962 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:28,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-24 01:03:28,511 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:28,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-24 01:03:28,988 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:29,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-24 01:03:29,520 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:29,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2025-04-24 01:03:29,705 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-24 01:03:29,705 [ scc.repo] DEBUG ## Branches found:
2025-04-24 01:03:29,705 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-24 01:03:29,705 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:29,705 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:29,708 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-24 01:03:29,710 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 01:03:29,710 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-24 01:03:29,713 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-24 01:03:29,716 [ scc.git] DEBUG Already up to date.
2025-04-24 01:03:29,716 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-04-24 01:03:30,012 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-24 01:03:30,012 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-04-24 01:03:30,016 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-04-24 01:03:30,282 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-24 01:03:30,282 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-04-24 01:03:30,286 [ scc.git] DEBUG ## Unique users: []
2025-04-24 01:03:30,287 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:30,287 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:30,289 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-04-24 01:03:30,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:30,295 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2025-04-24 01:03:30,307 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-24 01:03:30,311 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-04-24 01:03:30,311 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-04-24 01:03:30,311 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-04-24 01:03:30,311 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-04-24 01:03:30,311 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-04-24 01:03:30,311 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-04-24 01:03:30,312 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:30,312 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-04-24 01:03:30,312 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-04-24 01:03:30,312 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-04-24 01:03:30,312 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-04-24 01:03:30,312 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-04-24 01:03:30,312 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-04-24 01:03:30,312 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-04-24 01:03:30,312 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-04-24 01:03:30,312 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-04-24 01:03:30,312 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-04-24 01:03:30,312 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-04-24 01:03:30,312 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-04-24 01:03:30,312 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-04-24 01:03:30,312 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-04-24 01:03:30,312 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-04-24 01:03:30,312 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-04-24 01:03:30,312 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-04-24 01:03:30,312 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-04-24 01:03:30,313 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-04-24 01:03:30,313 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-04-24 01:03:30,313 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-04-24 01:03:30,313 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-04-24 01:03:30,313 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-04-24 01:03:30,313 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-04-24 01:03:30,313 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-04-24 01:03:30,313 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-04-24 01:03:30,313 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-04-24 01:03:30,313 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-04-24 01:03:30,313 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-04-24 01:03:30,313 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-04-24 01:03:30,313 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-04-24 01:03:30,313 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-04-24 01:03:30,313 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-04-24 01:03:30,313 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-04-24 01:03:30,313 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-04-24 01:03:30,313 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-04-24 01:03:30,313 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-04-24 01:03:30,313 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-04-24 01:03:30,313 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-04-24 01:03:30,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:03:30,475 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-04-24 01:03:30,479 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:30,481 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-04-24 01:03:30,491 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-24 01:03:30,494 [ scc.git] DEBUG docker | 1 +
2025-04-24 01:03:30,494 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-04-24 01:03:30,726 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:30,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:03:30,921 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 01:03:30,960 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:30,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:30,962 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 01:03:31,000 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 01:03:31,004 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1154233f90> has no local changes
2025-04-24 01:03:31,004 [ 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#397 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/)'
2025-04-24 01:03:31,010 [ scc.git] DEBUG [detached HEAD 47b9603] merge master -Dorg -Ssuccess-only
2025-04-24 01:03:31,011 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:03:31,011 [ scc.repo] DEBUG ## PRs found:
2025-04-24 01:03:31,172 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:31,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-04-24 01:03:31,362 [ scc.repo] DEBUG ## Branches found:
2025-04-24 01:03:31,362 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-24 01:03:31,362 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:31,362 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:31,365 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-24 01:03:31,367 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 01:03:31,367 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-24 01:03:31,370 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-24 01:03:31,373 [ scc.git] DEBUG Already up to date.
2025-04-24 01:03:31,373 [ scc.git] DEBUG ## Unique users: []
2025-04-24 01:03:31,373 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:31,373 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:31,376 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 01:03:31,414 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:31,414 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:31,416 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 01:03:31,453 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 01:03:31,457 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f11565bbb90> has no local changes
2025-04-24 01:03:31,457 [ 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#397 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/)'
2025-04-24 01:03:31,463 [ scc.git] DEBUG [detached HEAD a9c2c01] merge master -Dorg -Ssuccess-only
2025-04-24 01:03:31,463 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:03:31,463 [ scc.repo] DEBUG ## PRs found:
2025-04-24 01:03:31,613 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:31,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-04-24 01:03:32,154 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:32,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-04-24 01:03:32,628 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:32,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-04-24 01:03:33,075 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:33,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-24 01:03:33,603 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:33,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-24 01:03:34,077 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:34,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-24 01:03:34,575 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:34,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-24 01:03:35,046 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:35,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-04-24 01:03:35,224 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-04-24 01:03:35,225 [ scc.repo] DEBUG ## Branches found:
2025-04-24 01:03:35,225 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-24 01:03:35,225 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:35,225 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:35,227 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-24 01:03:35,230 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 01:03:35,230 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-24 01:03:35,232 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-24 01:03:35,235 [ scc.git] DEBUG Already up to date.
2025-04-24 01:03:35,235 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-04-24 01:03:35,550 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-04-24 01:03:35,550 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-04-24 01:03:35,555 [ scc.git] DEBUG ## Unique users: []
2025-04-24 01:03:35,555 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:35,555 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:35,557 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-04-24 01:03:35,560 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:35,562 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-04-24 01:03:35,569 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-24 01:03:35,572 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-04-24 01:03:35,572 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-04-24 01:03:35,572 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-04-24 01:03:35,572 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-04-24 01:03:35,572 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-04-24 01:03:35,573 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:35,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:03:35,733 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 01:03:35,771 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:35,771 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:35,773 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 01:03:35,810 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 01:03:35,813 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1154203050> has no local changes
2025-04-24 01:03:35,813 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Generated by OMERO-plugins-push#397 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/)'
2025-04-24 01:03:35,820 [ scc.git] DEBUG [detached HEAD 2a4dcbc] merge master -Dorg -Ssuccess-only
2025-04-24 01:03:35,820 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:03:35,820 [ scc.git] INFO Overriding base-branch from master to main
2025-04-24 01:03:35,820 [ scc.repo] DEBUG ## PRs found:
2025-04-24 01:03:35,984 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:36,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-04-24 01:03:36,525 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:36,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-04-24 01:03:37,038 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:37,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-04-24 01:03:37,572 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:37,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-04-24 01:03:38,098 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:38,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-24 01:03:38,608 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:38,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-24 01:03:39,099 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:39,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-04-24 01:03:39,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:39,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-04-24 01:03:40,070 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:40,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-04-24 01:03:40,529 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:40,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-24 01:03:41,058 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:41,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-24 01:03:41,526 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:41,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-24 01:03:42,042 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:42,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-04-24 01:03:42,228 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-24 01:03:42,228 [ scc.repo] DEBUG ## Branches found:
2025-04-24 01:03:42,229 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-24 01:03:42,229 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:42,229 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:42,231 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-04-24 01:03:42,234 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 01:03:42,234 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-04-24 01:03:42,236 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-04-24 01:03:42,239 [ scc.git] DEBUG Already up to date.
2025-04-24 01:03:42,240 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-04-24 01:03:42,531 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-04-24 01:03:42,531 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-04-24 01:03:42,535 [ scc.git] DEBUG ## Unique users: []
2025-04-24 01:03:42,535 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:42,535 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:42,537 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-24 01:03:42,540 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:42,542 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-24 01:03:42,549 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-04-24 01:03:42,549 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-04-24 01:03:42,550 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-24 01:03:42,550 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-24 01:03:42,553 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-24 01:03:42,556 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-04-24 01:03:42,558 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:42,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:03:42,721 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-24 01:03:42,724 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-24 01:03:42,726 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#397](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-04-24 01:03:42,728 [ scc.config] DEBUG Found github.token
2025-04-24 01:03:42,728 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-04-24 01:03:42,728 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 01:03:42,766 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:42,766 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:42,768 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 01:03:42,806 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 01:03:42,809 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1155ddad50> has no local changes
2025-04-24 01:03:42,809 [ 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#397 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/)'
2025-04-24 01:03:42,816 [ scc.git] DEBUG [detached HEAD 6c63afe] merge master -Dorg -Ssuccess-only
2025-04-24 01:03:42,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:03:42,816 [ scc.repo] DEBUG ## PRs found:
2025-04-24 01:03:42,972 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:43,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-04-24 01:03:43,185 [ scc.repo] DEBUG ## Branches found:
2025-04-24 01:03:43,185 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-24 01:03:43,185 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:43,185 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:43,188 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-24 01:03:43,190 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 01:03:43,190 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-24 01:03:43,193 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-24 01:03:43,196 [ scc.git] DEBUG Already up to date.
2025-04-24 01:03:43,196 [ scc.git] DEBUG ## Unique users: []
2025-04-24 01:03:43,196 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:43,196 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:43,198 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 01:03:43,236 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:43,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:43,238 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 01:03:43,275 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 01:03:43,278 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1154263610> has no local changes
2025-04-24 01:03:43,278 [ 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#397 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/)'
2025-04-24 01:03:43,284 [ scc.git] DEBUG [detached HEAD 13a8627] merge master -Dorg -Ssuccess-only
2025-04-24 01:03:43,285 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:03:43,285 [ scc.repo] DEBUG ## PRs found:
2025-04-24 01:03:43,436 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:43,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-04-24 01:03:43,636 [ scc.repo] DEBUG ## Branches found:
2025-04-24 01:03:43,636 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-24 01:03:43,636 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:43,636 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:43,638 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-24 01:03:43,641 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 01:03:43,641 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-24 01:03:43,643 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-24 01:03:43,646 [ scc.git] DEBUG Already up to date.
2025-04-24 01:03:43,646 [ scc.git] DEBUG ## Unique users: []
2025-04-24 01:03:43,646 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:43,646 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:43,649 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 01:03:43,687 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:43,688 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:43,690 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 01:03:43,726 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 01:03:43,730 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1155ddadd0> has no local changes
2025-04-24 01:03:43,730 [ 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#397 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/)'
2025-04-24 01:03:43,736 [ scc.git] DEBUG [detached HEAD 556d0cd] merge master -Dorg -Ssuccess-only
2025-04-24 01:03:43,737 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:03:43,737 [ scc.repo] DEBUG ## PRs found:
2025-04-24 01:03:43,887 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:44,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-04-24 01:03:44,408 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:44,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-04-24 01:03:44,878 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:45,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-04-24 01:03:45,354 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:45,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-24 01:03:45,887 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:46,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-24 01:03:46,379 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:46,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-24 01:03:46,836 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:47,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-04-24 01:03:47,030 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-04-24 01:03:47,030 [ scc.repo] DEBUG ## Branches found:
2025-04-24 01:03:47,030 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-24 01:03:47,030 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:47,030 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:47,033 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-24 01:03:47,035 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 01:03:47,035 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-24 01:03:47,038 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-24 01:03:47,041 [ scc.git] DEBUG Already up to date.
2025-04-24 01:03:47,041 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-04-24 01:03:47,363 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-04-24 01:03:47,363 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-04-24 01:03:47,368 [ scc.git] DEBUG ## Unique users: []
2025-04-24 01:03:47,368 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:47,368 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:47,370 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-24 01:03:47,373 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:47,375 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-24 01:03:47,384 [ scc.git] DEBUG Auto-merging Dockerfile
2025-04-24 01:03:47,384 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-04-24 01:03:47,384 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-24 01:03:47,384 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-24 01:03:47,387 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-24 01:03:47,392 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-04-24 01:03:47,393 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:47,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:03:47,552 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-24 01:03:47,555 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-24 01:03:47,558 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#397](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-04-24 01:03:47,560 [ scc.config] DEBUG Found github.token
2025-04-24 01:03:47,560 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-04-24 01:03:47,560 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 01:03:47,598 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:47,598 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:47,600 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 01:03:47,638 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 01:03:47,641 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1154297a90> has no local changes
2025-04-24 01:03:47,642 [ 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#397 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/)'
2025-04-24 01:03:47,648 [ scc.git] DEBUG [detached HEAD 0a39c64] merge master -Dorg -Ssuccess-only
2025-04-24 01:03:47,648 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:03:47,648 [ scc.git] INFO Overriding base-branch from master to develop
2025-04-24 01:03:47,649 [ scc.repo] DEBUG ## PRs found:
2025-04-24 01:03:47,803 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:48,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-04-24 01:03:48,386 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:48,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-04-24 01:03:48,890 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:49,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-04-24 01:03:49,364 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:49,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-24 01:03:49,820 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:50,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-24 01:03:50,282 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:50,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-24 01:03:50,768 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:50,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-24 01:03:51,243 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:51,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-04-24 01:03:51,434 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-24 01:03:51,685 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:51,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-04-24 01:03:52,168 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:52,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-04-24 01:03:52,646 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:52,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-24 01:03:53,174 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:53,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-24 01:03:53,661 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:53,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-24 01:03:54,162 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:54,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-04-24 01:03:54,346 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-24 01:03:54,597 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:54,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-04-24 01:03:55,088 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:55,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-04-24 01:03:55,667 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:55,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-04-24 01:03:56,148 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:56,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-04-24 01:03:56,430 [ scc.repo] DEBUG ## Branches found:
2025-04-24 01:03:56,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-24 01:03:56,430 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:56,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:56,432 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-04-24 01:03:56,435 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-24 01:03:56,435 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-04-24 01:03:56,438 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-04-24 01:03:56,447 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-04-24 01:03:56,680 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:57,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-04-24 01:03:57,091 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-04-24 01:03:57,377 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-24 01:03:57,377 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-04-24 01:03:57,382 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-04-24 01:03:57,684 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-24 01:03:57,684 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-04-24 01:03:57,688 [ scc.git] DEBUG ## Unique users: []
2025-04-24 01:03:57,688 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:57,688 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:57,691 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-24 01:03:57,696 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:57,699 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-24 01:03:57,709 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-04-24 01:03:57,710 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-24 01:03:57,710 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-24 01:03:57,713 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-24 01:03:57,717 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-04-24 01:03:57,718 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:57,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:03:57,876 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-24 01:03:57,881 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-24 01:03:57,884 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#397](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-04-24 01:03:57,886 [ scc.config] DEBUG Found github.token
2025-04-24 01:03:57,886 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-04-24 01:03:57,887 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-24 01:03:57,891 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:57,893 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-24 01:03:57,902 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-24 01:03:57,905 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-04-24 01:03:57,905 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-04-24 01:03:58,126 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:58,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:03:58,291 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-24 01:03:58,328 [ scc.git] DEBUG Get sha1 of %s
2025-04-24 01:03:58,328 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-24 01:03:58,331 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 01:03:58,367 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 01:03:58,370 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1155af1e10> has no local changes
2025-04-24 01:03:58,370 [ 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#397 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/)'
2025-04-24 01:03:58,376 [ scc.git] DEBUG [detached HEAD d98ebb7] merge master -Dorg -Ssuccess-only
2025-04-24 01:03:58,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:03:58,377 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-24 01:03:58,453 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-04-24 01:03:58,542 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:58,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:03:58,712 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-04-24 01:03:58,714 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-04-24 01:03:58,958 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:59,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:03:59,126 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-04-24 01:03:59,128 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-04-24 01:03:59,372 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:59,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:03:59,543 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-04-24 01:03:59,545 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-04-24 01:03:59,790 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:03:59,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:03:59,956 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-04-24 01:04:00,200 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:04:00,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:04:00,363 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-04-24 01:04:00,365 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-04-24 01:04:00,610 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:04:00,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:04:00,790 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-04-24 01:04:00,792 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-04-24 01:04:01,036 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:04:01,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:04:01,202 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-04-24 01:04:01,204 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-04-24 01:04:01,449 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:04:01,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:04:01,616 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-04-24 01:04:01,618 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-04-24 01:04:01,862 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:04:02,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:04:02,075 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-04-24 01:04:02,077 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-04-24 01:04:02,322 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:04:02,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:04:02,490 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-04-24 01:04:02,492 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-04-24 01:04:02,736 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:04:02,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:04:02,909 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-04-24 01:04:02,911 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-04-24 01:04:03,155 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:04:03,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:04:03,322 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-04-24 01:04:03,324 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-04-24 01:04:03,569 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:04:03,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:04:03,736 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-04-24 01:04:03,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:04:04,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:04:04,147 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-04-24 01:04:04,391 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:04:04,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:04:04,555 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-04-24 01:04:04,557 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-04-24 01:04:04,802 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:04:04,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:04:04,982 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-04-24 01:04:05,227 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:04:05,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:04:05,401 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-04-24 01:04:05,645 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:04:05,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:04:05,823 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-04-24 01:04:05,825 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-04-24 01:04:06,070 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:04:06,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:04:06,235 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-04-24 01:04:06,237 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-04-24 01:04:06,482 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:04:06,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:04:06,658 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-04-24 01:04:06,660 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-04-24 01:04:06,904 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:04:07,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:04:07,065 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-04-24 01:04:07,067 [ scc.config] DEBUG Found submodule.scripts.url
2025-04-24 01:04:07,311 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-24 01:04:07,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-24 01:04:07,472 [ scc.config] DEBUG Found submodule.scripts.branch
2025-04-24 01:04:07,472 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-24 01:04:07,559 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1155cb6e10> has local changes
2025-04-24 01:04:07,559 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
Updating 11d3587..7a2c812
Previously merged:
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 147 will-moore 'Name option'
- PR 171 will-moore 'Initial addition of integration tests'
Conflicting PRs (not included):
- PR 167 dominikl 'Add extinfo command'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..4f0362e2
Previously merged:
- PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
- PR 635 dependabot[bot] 'Bump esbuild and vite'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
- PR 76 will-moore 'Run cli deps'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#397 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/397/)'
2025-04-24 01:04:07,573 [ scc.git] DEBUG [detached HEAD 74b5de0] merge master -Dorg -Ssuccess-only
2025-04-24 01:04:07,573 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-04-24 01:04:07,573 [ scc.merge] INFO Repository: ome/omero-plugins
2025-04-24 01:04:07,573 [ scc.merge] INFO Already up to date.
2025-04-24 01:04:07,573 [ scc.merge] INFO
2025-04-24 01:04:07,573 [ scc.merge] INFO Merged PRs:
2025-04-24 01:04:07,573 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-04-24 01:04:07,573 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-04-24 01:04:07,573 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-04-24 01:04:07,573 [ scc.merge] INFO
2025-04-24 01:04:07,573 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-04-24 01:04:07,573 [ scc.merge] INFO Already up to date.
2025-04-24 01:04:07,573 [ scc.merge] INFO
2025-04-24 01:04:07,573 [ scc.merge] INFO
2025-04-24 01:04:07,573 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-04-24 01:04:07,573 [ scc.merge] INFO Excluded PRs:
2025-04-24 01:04:07,573 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-04-24 01:04:07,574 [ scc.merge] INFO Already up to date.
2025-04-24 01:04:07,574 [ scc.merge] INFO
2025-04-24 01:04:07,574 [ scc.merge] INFO
2025-04-24 01:04:07,574 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-04-24 01:04:07,574 [ scc.merge] INFO Excluded PRs:
2025-04-24 01:04:07,574 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-04-24 01:04:07,574 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-04-24 01:04:07,574 [ scc.merge] INFO Already up to date.
2025-04-24 01:04:07,574 [ scc.merge] INFO
2025-04-24 01:04:07,574 [ scc.merge] INFO Merged PRs:
2025-04-24 01:04:07,574 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-04-24 01:04:07,574 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-04-24 01:04:07,574 [ scc.merge] INFO
2025-04-24 01:04:07,574 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-04-24 01:04:07,574 [ scc.merge] INFO Excluded PRs:
2025-04-24 01:04:07,574 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-04-24 01:04:07,574 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-04-24 01:04:07,574 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-04-24 01:04:07,574 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-24 01:04:07,574 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-04-24 01:04:07,574 [ scc.merge] INFO Updating 11d3587..7a2c812
2025-04-24 01:04:07,574 [ scc.merge] INFO Previously merged:
2025-04-24 01:04:07,574 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-24 01:04:07,574 [ scc.merge] INFO
2025-04-24 01:04:07,574 [ scc.merge] INFO Merged PRs:
2025-04-24 01:04:07,574 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-04-24 01:04:07,574 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-04-24 01:04:07,574 [ scc.merge] INFO
2025-04-24 01:04:07,574 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-24 01:04:07,574 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-04-24 01:04:07,574 [ scc.merge] INFO
2025-04-24 01:04:07,574 [ scc.merge] INFO Repository: ome/omero-figure
2025-04-24 01:04:07,574 [ scc.merge] INFO Excluded PRs:
2025-04-24 01:04:07,574 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-04-24 01:04:07,574 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-04-24 01:04:07,574 [ scc.merge] INFO Updating 9cc36cde..4f0362e2
2025-04-24 01:04:07,574 [ scc.merge] INFO Previously merged:
2025-04-24 01:04:07,575 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-24 01:04:07,575 [ scc.merge] INFO
2025-04-24 01:04:07,575 [ scc.merge] INFO Merged PRs:
2025-04-24 01:04:07,575 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-04-24 01:04:07,575 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-04-24 01:04:07,575 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-04-24 01:04:07,575 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-04-24 01:04:07,575 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-04-24 01:04:07,575 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-04-24 01:04:07,575 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-04-24 01:04:07,575 [ scc.merge] INFO
2025-04-24 01:04:07,575 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-24 01:04:07,575 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-04-24 01:04:07,575 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-04-24 01:04:07,575 [ scc.merge] INFO
2025-04-24 01:04:07,575 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-04-24 01:04:07,575 [ scc.merge] INFO Already up to date.
2025-04-24 01:04:07,575 [ scc.merge] INFO
2025-04-24 01:04:07,575 [ scc.merge] INFO Merged PRs:
2025-04-24 01:04:07,575 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-04-24 01:04:07,575 [ scc.merge] INFO
2025-04-24 01:04:07,575 [ scc.merge] INFO Repository: ome/omero-gallery
2025-04-24 01:04:07,575 [ scc.merge] INFO Already up to date.
2025-04-24 01:04:07,575 [ scc.merge] INFO
2025-04-24 01:04:07,575 [ scc.merge] INFO Merged PRs:
2025-04-24 01:04:07,575 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-04-24 01:04:07,575 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-04-24 01:04:07,575 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-04-24 01:04:07,575 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-04-24 01:04:07,575 [ scc.merge] INFO
2025-04-24 01:04:07,575 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-24 01:04:07,575 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-04-24 01:04:07,575 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-04-24 01:04:07,575 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-04-24 01:04:07,575 [ scc.merge] INFO
2025-04-24 01:04:07,575 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-04-24 01:04:07,575 [ scc.merge] INFO Excluded PRs:
2025-04-24 01:04:07,575 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-04-24 01:04:07,575 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-04-24 01:04:07,576 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-04-24 01:04:07,576 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-04-24 01:04:07,576 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-04-24 01:04:07,576 [ scc.merge] INFO Already up to date.
2025-04-24 01:04:07,576 [ scc.merge] INFO
2025-04-24 01:04:07,576 [ scc.merge] INFO Merged PRs:
2025-04-24 01:04:07,576 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-04-24 01:04:07,576 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-04-24 01:04:07,576 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-04-24 01:04:07,576 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-04-24 01:04:07,576 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-24 01:04:07,576 [ scc.merge] INFO
2025-04-24 01:04:07,576 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-24 01:04:07,576 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-04-24 01:04:07,576 [ scc.merge] INFO
2025-04-24 01:04:07,576 [ scc.merge] INFO Repository: ome/omero-mapr
2025-04-24 01:04:07,576 [ scc.merge] INFO Excluded PRs:
2025-04-24 01:04:07,576 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-04-24 01:04:07,576 [ scc.merge] INFO Already up to date.
2025-04-24 01:04:07,576 [ scc.merge] INFO
2025-04-24 01:04:07,576 [ scc.merge] INFO Merged PRs:
2025-04-24 01:04:07,576 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-04-24 01:04:07,576 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-24 01:04:07,576 [ scc.merge] INFO
2025-04-24 01:04:07,576 [ scc.merge] INFO Repository: ome/omero-metadata
2025-04-24 01:04:07,576 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-04-24 01:04:07,576 [ scc.merge] INFO Previously merged:
2025-04-24 01:04:07,576 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-24 01:04:07,576 [ scc.merge] INFO
2025-04-24 01:04:07,576 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-24 01:04:07,576 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-24 01:04:07,576 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-24 01:04:07,576 [ scc.merge] INFO
2025-04-24 01:04:07,576 [ scc.merge] INFO Repository: ome/omero-parade
2025-04-24 01:04:07,576 [ scc.merge] INFO Excluded PRs:
2025-04-24 01:04:07,576 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-04-24 01:04:07,576 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-04-24 01:04:07,576 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-04-24 01:04:07,576 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-04-24 01:04:07,577 [ scc.merge] INFO Already up to date.
2025-04-24 01:04:07,577 [ scc.merge] INFO
2025-04-24 01:04:07,577 [ scc.merge] INFO Merged PRs:
2025-04-24 01:04:07,577 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-24 01:04:07,577 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-24 01:04:07,577 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-24 01:04:07,577 [ scc.merge] INFO
2025-04-24 01:04:07,577 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-04-24 01:04:07,577 [ scc.merge] INFO Already up to date.
2025-04-24 01:04:07,577 [ scc.merge] INFO
2025-04-24 01:04:07,577 [ scc.merge] INFO
2025-04-24 01:04:07,577 [ scc.merge] INFO Repository: ome/omero-rois
2025-04-24 01:04:07,577 [ scc.merge] INFO Excluded PRs:
2025-04-24 01:04:07,577 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-04-24 01:04:07,577 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-24 01:04:07,577 [ scc.merge] INFO Already up to date.
2025-04-24 01:04:07,577 [ scc.merge] INFO
2025-04-24 01:04:07,577 [ scc.merge] INFO
2025-04-24 01:04:07,577 [ scc.merge] INFO Repository: ome/omero-signup
2025-04-24 01:04:07,577 [ scc.merge] INFO Already up to date.
2025-04-24 01:04:07,577 [ scc.merge] INFO
2025-04-24 01:04:07,577 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-24 01:04:07,577 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-24 01:04:07,577 [ scc.merge] INFO
2025-04-24 01:04:07,577 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-04-24 01:04:07,577 [ scc.merge] INFO Excluded PRs:
2025-04-24 01:04:07,577 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-04-24 01:04:07,577 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-04-24 01:04:07,577 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-04-24 01:04:07,577 [ scc.merge] INFO Already up to date.
2025-04-24 01:04:07,577 [ scc.merge] INFO
2025-04-24 01:04:07,577 [ scc.merge] INFO Merged PRs:
2025-04-24 01:04:07,577 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-24 01:04:07,577 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-04-24 01:04:07,577 [ scc.merge] INFO
2025-04-24 01:04:07,577 [ scc.merge] INFO Repository: ome/omero-upload
2025-04-24 01:04:07,577 [ scc.merge] INFO Already up to date.
2025-04-24 01:04:07,577 [ scc.merge] INFO
2025-04-24 01:04:07,577 [ scc.merge] INFO
2025-04-24 01:04:07,578 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-04-24 01:04:07,578 [ scc.merge] INFO Already up to date.
2025-04-24 01:04:07,578 [ scc.merge] INFO
2025-04-24 01:04:07,578 [ scc.merge] INFO Merged PRs:
2025-04-24 01:04:07,578 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-04-24 01:04:07,578 [ scc.merge] INFO
2025-04-24 01:04:07,578 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-04-24 01:04:07,578 [ scc.merge] INFO Excluded PRs:
2025-04-24 01:04:07,578 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-04-24 01:04:07,578 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-04-24 01:04:07,578 [ scc.merge] INFO Already up to date.
2025-04-24 01:04:07,578 [ scc.merge] INFO
2025-04-24 01:04:07,578 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-24 01:04:07,578 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-24 01:04:07,578 [ scc.merge] INFO
2025-04-24 01:04:07,578 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-04-24 01:04:07,578 [ scc.merge] INFO Already up to date.
2025-04-24 01:04:07,578 [ scc.merge] INFO
2025-04-24 01:04:07,578 [ scc.merge] INFO
2025-04-24 01:04:07,578 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-04-24 01:04:07,578 [ scc.merge] INFO Already up to date.
2025-04-24 01:04:07,578 [ scc.merge] INFO
2025-04-24 01:04:07,578 [ scc.merge] INFO
2025-04-24 01:04:07,578 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-04-24 01:04:07,578 [ scc.merge] INFO Already up to date.
2025-04-24 01:04:07,578 [ scc.merge] INFO
2025-04-24 01:04:07,578 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-24 01:04:07,578 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-04-24 01:04:07,578 [ scc.merge] INFO
2025-04-24 01:04:07,578 [ scc.merge] INFO Repository: ome/scripts
2025-04-24 01:04:07,578 [ scc.merge] INFO Excluded PRs:
2025-04-24 01:04:07,578 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-04-24 01:04:07,578 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-04-24 01:04:07,578 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-04-24 01:04:07,578 [ scc.merge] INFO Previously merged:
2025-04-24 01:04:07,578 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-04-24 01:04:07,578 [ scc.merge] INFO
2025-04-24 01:04:07,578 [ scc.merge] INFO Merged PRs:
2025-04-24 01:04:07,578 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-24 01:04:07,579 [ scc.merge] INFO
2025-04-24 01:04:07,579 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-24 01:04:07,579 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-24 01:04:07,579 [ scc.merge] INFO
2025-04-24 01:04:07,579 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-04-24 01:04:07,579 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 01:04:07,581 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-04-24 01:04:07,581 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 01:04:07,583 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:04:07,583 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-04-24 01:04:07,583 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 01:04:07,585 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:04:07,585 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-04-24 01:04:07,585 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 01:04:07,588 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:04:07,588 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-04-24 01:04:07,588 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 01:04:07,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:04:07,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-04-24 01:04:07,590 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 01:04:07,592 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:04:07,592 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-04-24 01:04:07,592 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 01:04:07,594 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:04:07,594 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-04-24 01:04:07,594 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 01:04:07,596 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:04:07,596 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-04-24 01:04:07,596 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 01:04:07,598 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:04:07,598 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-24 01:04:07,599 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 01:04:07,601 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:04:07,601 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-24 01:04:07,601 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 01:04:07,603 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:04:07,603 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-24 01:04:07,603 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 01:04:07,605 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:04:07,605 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-24 01:04:07,605 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 01:04:07,607 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:04:07,607 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-24 01:04:07,607 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 01:04:07,609 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:04:07,609 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-24 01:04:07,610 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 01:04:07,612 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:04:07,612 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-24 01:04:07,612 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 01:04:07,614 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:04:07,614 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-24 01:04:07,614 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 01:04:07,616 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:04:07,616 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-24 01:04:07,616 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 01:04:07,618 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:04:07,618 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-24 01:04:07,618 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 01:04:07,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:04:07,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-24 01:04:07,620 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 01:04:07,622 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:04:07,622 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-24 01:04:07,623 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 01:04:07,624 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:04:07,625 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-24 01:04:07,625 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 01:04:07,627 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-24 01:04:07,627 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-24 01:04:07,627 [ scc.git] DEBUG Calling 'git remote'
2025-04-24 01:04:07,629 [ 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 f98b38e] 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 df689d0] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-04-24 01:04:55,089 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2025-04-24 01:05:04,865 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2025-04-24 01:05:07,421 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-24 01:05:12,395 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/scc/main.py", line 64, in entry_point
main("scc", items=[
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/yaclifw/framework.py", line 188, in main
ns.func(ns)
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 3533, in __call__
self.push(args, self.main_repo)
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 2210, in push
main_repo.rpush(branch_name, remote, force=True)
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 2041, in rpush
submodule_repo.rpush(branch_name, remote, force=force)
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 2047, in rpush
self.push_branch(branch_name, remote=full_remote, force=force)
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 126, in wrapper
error = check_exception_message(e)
^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 115, in wrapper
return func(*args, **kwargs)
^^^^^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 1296, in push_branch
self.call("git", "push", "-f", remote, name)
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 1162, in call
return self.wrap_call(self.debugWrap, *command, **kwargs)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/scc/git.py", line 1187, in wrap_call
raise Exception("rc=%s" % rc)
Exception: rc=128
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
ERROR: script returned exit code 1
Finished: FAILURE