Skipping 224 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-04-19 00:44:41,074 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:44:41,075 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:44:41,077 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-19 00:44:41,114 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-19 00:44:41,121 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f21f14c7a10> has no local changes
2025-04-19 00:44:41,121 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#392 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/)'
2025-04-19 00:44:41,128 [ scc.git] DEBUG [detached HEAD 880844e] merge master -Dorg -Ssuccess-only
2025-04-19 00:44:41,128 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:44:41,128 [ scc.repo] DEBUG ## PRs found:
2025-04-19 00:44:41,285 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:41,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-04-19 00:44:41,804 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:42,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-04-19 00:44:42,281 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:42,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-19 00:44:42,836 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:43,073 [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-19 00:44:43,324 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:43,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-19 00:44:43,771 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:43,945 [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-19 00:44:43,945 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-19 00:44:44,196 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:44,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-04-19 00:44:44,693 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:44,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-04-19 00:44:45,217 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:45,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-19 00:44:45,735 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:45,973 [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-19 00:44:46,225 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:46,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-19 00:44:46,692 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:46,888 [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-19 00:44:46,888 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-04-19 00:44:46,889 [ scc.repo] DEBUG ## Branches found:
2025-04-19 00:44:46,889 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-19 00:44:46,889 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:44:46,889 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:44:46,892 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-19 00:44:46,895 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-19 00:44:46,895 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-19 00:44:46,897 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-19 00:44:46,900 [ scc.git] DEBUG Already up to date.
2025-04-19 00:44:46,901 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-04-19 00:44:47,194 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-19 00:44:47,194 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-04-19 00:44:47,198 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-04-19 00:44:47,454 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-19 00:44:47,454 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-04-19 00:44:47,458 [ scc.git] DEBUG ## Unique users: []
2025-04-19 00:44:47,458 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:44:47,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:44:47,460 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-19 00:44:47,464 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:44:47,467 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-19 00:44:47,475 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-19 00:44:47,479 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-04-19 00:44:47,479 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-04-19 00:44:47,479 [ scc.git] DEBUG requirements.txt | 2 +-
2025-04-19 00:44:47,479 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-04-19 00:44:47,479 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-04-19 00:44:47,479 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-04-19 00:44:47,480 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:47,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:44:47,651 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-19 00:44:47,656 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:44:47,658 [ 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-19 00:44:47,667 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-19 00:44:47,670 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-19 00:44:47,670 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-19 00:44:47,902 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:48,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:44:48,063 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-19 00:44:48,101 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:44:48,101 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:44:48,103 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-19 00:44:48,141 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-19 00:44:48,145 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f21f14c7f50> has no local changes
2025-04-19 00:44:48,145 [ 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#392 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/)'
2025-04-19 00:44:48,151 [ scc.git] DEBUG [detached HEAD 011926a] merge master -Dorg -Ssuccess-only
2025-04-19 00:44:48,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:44:48,152 [ scc.repo] DEBUG ## PRs found:
2025-04-19 00:44:48,314 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:48,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-04-19 00:44:48,859 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:49,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-04-19 00:44:49,330 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:49,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-04-19 00:44:49,867 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:50,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-19 00:44:50,452 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:50,668 [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-19 00:44:50,919 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:51,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-19 00:44:51,402 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:51,590 [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-19 00:44:51,590 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-19 00:44:51,841 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:52,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-04-19 00:44:52,328 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:52,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-04-19 00:44:52,802 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:53,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-19 00:44:53,339 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:53,550 [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-19 00:44:53,802 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:54,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-19 00:44:54,333 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:54,530 [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-19 00:44:54,531 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-19 00:44:54,531 [ scc.repo] DEBUG ## Branches found:
2025-04-19 00:44:54,531 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-19 00:44:54,531 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:44:54,531 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:44:54,534 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-19 00:44:54,536 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-19 00:44:54,536 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-19 00:44:54,539 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-19 00:44:54,547 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-04-19 00:44:54,782 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:55,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-04-19 00:44:55,143 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-04-19 00:44:55,421 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-19 00:44:55,421 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-04-19 00:44:55,425 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-04-19 00:44:55,726 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-19 00:44:55,726 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-04-19 00:44:55,730 [ scc.git] DEBUG ## Unique users: []
2025-04-19 00:44:55,730 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:44:55,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:44:55,732 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-19 00:44:55,737 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:44:55,739 [ 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-19 00:44:55,752 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-04-19 00:44:55,752 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-04-19 00:44:55,752 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-19 00:44:55,752 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-19 00:44:55,752 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-19 00:44:55,753 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-19 00:44:55,755 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-19 00:44:55,760 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-19 00:44:55,761 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:55,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:44:55,926 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-19 00:44:55,930 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-19 00:44:55,934 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#392](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-04-19 00:44:55,936 [ scc.config] DEBUG Found github.token
2025-04-19 00:44:55,936 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-04-19 00:44:55,936 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-19 00:44:55,940 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:44:55,942 [ 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-19 00:44:55,957 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-19 00:44:55,957 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-19 00:44:55,958 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-04-19 00:44:55,958 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-19 00:44:55,958 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-19 00:44:55,961 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-19 00:44:55,966 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-19 00:44:56,177 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:56,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:44:56,340 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-19 00:44:56,344 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-19 00:44:56,347 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#392](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/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-19 00:44:56,349 [ scc.config] DEBUG Found github.token
2025-04-19 00:44:56,349 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-04-19 00:44:56,349 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-19 00:44:56,387 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:44:56,387 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:44:56,389 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-19 00:44:56,425 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-19 00:44:56,429 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f21f14e5050> has no local changes
2025-04-19 00:44:56,429 [ 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#392 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/)'
2025-04-19 00:44:56,435 [ scc.git] DEBUG [detached HEAD 139bf0a] merge master -Dorg -Ssuccess-only
2025-04-19 00:44:56,435 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:44:56,435 [ scc.repo] DEBUG ## PRs found:
2025-04-19 00:44:56,591 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:56,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-04-19 00:44:57,177 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:57,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-04-19 00:44:57,650 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:57,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-19 00:44:58,190 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:58,432 [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-19 00:44:58,684 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:58,949 [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-19 00:44:59,200 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:59,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-19 00:44:59,700 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:44:59,891 [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-19 00:44:59,891 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-19 00:45:00,142 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:00,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-04-19 00:45:00,379 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-19 00:45:00,630 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:00,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-19 00:45:01,179 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:01,427 [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-19 00:45:01,679 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:01,955 [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-19 00:45:02,207 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:02,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-19 00:45:02,664 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:02,852 [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-19 00:45:02,852 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-19 00:45:03,103 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:03,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-04-19 00:45:03,356 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-19 00:45:03,607 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:03,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-19 00:45:04,158 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:04,409 [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-19 00:45:04,660 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:04,916 [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-19 00:45:05,168 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:05,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-19 00:45:05,717 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:05,894 [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-19 00:45:05,895 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-19 00:45:06,146 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:06,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-04-19 00:45:06,641 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:06,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-04-19 00:45:07,183 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:07,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-04-19 00:45:07,658 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:07,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-04-19 00:45:08,135 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:08,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-04-19 00:45:08,617 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:08,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-04-19 00:45:09,076 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:09,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-04-19 00:45:09,365 [ scc.repo] DEBUG ## Branches found:
2025-04-19 00:45:09,365 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-19 00:45:09,365 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:09,365 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:09,368 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-19 00:45:09,370 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-19 00:45:09,370 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-19 00:45:09,373 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-19 00:45:09,376 [ scc.git] DEBUG Already up to date.
2025-04-19 00:45:09,376 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-04-19 00:45:09,686 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-19 00:45:09,686 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-04-19 00:45:09,690 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-04-19 00:45:09,959 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-19 00:45:09,959 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-04-19 00:45:09,963 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-04-19 00:45:10,218 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-19 00:45:10,219 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-04-19 00:45:10,222 [ scc.git] DEBUG ## Unique users: []
2025-04-19 00:45:10,223 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:10,223 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:10,225 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-19 00:45:10,228 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:10,230 [ 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-19 00:45:10,238 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-19 00:45:10,241 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-04-19 00:45:10,241 [ scc.git] DEBUG package.json | 2 +-
2025-04-19 00:45:10,241 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-04-19 00:45:10,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:10,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:45:10,398 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-04-19 00:45:10,401 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:10,403 [ 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-19 00:45:10,412 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-19 00:45:10,412 [ scc.git] DEBUG Auto-merging package.json
2025-04-19 00:45:10,413 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-19 00:45:10,416 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-04-19 00:45:10,416 [ scc.git] DEBUG package.json | 2 +-
2025-04-19 00:45:10,416 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-04-19 00:45:10,649 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:10,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:45:10,807 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-19 00:45:10,810 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:10,812 [ 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-19 00:45:10,821 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-19 00:45:10,824 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-19 00:45:10,824 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-19 00:45:11,058 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:11,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:45:11,219 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-19 00:45:11,257 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:11,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:11,259 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-19 00:45:11,295 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-19 00:45:11,299 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f21f0336950> has no local changes
2025-04-19 00:45:11,299 [ 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#392 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/)'
2025-04-19 00:45:11,306 [ scc.git] DEBUG [detached HEAD 99a917c] merge master -Dorg -Ssuccess-only
2025-04-19 00:45:11,306 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:45:11,306 [ scc.repo] DEBUG ## PRs found:
2025-04-19 00:45:11,470 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:11,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-04-19 00:45:11,650 [ scc.repo] DEBUG ## Branches found:
2025-04-19 00:45:11,650 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-19 00:45:11,650 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:11,650 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:11,652 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-19 00:45:11,655 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-19 00:45:11,655 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-19 00:45:11,658 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-19 00:45:11,661 [ scc.git] DEBUG Already up to date.
2025-04-19 00:45:11,661 [ scc.git] DEBUG ## Unique users: []
2025-04-19 00:45:11,661 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:11,661 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:11,663 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-19 00:45:11,700 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:11,700 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:11,702 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-19 00:45:11,741 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-19 00:45:11,744 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f21f151f6d0> has no local changes
2025-04-19 00:45:11,744 [ 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#392 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/)'
2025-04-19 00:45:11,751 [ scc.git] DEBUG [detached HEAD 52e0861] merge master -Dorg -Ssuccess-only
2025-04-19 00:45:11,751 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:45:11,751 [ scc.repo] DEBUG ## PRs found:
2025-04-19 00:45:11,901 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:12,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-04-19 00:45:12,466 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:12,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-04-19 00:45:12,968 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:13,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-04-19 00:45:13,481 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:13,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-04-19 00:45:13,744 [ scc.repo] DEBUG ## Branches found:
2025-04-19 00:45:13,744 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-19 00:45:13,744 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:13,744 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:13,746 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-19 00:45:13,749 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-19 00:45:13,749 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-19 00:45:13,752 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-19 00:45:13,754 [ scc.git] DEBUG Already up to date.
2025-04-19 00:45:13,754 [ scc.git] DEBUG ## Unique users: []
2025-04-19 00:45:13,754 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:13,754 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:13,757 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-19 00:45:13,794 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:13,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:13,796 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-19 00:45:13,833 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-19 00:45:13,836 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f21f151d3d0> has no local changes
2025-04-19 00:45:13,836 [ 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#392 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/)'
2025-04-19 00:45:13,842 [ scc.git] DEBUG [detached HEAD 58886d1] merge master -Dorg -Ssuccess-only
2025-04-19 00:45:13,842 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:45:13,842 [ scc.repo] DEBUG ## PRs found:
2025-04-19 00:45:13,995 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:14,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-04-19 00:45:14,547 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:14,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-04-19 00:45:15,011 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:15,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-04-19 00:45:15,488 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:15,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-19 00:45:16,030 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:16,260 [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-19 00:45:16,511 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:16,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-19 00:45:17,070 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:17,273 [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-19 00:45:17,274 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-19 00:45:17,274 [ scc.repo] DEBUG ## Branches found:
2025-04-19 00:45:17,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-19 00:45:17,274 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:17,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:17,276 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-19 00:45:17,279 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-19 00:45:17,279 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-19 00:45:17,282 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-19 00:45:17,285 [ scc.git] DEBUG Already up to date.
2025-04-19 00:45:17,285 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-04-19 00:45:17,571 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-04-19 00:45:17,571 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-04-19 00:45:17,575 [ scc.git] DEBUG ## Unique users: []
2025-04-19 00:45:17,575 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:17,575 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:17,577 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-19 00:45:17,581 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:17,583 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-19 00:45:17,593 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-04-19 00:45:17,593 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-04-19 00:45:17,593 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-04-19 00:45:17,593 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-04-19 00:45:17,593 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-04-19 00:45:17,593 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-04-19 00:45:17,593 [ scc.git] DEBUG Auto-merging setup.py
2025-04-19 00:45:17,593 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-04-19 00:45:17,593 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-19 00:45:17,593 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-19 00:45:17,596 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-19 00:45:17,601 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-04-19 00:45:17,602 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:17,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:45:17,773 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-19 00:45:17,776 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-19 00:45:17,779 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#392](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/urls.py
- setup.py
- omero_signup/signup_settings.py
--conflicts
2025-04-19 00:45:17,781 [ scc.config] DEBUG Found github.token
2025-04-19 00:45:17,781 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-04-19 00:45:17,781 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-19 00:45:17,819 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:17,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:17,821 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-19 00:45:17,858 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-19 00:45:17,862 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f21f14b1bd0> has no local changes
2025-04-19 00:45:17,862 [ 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#392 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/)'
2025-04-19 00:45:17,869 [ scc.git] DEBUG [detached HEAD 534135c] merge master -Dorg -Ssuccess-only
2025-04-19 00:45:17,869 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:45:17,869 [ scc.repo] DEBUG ## PRs found:
2025-04-19 00:45:18,024 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:18,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-04-19 00:45:18,602 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:18,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-04-19 00:45:19,065 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:19,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-04-19 00:45:19,637 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:19,888 [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-19 00:45:20,139 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:20,365 [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-19 00:45:20,617 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:20,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-04-19 00:45:21,165 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:21,343 [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-19 00:45:21,344 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-04-19 00:45:21,595 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:21,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-04-19 00:45:22,196 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:22,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-04-19 00:45:22,689 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:22,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-04-19 00:45:23,243 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:23,492 [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-19 00:45:23,743 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:23,992 [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-19 00:45:24,243 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:24,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-04-19 00:45:24,737 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:24,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-04-19 00:45:25,227 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:25,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-04-19 00:45:25,687 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:25,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-04-19 00:45:26,151 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:26,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-19 00:45:26,644 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:26,871 [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-19 00:45:27,123 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:27,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-19 00:45:27,566 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:27,742 [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-19 00:45:27,742 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-19 00:45:27,742 [ scc.repo] DEBUG ## Branches found:
2025-04-19 00:45:27,742 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-19 00:45:27,742 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:27,742 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:27,745 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-19 00:45:27,747 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-19 00:45:27,748 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-19 00:45:27,751 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-19 00:45:27,753 [ scc.git] DEBUG Already up to date.
2025-04-19 00:45:27,754 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-04-19 00:45:28,058 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-19 00:45:28,059 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-04-19 00:45:28,063 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-04-19 00:45:28,364 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-19 00:45:28,364 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-04-19 00:45:28,368 [ scc.git] DEBUG ## Unique users: []
2025-04-19 00:45:28,368 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:28,368 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:28,371 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-04-19 00:45:28,375 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:28,377 [ 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-19 00:45:28,389 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-19 00:45:28,393 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-04-19 00:45:28,393 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-04-19 00:45:28,393 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-04-19 00:45:28,393 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-04-19 00:45:28,393 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-04-19 00:45:28,393 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-04-19 00:45:28,393 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-04-19 00:45:28,394 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:28,394 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-04-19 00:45:28,394 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-04-19 00:45:28,394 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-04-19 00:45:28,395 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-04-19 00:45:28,395 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-04-19 00:45:28,395 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-04-19 00:45:28,395 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-04-19 00:45:28,395 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-04-19 00:45:28,395 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-04-19 00:45:28,395 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-04-19 00:45:28,395 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-04-19 00:45:28,395 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-04-19 00:45:28,395 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-04-19 00:45:28,395 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-04-19 00:45:28,395 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-04-19 00:45:28,395 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-04-19 00:45:28,395 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-04-19 00:45:28,395 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-04-19 00:45:28,395 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-04-19 00:45:28,395 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-04-19 00:45:28,395 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-04-19 00:45:28,395 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-04-19 00:45:28,395 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-04-19 00:45:28,395 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-04-19 00:45:28,395 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-04-19 00:45:28,395 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-04-19 00:45:28,395 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-04-19 00:45:28,395 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-04-19 00:45:28,395 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-04-19 00:45:28,395 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-04-19 00:45:28,395 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-04-19 00:45:28,395 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-04-19 00:45:28,395 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-04-19 00:45:28,395 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-04-19 00:45:28,395 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-04-19 00:45:28,395 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-04-19 00:45:28,395 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-04-19 00:45:28,395 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-04-19 00:45:28,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:45:28,585 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-04-19 00:45:28,589 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:28,591 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-04-19 00:45:28,602 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-19 00:45:28,604 [ scc.git] DEBUG docker | 1 +
2025-04-19 00:45:28,604 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-04-19 00:45:28,836 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:29,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:45:29,004 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-19 00:45:29,042 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:29,042 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:29,044 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-19 00:45:29,080 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-19 00:45:29,085 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f21f2119e90> has no local changes
2025-04-19 00:45:29,085 [ 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#392 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/)'
2025-04-19 00:45:29,091 [ scc.git] DEBUG [detached HEAD 5096fc5] merge master -Dorg -Ssuccess-only
2025-04-19 00:45:29,091 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:45:29,091 [ scc.repo] DEBUG ## PRs found:
2025-04-19 00:45:29,255 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:29,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-04-19 00:45:29,437 [ scc.repo] DEBUG ## Branches found:
2025-04-19 00:45:29,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-19 00:45:29,437 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:29,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:29,440 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-19 00:45:29,442 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-19 00:45:29,442 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-19 00:45:29,445 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-19 00:45:29,448 [ scc.git] DEBUG Already up to date.
2025-04-19 00:45:29,448 [ scc.git] DEBUG ## Unique users: []
2025-04-19 00:45:29,448 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:29,448 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:29,450 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-19 00:45:29,487 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:29,487 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:29,489 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-19 00:45:29,525 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-19 00:45:29,528 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f21f033f910> has no local changes
2025-04-19 00:45:29,528 [ 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#392 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/)'
2025-04-19 00:45:29,534 [ scc.git] DEBUG [detached HEAD 0e70715] merge master -Dorg -Ssuccess-only
2025-04-19 00:45:29,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:45:29,535 [ scc.repo] DEBUG ## PRs found:
2025-04-19 00:45:29,688 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:29,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-04-19 00:45:30,216 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:30,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-04-19 00:45:30,691 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:30,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-04-19 00:45:31,157 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:31,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-19 00:45:31,712 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:31,954 [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-19 00:45:32,206 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:32,435 [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-19 00:45:32,686 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:32,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-19 00:45:33,206 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:33,393 [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-19 00:45:33,394 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-04-19 00:45:33,394 [ scc.repo] DEBUG ## Branches found:
2025-04-19 00:45:33,394 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-19 00:45:33,394 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:33,394 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:33,397 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-19 00:45:33,399 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-19 00:45:33,399 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-19 00:45:33,402 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-19 00:45:33,405 [ scc.git] DEBUG Already up to date.
2025-04-19 00:45:33,405 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-04-19 00:45:33,705 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-04-19 00:45:33,705 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-04-19 00:45:33,709 [ scc.git] DEBUG ## Unique users: []
2025-04-19 00:45:33,709 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:33,710 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:33,712 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-04-19 00:45:33,715 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:33,717 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-04-19 00:45:33,724 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-19 00:45:33,727 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-04-19 00:45:33,727 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-04-19 00:45:33,727 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-04-19 00:45:33,727 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-04-19 00:45:33,727 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-04-19 00:45:33,728 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:33,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:45:33,887 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-19 00:45:33,926 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:33,926 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:33,929 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-19 00:45:33,965 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-19 00:45:33,969 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f21f039b390> has no local changes
2025-04-19 00:45:33,969 [ 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#392 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/)'
2025-04-19 00:45:33,975 [ scc.git] DEBUG [detached HEAD 499c8e3] merge master -Dorg -Ssuccess-only
2025-04-19 00:45:33,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:45:33,975 [ scc.git] INFO Overriding base-branch from master to main
2025-04-19 00:45:33,976 [ scc.repo] DEBUG ## PRs found:
2025-04-19 00:45:34,138 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:34,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-04-19 00:45:34,642 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:34,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-04-19 00:45:35,135 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:35,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-04-19 00:45:35,612 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:35,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-04-19 00:45:36,136 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:36,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-19 00:45:36,607 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:36,839 [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-19 00:45:37,091 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:37,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-04-19 00:45:37,576 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:37,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-04-19 00:45:38,079 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:38,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-04-19 00:45:38,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:38,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-19 00:45:39,142 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:39,328 [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-19 00:45:39,580 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:39,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-19 00:45:40,024 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:40,197 [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-19 00:45:40,197 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-19 00:45:40,198 [ scc.repo] DEBUG ## Branches found:
2025-04-19 00:45:40,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-19 00:45:40,198 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:40,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:40,201 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-04-19 00:45:40,203 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-19 00:45:40,203 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-04-19 00:45:40,206 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-04-19 00:45:40,209 [ scc.git] DEBUG Already up to date.
2025-04-19 00:45:40,209 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-04-19 00:45:40,495 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-04-19 00:45:40,496 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-04-19 00:45:40,500 [ scc.git] DEBUG ## Unique users: []
2025-04-19 00:45:40,500 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:40,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:40,503 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-19 00:45:40,506 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:40,508 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-19 00:45:40,516 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-04-19 00:45:40,516 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-04-19 00:45:40,516 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-19 00:45:40,516 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-19 00:45:40,519 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-19 00:45:40,523 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-04-19 00:45:40,524 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:40,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:45:40,683 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-19 00:45:40,686 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-19 00:45:40,689 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#392](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-04-19 00:45:40,691 [ scc.config] DEBUG Found github.token
2025-04-19 00:45:40,691 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-04-19 00:45:40,691 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-19 00:45:40,729 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:40,729 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:40,731 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-19 00:45:40,767 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-19 00:45:40,771 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f21f0363e10> has no local changes
2025-04-19 00:45:40,771 [ 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#392 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/)'
2025-04-19 00:45:40,777 [ scc.git] DEBUG [detached HEAD a5ccce5] merge master -Dorg -Ssuccess-only
2025-04-19 00:45:40,777 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:45:40,777 [ scc.repo] DEBUG ## PRs found:
2025-04-19 00:45:40,934 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:41,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-04-19 00:45:41,120 [ scc.repo] DEBUG ## Branches found:
2025-04-19 00:45:41,120 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-19 00:45:41,120 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:41,120 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:41,123 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-19 00:45:41,125 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-19 00:45:41,125 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-19 00:45:41,128 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-19 00:45:41,131 [ scc.git] DEBUG Already up to date.
2025-04-19 00:45:41,131 [ scc.git] DEBUG ## Unique users: []
2025-04-19 00:45:41,131 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:41,131 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:41,133 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-19 00:45:41,170 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:41,170 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:41,172 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-19 00:45:41,209 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-19 00:45:41,212 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f21f0390c10> has no local changes
2025-04-19 00:45:41,213 [ 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#392 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/)'
2025-04-19 00:45:41,219 [ scc.git] DEBUG [detached HEAD 580c002] merge master -Dorg -Ssuccess-only
2025-04-19 00:45:41,219 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:45:41,219 [ scc.repo] DEBUG ## PRs found:
2025-04-19 00:45:41,371 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:41,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-04-19 00:45:41,570 [ scc.repo] DEBUG ## Branches found:
2025-04-19 00:45:41,570 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-19 00:45:41,570 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:41,570 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:41,572 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-19 00:45:41,574 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-19 00:45:41,574 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-19 00:45:41,577 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-19 00:45:41,580 [ scc.git] DEBUG Already up to date.
2025-04-19 00:45:41,580 [ scc.git] DEBUG ## Unique users: []
2025-04-19 00:45:41,580 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:41,580 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:41,582 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-19 00:45:41,620 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:41,620 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:41,622 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-19 00:45:41,658 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-19 00:45:41,661 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f21f1609690> has no local changes
2025-04-19 00:45:41,662 [ 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#392 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/)'
2025-04-19 00:45:41,668 [ scc.git] DEBUG [detached HEAD 0f1cfc0] merge master -Dorg -Ssuccess-only
2025-04-19 00:45:41,668 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:45:41,668 [ scc.repo] DEBUG ## PRs found:
2025-04-19 00:45:41,821 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:42,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-04-19 00:45:42,324 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:42,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-04-19 00:45:42,806 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:43,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-04-19 00:45:43,267 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:43,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-19 00:45:43,795 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:44,016 [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-19 00:45:44,267 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:44,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-19 00:45:44,798 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:44,985 [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-19 00:45:44,985 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-04-19 00:45:44,985 [ scc.repo] DEBUG ## Branches found:
2025-04-19 00:45:44,985 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-19 00:45:44,985 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:44,985 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:44,988 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-19 00:45:44,991 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-19 00:45:44,991 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-19 00:45:44,993 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-19 00:45:44,996 [ scc.git] DEBUG Already up to date.
2025-04-19 00:45:44,996 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-04-19 00:45:45,296 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-04-19 00:45:45,297 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-04-19 00:45:45,301 [ scc.git] DEBUG ## Unique users: []
2025-04-19 00:45:45,301 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:45,301 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:45,303 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-19 00:45:45,306 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:45,308 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-19 00:45:45,317 [ scc.git] DEBUG Auto-merging Dockerfile
2025-04-19 00:45:45,317 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-04-19 00:45:45,317 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-19 00:45:45,317 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-19 00:45:45,320 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-19 00:45:45,325 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-04-19 00:45:45,326 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:45,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:45:45,502 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-19 00:45:45,505 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-19 00:45:45,508 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#392](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-04-19 00:45:45,510 [ scc.config] DEBUG Found github.token
2025-04-19 00:45:45,510 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-04-19 00:45:45,510 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-19 00:45:45,547 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:45,547 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:45,549 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-19 00:45:45,587 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-19 00:45:45,591 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f21f1532e10> has no local changes
2025-04-19 00:45:45,591 [ 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#392 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/)'
2025-04-19 00:45:45,597 [ scc.git] DEBUG [detached HEAD df4c649] merge master -Dorg -Ssuccess-only
2025-04-19 00:45:45,598 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:45:45,598 [ scc.git] INFO Overriding base-branch from master to develop
2025-04-19 00:45:45,598 [ scc.repo] DEBUG ## PRs found:
2025-04-19 00:45:45,753 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:46,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-04-19 00:45:46,259 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:46,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-04-19 00:45:46,731 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:46,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-04-19 00:45:47,224 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:47,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-19 00:45:47,753 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:47,964 [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-19 00:45:48,215 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:48,436 [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-19 00:45:48,687 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:48,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-19 00:45:49,143 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:49,328 [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-19 00:45:49,329 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-19 00:45:49,580 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:49,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-04-19 00:45:50,075 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:50,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-04-19 00:45:50,530 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:50,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-19 00:45:51,035 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:51,231 [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-19 00:45:51,482 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:51,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-19 00:45:51,946 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:52,134 [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-19 00:45:52,134 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-19 00:45:52,385 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:52,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-04-19 00:45:52,865 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:53,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-04-19 00:45:53,414 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:53,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-04-19 00:45:53,897 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:54,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-04-19 00:45:54,167 [ scc.repo] DEBUG ## Branches found:
2025-04-19 00:45:54,167 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-19 00:45:54,167 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:54,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:54,169 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-04-19 00:45:54,172 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-19 00:45:54,172 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-04-19 00:45:54,175 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-04-19 00:45:54,183 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-04-19 00:45:54,417 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:54,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-04-19 00:45:54,752 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-04-19 00:45:55,091 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-19 00:45:55,091 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-04-19 00:45:55,095 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-04-19 00:45:55,376 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-19 00:45:55,376 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-04-19 00:45:55,380 [ scc.git] DEBUG ## Unique users: []
2025-04-19 00:45:55,380 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:55,380 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:55,383 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-19 00:45:55,388 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:55,390 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-19 00:45:55,401 [ 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-19 00:45:55,401 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-19 00:45:55,401 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-19 00:45:55,404 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-19 00:45:55,408 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-04-19 00:45:55,409 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:55,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:45:55,576 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-19 00:45:55,581 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-19 00:45:55,585 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#392](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-04-19 00:45:55,587 [ scc.config] DEBUG Found github.token
2025-04-19 00:45:55,587 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-04-19 00:45:55,587 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-19 00:45:55,592 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:55,594 [ 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-19 00:45:55,603 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-19 00:45:55,606 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-04-19 00:45:55,606 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-04-19 00:45:55,827 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:55,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:45:55,985 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-19 00:45:56,024 [ scc.git] DEBUG Get sha1 of %s
2025-04-19 00:45:56,024 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-19 00:45:56,027 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-19 00:45:56,063 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-19 00:45:56,067 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f21f14b0490> has no local changes
2025-04-19 00:45:56,067 [ 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#392 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/)'
2025-04-19 00:45:56,073 [ scc.git] DEBUG [detached HEAD 4869959] merge master -Dorg -Ssuccess-only
2025-04-19 00:45:56,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:45:56,074 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-19 00:45:56,146 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-04-19 00:45:56,236 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:56,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:45:56,424 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-04-19 00:45:56,426 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-04-19 00:45:56,671 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:56,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:45:56,844 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-04-19 00:45:56,846 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-04-19 00:45:57,091 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:57,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:45:57,270 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-04-19 00:45:57,272 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-04-19 00:45:57,517 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:57,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:45:57,684 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-04-19 00:45:57,929 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:58,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:45:58,089 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-04-19 00:45:58,091 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-04-19 00:45:58,336 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:58,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:45:58,499 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-04-19 00:45:58,501 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-04-19 00:45:58,745 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:58,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:45:58,908 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-04-19 00:45:58,910 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-04-19 00:45:59,155 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:59,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:45:59,317 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-04-19 00:45:59,319 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-04-19 00:45:59,564 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:45:59,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:45:59,734 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-04-19 00:45:59,736 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-04-19 00:45:59,981 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:46:00,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:46:00,141 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-04-19 00:46:00,143 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-04-19 00:46:00,388 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:46:00,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:46:00,547 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-04-19 00:46:00,549 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-04-19 00:46:00,794 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:46:00,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:46:00,960 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-04-19 00:46:00,962 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-04-19 00:46:01,207 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:46:01,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:46:01,384 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-04-19 00:46:01,628 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:46:01,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:46:01,800 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-04-19 00:46:02,045 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:46:02,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:46:02,210 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-04-19 00:46:02,212 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-04-19 00:46:02,456 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:46:02,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:46:02,625 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-04-19 00:46:02,870 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:46:03,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:46:03,190 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-04-19 00:46:03,435 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:46:03,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:46:03,604 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-04-19 00:46:03,606 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-04-19 00:46:03,851 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:46:04,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:46:04,013 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-04-19 00:46:04,014 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-04-19 00:46:04,259 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:46:04,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:46:04,424 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-04-19 00:46:04,426 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-04-19 00:46:04,670 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:46:04,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:46:04,848 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-04-19 00:46:04,850 [ scc.config] DEBUG Found submodule.scripts.url
2025-04-19 00:46:05,095 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-19 00:46:05,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-19 00:46:05,268 [ scc.config] DEBUG Found submodule.scripts.branch
2025-04-19 00:46:05,268 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-19 00:46:05,355 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f21f16c7650> has local changes
2025-04-19 00:46:05,355 [ 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 171 will-moore 'Initial addition of integration tests' (status: failure)
- 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'
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#392 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/392/)'
2025-04-19 00:46:05,369 [ scc.git] DEBUG [detached HEAD dab127f] merge master -Dorg -Ssuccess-only
2025-04-19 00:46:05,369 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-04-19 00:46:05,369 [ scc.merge] INFO Repository: ome/omero-plugins
2025-04-19 00:46:05,369 [ scc.merge] INFO Already up to date.
2025-04-19 00:46:05,369 [ scc.merge] INFO
2025-04-19 00:46:05,369 [ scc.merge] INFO Merged PRs:
2025-04-19 00:46:05,369 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-04-19 00:46:05,370 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-04-19 00:46:05,370 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-04-19 00:46:05,370 [ scc.merge] INFO
2025-04-19 00:46:05,370 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-04-19 00:46:05,370 [ scc.merge] INFO Already up to date.
2025-04-19 00:46:05,370 [ scc.merge] INFO
2025-04-19 00:46:05,370 [ scc.merge] INFO
2025-04-19 00:46:05,370 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-04-19 00:46:05,370 [ scc.merge] INFO Excluded PRs:
2025-04-19 00:46:05,370 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-04-19 00:46:05,370 [ scc.merge] INFO Already up to date.
2025-04-19 00:46:05,370 [ scc.merge] INFO
2025-04-19 00:46:05,370 [ scc.merge] INFO
2025-04-19 00:46:05,370 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-04-19 00:46:05,370 [ scc.merge] INFO Excluded PRs:
2025-04-19 00:46:05,370 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-04-19 00:46:05,370 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-04-19 00:46:05,370 [ scc.merge] INFO Already up to date.
2025-04-19 00:46:05,370 [ scc.merge] INFO
2025-04-19 00:46:05,370 [ scc.merge] INFO Merged PRs:
2025-04-19 00:46:05,370 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-04-19 00:46:05,370 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-04-19 00:46:05,370 [ scc.merge] INFO
2025-04-19 00:46:05,370 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-04-19 00:46:05,370 [ scc.merge] INFO Excluded PRs:
2025-04-19 00:46:05,370 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests' (status: failure)
2025-04-19 00:46:05,370 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-04-19 00:46:05,370 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-04-19 00:46:05,370 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-04-19 00:46:05,370 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-19 00:46:05,370 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-04-19 00:46:05,370 [ scc.merge] INFO Updating 11d3587..7a2c812
2025-04-19 00:46:05,370 [ scc.merge] INFO Previously merged:
2025-04-19 00:46:05,370 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-19 00:46:05,370 [ scc.merge] INFO
2025-04-19 00:46:05,370 [ scc.merge] INFO Merged PRs:
2025-04-19 00:46:05,370 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-04-19 00:46:05,370 [ scc.merge] INFO
2025-04-19 00:46:05,370 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-19 00:46:05,370 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-04-19 00:46:05,371 [ scc.merge] INFO
2025-04-19 00:46:05,371 [ scc.merge] INFO Repository: ome/omero-figure
2025-04-19 00:46:05,371 [ scc.merge] INFO Excluded PRs:
2025-04-19 00:46:05,371 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-04-19 00:46:05,371 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-04-19 00:46:05,371 [ scc.merge] INFO Updating 9cc36cde..4f0362e2
2025-04-19 00:46:05,371 [ scc.merge] INFO Previously merged:
2025-04-19 00:46:05,371 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-19 00:46:05,371 [ scc.merge] INFO
2025-04-19 00:46:05,371 [ scc.merge] INFO Merged PRs:
2025-04-19 00:46:05,371 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-04-19 00:46:05,371 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-04-19 00:46:05,371 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-04-19 00:46:05,371 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-04-19 00:46:05,371 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-04-19 00:46:05,371 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-04-19 00:46:05,371 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-04-19 00:46:05,371 [ scc.merge] INFO
2025-04-19 00:46:05,371 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-19 00:46:05,371 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-04-19 00:46:05,371 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-04-19 00:46:05,371 [ scc.merge] INFO
2025-04-19 00:46:05,371 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-04-19 00:46:05,371 [ scc.merge] INFO Already up to date.
2025-04-19 00:46:05,371 [ scc.merge] INFO
2025-04-19 00:46:05,371 [ scc.merge] INFO Merged PRs:
2025-04-19 00:46:05,371 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-04-19 00:46:05,371 [ scc.merge] INFO
2025-04-19 00:46:05,371 [ scc.merge] INFO Repository: ome/omero-gallery
2025-04-19 00:46:05,371 [ scc.merge] INFO Already up to date.
2025-04-19 00:46:05,371 [ scc.merge] INFO
2025-04-19 00:46:05,371 [ scc.merge] INFO Merged PRs:
2025-04-19 00:46:05,371 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-04-19 00:46:05,371 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-04-19 00:46:05,371 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-04-19 00:46:05,371 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-04-19 00:46:05,371 [ scc.merge] INFO
2025-04-19 00:46:05,371 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-19 00:46:05,371 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-04-19 00:46:05,371 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-04-19 00:46:05,371 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-04-19 00:46:05,372 [ scc.merge] INFO
2025-04-19 00:46:05,372 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-04-19 00:46:05,372 [ scc.merge] INFO Excluded PRs:
2025-04-19 00:46:05,372 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-04-19 00:46:05,372 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-04-19 00:46:05,372 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-04-19 00:46:05,372 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-04-19 00:46:05,372 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-04-19 00:46:05,372 [ scc.merge] INFO Already up to date.
2025-04-19 00:46:05,372 [ scc.merge] INFO
2025-04-19 00:46:05,372 [ scc.merge] INFO Merged PRs:
2025-04-19 00:46:05,372 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-04-19 00:46:05,372 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-04-19 00:46:05,372 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-04-19 00:46:05,372 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-04-19 00:46:05,372 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-19 00:46:05,372 [ scc.merge] INFO
2025-04-19 00:46:05,372 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-19 00:46:05,372 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-04-19 00:46:05,372 [ scc.merge] INFO
2025-04-19 00:46:05,372 [ scc.merge] INFO Repository: ome/omero-mapr
2025-04-19 00:46:05,372 [ scc.merge] INFO Excluded PRs:
2025-04-19 00:46:05,372 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-04-19 00:46:05,372 [ scc.merge] INFO Already up to date.
2025-04-19 00:46:05,372 [ scc.merge] INFO
2025-04-19 00:46:05,372 [ scc.merge] INFO Merged PRs:
2025-04-19 00:46:05,372 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-04-19 00:46:05,372 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-19 00:46:05,372 [ scc.merge] INFO
2025-04-19 00:46:05,372 [ scc.merge] INFO Repository: ome/omero-metadata
2025-04-19 00:46:05,372 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-04-19 00:46:05,372 [ scc.merge] INFO Previously merged:
2025-04-19 00:46:05,372 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-19 00:46:05,372 [ scc.merge] INFO
2025-04-19 00:46:05,372 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-19 00:46:05,372 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-19 00:46:05,372 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-19 00:46:05,372 [ scc.merge] INFO
2025-04-19 00:46:05,372 [ scc.merge] INFO Repository: ome/omero-parade
2025-04-19 00:46:05,372 [ scc.merge] INFO Excluded PRs:
2025-04-19 00:46:05,373 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-04-19 00:46:05,373 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-04-19 00:46:05,373 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-04-19 00:46:05,373 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-04-19 00:46:05,373 [ scc.merge] INFO Already up to date.
2025-04-19 00:46:05,373 [ scc.merge] INFO
2025-04-19 00:46:05,373 [ scc.merge] INFO Merged PRs:
2025-04-19 00:46:05,373 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-19 00:46:05,373 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-19 00:46:05,373 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-19 00:46:05,373 [ scc.merge] INFO
2025-04-19 00:46:05,373 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-04-19 00:46:05,373 [ scc.merge] INFO Already up to date.
2025-04-19 00:46:05,373 [ scc.merge] INFO
2025-04-19 00:46:05,373 [ scc.merge] INFO
2025-04-19 00:46:05,373 [ scc.merge] INFO Repository: ome/omero-rois
2025-04-19 00:46:05,373 [ scc.merge] INFO Excluded PRs:
2025-04-19 00:46:05,373 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-04-19 00:46:05,373 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-19 00:46:05,373 [ scc.merge] INFO Already up to date.
2025-04-19 00:46:05,373 [ scc.merge] INFO
2025-04-19 00:46:05,373 [ scc.merge] INFO
2025-04-19 00:46:05,373 [ scc.merge] INFO Repository: ome/omero-signup
2025-04-19 00:46:05,373 [ scc.merge] INFO Already up to date.
2025-04-19 00:46:05,373 [ scc.merge] INFO
2025-04-19 00:46:05,373 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-19 00:46:05,373 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-19 00:46:05,373 [ scc.merge] INFO
2025-04-19 00:46:05,373 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-04-19 00:46:05,373 [ scc.merge] INFO Excluded PRs:
2025-04-19 00:46:05,373 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-04-19 00:46:05,373 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-04-19 00:46:05,373 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-04-19 00:46:05,373 [ scc.merge] INFO Already up to date.
2025-04-19 00:46:05,373 [ scc.merge] INFO
2025-04-19 00:46:05,373 [ scc.merge] INFO Merged PRs:
2025-04-19 00:46:05,373 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-19 00:46:05,373 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-04-19 00:46:05,373 [ scc.merge] INFO
2025-04-19 00:46:05,373 [ scc.merge] INFO Repository: ome/omero-upload
2025-04-19 00:46:05,373 [ scc.merge] INFO Already up to date.
2025-04-19 00:46:05,374 [ scc.merge] INFO
2025-04-19 00:46:05,374 [ scc.merge] INFO
2025-04-19 00:46:05,374 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-04-19 00:46:05,374 [ scc.merge] INFO Already up to date.
2025-04-19 00:46:05,374 [ scc.merge] INFO
2025-04-19 00:46:05,374 [ scc.merge] INFO Merged PRs:
2025-04-19 00:46:05,374 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-04-19 00:46:05,374 [ scc.merge] INFO
2025-04-19 00:46:05,374 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-04-19 00:46:05,374 [ scc.merge] INFO Excluded PRs:
2025-04-19 00:46:05,374 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-04-19 00:46:05,374 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-04-19 00:46:05,374 [ scc.merge] INFO Already up to date.
2025-04-19 00:46:05,374 [ scc.merge] INFO
2025-04-19 00:46:05,374 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-19 00:46:05,374 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-19 00:46:05,374 [ scc.merge] INFO
2025-04-19 00:46:05,374 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-04-19 00:46:05,374 [ scc.merge] INFO Already up to date.
2025-04-19 00:46:05,374 [ scc.merge] INFO
2025-04-19 00:46:05,374 [ scc.merge] INFO
2025-04-19 00:46:05,374 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-04-19 00:46:05,374 [ scc.merge] INFO Already up to date.
2025-04-19 00:46:05,374 [ scc.merge] INFO
2025-04-19 00:46:05,374 [ scc.merge] INFO
2025-04-19 00:46:05,374 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-04-19 00:46:05,374 [ scc.merge] INFO Already up to date.
2025-04-19 00:46:05,374 [ scc.merge] INFO
2025-04-19 00:46:05,374 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-19 00:46:05,374 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-04-19 00:46:05,374 [ scc.merge] INFO
2025-04-19 00:46:05,374 [ scc.merge] INFO Repository: ome/scripts
2025-04-19 00:46:05,374 [ scc.merge] INFO Excluded PRs:
2025-04-19 00:46:05,374 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-04-19 00:46:05,374 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-04-19 00:46:05,374 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-04-19 00:46:05,374 [ scc.merge] INFO Previously merged:
2025-04-19 00:46:05,374 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-04-19 00:46:05,374 [ scc.merge] INFO
2025-04-19 00:46:05,374 [ scc.merge] INFO Merged PRs:
2025-04-19 00:46:05,374 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-19 00:46:05,374 [ scc.merge] INFO
2025-04-19 00:46:05,375 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-19 00:46:05,375 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-19 00:46:05,375 [ scc.merge] INFO
2025-04-19 00:46:05,375 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-04-19 00:46:05,375 [ scc.git] DEBUG Calling 'git remote'
2025-04-19 00:46:05,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-04-19 00:46:05,377 [ scc.git] DEBUG Calling 'git remote'
2025-04-19 00:46:05,379 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:46:05,379 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-04-19 00:46:05,379 [ scc.git] DEBUG Calling 'git remote'
2025-04-19 00:46:05,381 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:46:05,381 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-04-19 00:46:05,381 [ scc.git] DEBUG Calling 'git remote'
2025-04-19 00:46:05,383 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:46:05,383 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-04-19 00:46:05,383 [ scc.git] DEBUG Calling 'git remote'
2025-04-19 00:46:05,386 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:46:05,386 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-04-19 00:46:05,386 [ scc.git] DEBUG Calling 'git remote'
2025-04-19 00:46:05,388 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:46:05,388 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-04-19 00:46:05,388 [ scc.git] DEBUG Calling 'git remote'
2025-04-19 00:46:05,390 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:46:05,391 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-04-19 00:46:05,391 [ scc.git] DEBUG Calling 'git remote'
2025-04-19 00:46:05,393 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:46:05,393 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-04-19 00:46:05,393 [ scc.git] DEBUG Calling 'git remote'
2025-04-19 00:46:05,395 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:46:05,395 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-19 00:46:05,395 [ scc.git] DEBUG Calling 'git remote'
2025-04-19 00:46:05,397 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:46:05,397 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-19 00:46:05,397 [ scc.git] DEBUG Calling 'git remote'
2025-04-19 00:46:05,399 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:46:05,399 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-19 00:46:05,399 [ scc.git] DEBUG Calling 'git remote'
2025-04-19 00:46:05,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:46:05,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-19 00:46:05,401 [ scc.git] DEBUG Calling 'git remote'
2025-04-19 00:46:05,403 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:46:05,404 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-19 00:46:05,404 [ scc.git] DEBUG Calling 'git remote'
2025-04-19 00:46:05,406 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:46:05,406 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-19 00:46:05,406 [ scc.git] DEBUG Calling 'git remote'
2025-04-19 00:46:05,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:46:05,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-19 00:46:05,408 [ scc.git] DEBUG Calling 'git remote'
2025-04-19 00:46:05,410 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:46:05,410 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-19 00:46:05,410 [ scc.git] DEBUG Calling 'git remote'
2025-04-19 00:46:05,412 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:46:05,412 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-19 00:46:05,412 [ scc.git] DEBUG Calling 'git remote'
2025-04-19 00:46:05,414 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:46:05,414 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-19 00:46:05,414 [ scc.git] DEBUG Calling 'git remote'
2025-04-19 00:46:05,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:46:05,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-19 00:46:05,417 [ scc.git] DEBUG Calling 'git remote'
2025-04-19 00:46:05,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:46:05,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-19 00:46:05,419 [ scc.git] DEBUG Calling 'git remote'
2025-04-19 00:46:05,421 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:46:05,421 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-19 00:46:05,421 [ scc.git] DEBUG Calling 'git remote'
2025-04-19 00:46:05,423 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-19 00:46:05,423 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-19 00:46:05,423 [ scc.git] DEBUG Calling 'git remote'
2025-04-19 00:46:05,425 [ 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 58ac277] 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 09bba0d] 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-19 00:46:52,476 [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-19 00:47:01,800 [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-19 00:47:04,273 [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-19 00:47:09,091 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-19 00:47:49,278 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/9bac06d9/images/svgs/logo.svg){kind=logo}
