Console Output
Skipping 179 KB..
Full Log diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-11-29 00:31:12,179 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:12,181 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 94 (Use the release/v1 branch for the PyPA action publishing to PyPI) 1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-11-29 00:31:12,189 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-11-29 00:31:12,191 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-11-29 00:31:12,191 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-11-29 00:31:12,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:31:12,577 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...38cc352a088eaedfaa2dd8874c4f200f98f41a99'
2025-11-29 00:31:12,580 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:12,582 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 95 (Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows) 38cc352a088eaedfaa2dd8874c4f200f98f41a99'
2025-11-29 00:31:12,589 [ scc.git] DEBUG Auto-merging .github/workflows/publish_pypi.yml
2025-11-29 00:31:12,589 [ scc.git] DEBUG CONFLICT (content): Merge conflict in .github/workflows/publish_pypi.yml
2025-11-29 00:31:12,589 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-11-29 00:31:12,589 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-11-29 00:31:12,591 [ scc.git] DEBUG Calling 'git reset --hard cf2a1331d7a9e3ccef576825920941cf7c868e6b'
2025-11-29 00:31:12,595 [ scc.git] DEBUG HEAD is now at cf2a133 merge master -Dorg -Ssuccess-only: PR 94 (Use the release/v1 branch for the PyPA action publishing to PyPI)
2025-11-29 00:31:13,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:31:13,080 [ scc.git] DEBUG Calling 'git merge-base 0a557da89145e65db313c1721a26cb43e490dd8a 38cc352a088eaedfaa2dd8874c4f200f98f41a99'
2025-11-29 00:31:13,082 [ scc.git] DEBUG Calling 'git diff --name-only 0a557da89145e65db313c1721a26cb43e490dd8a..0a557da89145e65db313c1721a26cb43e490dd8a'
2025-11-29 00:31:13,085 [ scc.git] INFO - PR 95 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Conflicting PR. Removed from build [OMERO-plugins-push#587](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/consoleText) for more details.
Possible conflicts:
- PR #94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
- .github/workflows/publish_pypi.yml
--conflicts
2025-11-29 00:31:13,087 [ scc.config] DEBUG Found github.token
2025-11-29 00:31:13,087 [ scc.git] DEBUG Not adding comment to issue #95, already --conflicts.
2025-11-29 00:31:13,087 [ scc.git] DEBUG Calling 'git submodule update'
2025-11-29 00:31:13,122 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:31:13,122 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:13,124 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-11-29 00:31:13,158 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-11-29 00:31:13,161 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f45935e8190> has no local changes
2025-11-29 00:31:13,161 [ 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'
Conflicting PRs (not included):
- PR 95 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Generated by OMERO-plugins-push#587 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/)'
2025-11-29 00:31:13,167 [ scc.git] DEBUG [detached HEAD d776f35] merge master -Dorg -Ssuccess-only
2025-11-29 00:31:13,167 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:31:13,167 [ scc.repo] DEBUG ## PRs found:
2025-11-29 00:31:13,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-11-29 00:31:14,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-11-29 00:31:14,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-11-29 00:31:15,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-11-29 00:31:15,490 [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-11-29 00:31:16,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-11-29 00:31:16,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-11-29 00:31:16,446 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-11-29 00:31:16,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-11-29 00:31:17,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-11-29 00:31:17,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-11-29 00:31:18,423 [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-11-29 00:31:18,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-11-29 00:31:19,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-11-29 00:31:19,364 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-11-29 00:31:19,364 [ scc.repo] DEBUG ## Branches found:
2025-11-29 00:31:19,364 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-11-29 00:31:19,364 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:31:19,364 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:19,367 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-11-29 00:31:19,369 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-11-29 00:31:19,369 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-11-29 00:31:19,372 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-11-29 00:31:19,378 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-11-29 00:31:20,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-11-29 00:31:20,007 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-11-29 00:31:20,273 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-11-29 00:31:20,273 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-11-29 00:31:20,277 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-11-29 00:31:20,543 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-11-29 00:31:20,543 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-11-29 00:31:20,547 [ scc.git] DEBUG ## Unique users: []
2025-11-29 00:31:20,547 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:31:20,547 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:20,549 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-11-29 00:31:20,553 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:20,555 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-11-29 00:31:20,567 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-11-29 00:31:20,567 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-11-29 00:31:20,567 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-11-29 00:31:20,567 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-11-29 00:31:20,567 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-11-29 00:31:20,567 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-11-29 00:31:20,570 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-11-29 00:31:20,574 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-11-29 00:31:20,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:31:20,721 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-11-29 00:31:20,725 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-11-29 00:31:20,728 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#587](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-11-29 00:31:20,730 [ scc.config] DEBUG Found github.token
2025-11-29 00:31:20,730 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-11-29 00:31:20,730 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-11-29 00:31:20,733 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:20,736 [ 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-11-29 00:31:20,749 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-11-29 00:31:20,749 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-11-29 00:31:20,749 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-11-29 00:31:20,749 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-11-29 00:31:20,750 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-11-29 00:31:20,752 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-11-29 00:31:20,756 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-11-29 00:31:21,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:31:21,120 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-11-29 00:31:21,123 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-11-29 00:31:21,126 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#587](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/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-11-29 00:31:21,128 [ scc.config] DEBUG Found github.token
2025-11-29 00:31:21,128 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-11-29 00:31:21,128 [ scc.git] DEBUG Calling 'git submodule update'
2025-11-29 00:31:21,164 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:31:21,164 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:21,166 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-11-29 00:31:21,202 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-11-29 00:31:21,206 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f45934c82d0> has no local changes
2025-11-29 00:31:21,206 [ 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#587 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/)'
2025-11-29 00:31:21,211 [ scc.git] DEBUG [detached HEAD d5c29b9] merge master -Dorg -Ssuccess-only
2025-11-29 00:31:21,211 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:31:21,211 [ scc.repo] DEBUG ## PRs found:
2025-11-29 00:31:21,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-11-29 00:31:22,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-11-29 00:31:22,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-11-29 00:31:23,217 [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-11-29 00:31:23,712 [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-11-29 00:31:24,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-11-29 00:31:24,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-11-29 00:31:24,550 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-11-29 00:31:25,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-11-29 00:31:25,044 [ scc.repo] DEBUG # ... Include label: dependencies
2025-11-29 00:31:25,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-11-29 00:31:26,291 [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-11-29 00:31:26,889 [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-11-29 00:31:27,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-11-29 00:31:27,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-11-29 00:31:27,781 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-11-29 00:31:28,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-11-29 00:31:28,308 [ scc.repo] DEBUG # ... Include label: dependencies
2025-11-29 00:31:28,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-11-29 00:31:29,358 [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-11-29 00:31:29,900 [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-11-29 00:31:30,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-11-29 00:31:30,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-11-29 00:31:30,930 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-11-29 00:31:31,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-11-29 00:31:31,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-11-29 00:31:32,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-11-29 00:31:32,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-11-29 00:31:33,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-11-29 00:31:33,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-11-29 00:31:34,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-11-29 00:31:34,209 [ scc.repo] DEBUG ## Branches found:
2025-11-29 00:31:34,209 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-11-29 00:31:34,209 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:31:34,210 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:34,212 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-11-29 00:31:34,214 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-11-29 00:31:34,214 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-11-29 00:31:34,217 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-11-29 00:31:34,219 [ scc.git] DEBUG Already up to date.
2025-11-29 00:31:34,219 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-11-29 00:31:34,483 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-11-29 00:31:34,483 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-11-29 00:31:34,487 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-11-29 00:31:34,904 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-11-29 00:31:34,904 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-11-29 00:31:34,908 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-11-29 00:31:35,158 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-11-29 00:31:35,158 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-11-29 00:31:35,162 [ scc.git] DEBUG ## Unique users: []
2025-11-29 00:31:35,162 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:31:35,162 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:35,164 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-11-29 00:31:35,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:35,169 [ 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-11-29 00:31:35,176 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-11-29 00:31:35,179 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-11-29 00:31:35,179 [ scc.git] DEBUG package.json | 2 +-
2025-11-29 00:31:35,179 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-11-29 00:31:35,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:31:35,329 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-11-29 00:31:35,331 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:35,333 [ 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-11-29 00:31:35,342 [ scc.git] DEBUG Auto-merging package-lock.json
2025-11-29 00:31:35,342 [ scc.git] DEBUG Auto-merging package.json
2025-11-29 00:31:35,343 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-11-29 00:31:35,345 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-11-29 00:31:35,345 [ scc.git] DEBUG package.json | 2 +-
2025-11-29 00:31:35,345 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-11-29 00:31:35,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:31:35,736 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-11-29 00:31:35,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:35,741 [ 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-11-29 00:31:35,749 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-11-29 00:31:35,752 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-11-29 00:31:35,752 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-11-29 00:31:36,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:31:36,131 [ scc.git] DEBUG Calling 'git submodule update'
2025-11-29 00:31:36,168 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:31:36,169 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:36,171 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-11-29 00:31:36,206 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-11-29 00:31:36,210 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f45935c5250> has no local changes
2025-11-29 00:31:36,210 [ 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#587 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/)'
2025-11-29 00:31:36,216 [ scc.git] DEBUG [detached HEAD 14856db] merge master -Dorg -Ssuccess-only
2025-11-29 00:31:36,216 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:31:36,216 [ scc.repo] DEBUG ## PRs found:
2025-11-29 00:31:36,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 None
2025-11-29 00:31:37,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/issues/16 HTTP/1.1" 200 None
2025-11-29 00:31:37,166 [ scc.repo] DEBUG # ... Include label: dependencies
2025-11-29 00:31:37,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/5381b9f25e1666d81d236039a1317276291e9b2e HTTP/1.1" 200 None
2025-11-29 00:31:38,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/5381b9f25e1666d81d236039a1317276291e9b2e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-11-29 00:31:38,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/5381b9f25e1666d81d236039a1317276291e9b2e/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-11-29 00:31:39,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/commits/5381b9f25e1666d81d236039a1317276291e9b2e HTTP/1.1" 200 None
2025-11-29 00:31:39,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/statuses/5381b9f25e1666d81d236039a1317276291e9b2e?per_page=1 HTTP/1.1" 200 2
2025-11-29 00:31:39,896 [ scc.repo] DEBUG - PR 16 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-11-29 00:31:39,896 [ scc.repo] DEBUG ## Branches found:
2025-11-29 00:31:39,896 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-11-29 00:31:39,896 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:31:39,896 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:39,898 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-11-29 00:31:39,900 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-11-29 00:31:39,901 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-11-29 00:31:39,903 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-11-29 00:31:39,906 [ scc.git] DEBUG Already up to date.
2025-11-29 00:31:39,906 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2025-11-29 00:31:41,162 [ scc.git] DEBUG From https://github.com/ome/omero-prometheus-tools
2025-11-29 00:31:41,162 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2025-11-29 00:31:41,166 [ scc.git] DEBUG ## Unique users: []
2025-11-29 00:31:41,166 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:31:41,166 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:41,168 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5381b9f25e1666d81d236039a1317276291e9b2e'
2025-11-29 00:31:41,170 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:41,172 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows) 5381b9f25e1666d81d236039a1317276291e9b2e'
2025-11-29 00:31:41,179 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-11-29 00:31:41,181 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-11-29 00:31:41,181 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-11-29 00:31:41,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:31:41,348 [ scc.git] DEBUG Calling 'git submodule update'
2025-11-29 00:31:41,386 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:31:41,386 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:41,388 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-11-29 00:31:41,423 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-11-29 00:31:41,426 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4591401850> has no local changes
2025-11-29 00:31:41,426 [ 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.
Merged PRs:
- PR 16 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Generated by OMERO-plugins-push#587 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/)'
2025-11-29 00:31:41,431 [ scc.git] DEBUG [detached HEAD ca18025] merge master -Dorg -Ssuccess-only
2025-11-29 00:31:41,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:31:41,432 [ scc.repo] DEBUG ## PRs found:
2025-11-29 00:31:41,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-11-29 00:31:42,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/34 HTTP/1.1" 200 None
2025-11-29 00:31:42,391 [ scc.repo] DEBUG # ... Include label: dependencies
2025-11-29 00:31:42,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/149bb248277256d589ea0db597c04739e8134301 HTTP/1.1" 200 None
2025-11-29 00:31:43,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/149bb248277256d589ea0db597c04739e8134301/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-11-29 00:31:43,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/149bb248277256d589ea0db597c04739e8134301/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-11-29 00:31:44,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/149bb248277256d589ea0db597c04739e8134301 HTTP/1.1" 200 None
2025-11-29 00:31:44,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/149bb248277256d589ea0db597c04739e8134301?per_page=1 HTTP/1.1" 200 None
2025-11-29 00:31:45,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/149bb248277256d589ea0db597c04739e8134301 HTTP/1.1" 200 None
2025-11-29 00:31:45,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/149bb248277256d589ea0db597c04739e8134301/status HTTP/1.1" 200 None
2025-11-29 00:31:45,927 [ scc.repo] DEBUG - PR 34 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-11-29 00:31:46,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-11-29 00:31:46,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-11-29 00:31:47,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3 HTTP/1.1" 200 None
2025-11-29 00:31:47,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-11-29 00:31:48,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-11-29 00:31:48,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3 HTTP/1.1" 200 None
2025-11-29 00:31:49,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/statuses/1122baea98746effd4eb59deed25870f673ce3d3?per_page=1 HTTP/1.1" 200 None
2025-11-29 00:31:49,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3 HTTP/1.1" 200 None
2025-11-29 00:31:50,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/commits/1122baea98746effd4eb59deed25870f673ce3d3/status HTTP/1.1" 200 None
2025-11-29 00:31:50,300 [ scc.repo] DEBUG - PR 33 jo-mueller 'Add roi to array functions'
2025-11-29 00:31:50,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-11-29 00:31:50,802 [ scc.repo] DEBUG ## Branches found:
2025-11-29 00:31:50,802 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-11-29 00:31:50,802 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:31:50,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:50,804 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-11-29 00:31:50,807 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-11-29 00:31:50,807 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-11-29 00:31:50,809 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-11-29 00:31:50,812 [ scc.git] DEBUG Already up to date.
2025-11-29 00:31:50,812 [ scc.git] DEBUG Calling 'git fetch origin pull/33/head'
2025-11-29 00:31:51,091 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2025-11-29 00:31:51,091 [ scc.git] DEBUG * branch refs/pull/33/head -> FETCH_HEAD
2025-11-29 00:31:51,095 [ scc.git] DEBUG Calling 'git fetch origin pull/34/head'
2025-11-29 00:31:51,356 [ scc.git] DEBUG From https://github.com/ome/omero-rois
2025-11-29 00:31:51,356 [ scc.git] DEBUG * branch refs/pull/34/head -> FETCH_HEAD
2025-11-29 00:31:51,360 [ scc.git] DEBUG ## Unique users: []
2025-11-29 00:31:51,360 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:31:51,360 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:51,362 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1122baea98746effd4eb59deed25870f673ce3d3'
2025-11-29 00:31:51,365 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:51,366 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 33 (Add roi to array functions) 1122baea98746effd4eb59deed25870f673ce3d3'
2025-11-29 00:31:51,373 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-11-29 00:31:51,376 [ scc.git] DEBUG setup.py | 4 +-
2025-11-29 00:31:51,376 [ scc.git] DEBUG src/omero_rois/__init__.py | 4 +
2025-11-29 00:31:51,376 [ scc.git] DEBUG src/omero_rois/library.py | 204 +++++++++++++++++++++++++++++++++++++++++++--
2025-11-29 00:31:51,376 [ scc.git] DEBUG 3 files changed, 203 insertions(+), 9 deletions(-)
2025-11-29 00:31:51,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:31:51,528 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...149bb248277256d589ea0db597c04739e8134301'
2025-11-29 00:31:51,531 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:51,533 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 34 (Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows) 149bb248277256d589ea0db597c04739e8134301'
2025-11-29 00:31:51,540 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-11-29 00:31:51,542 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-11-29 00:31:51,542 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-11-29 00:31:51,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:31:51,939 [ scc.git] DEBUG Calling 'git submodule update'
2025-11-29 00:31:51,976 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:31:51,976 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:51,978 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-11-29 00:31:52,015 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-11-29 00:31:52,018 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f45913e8bd0> has no local changes
2025-11-29 00:31:52,018 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 33 jo-mueller 'Add roi to array functions'
- PR 34 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Generated by OMERO-plugins-push#587 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/)'
2025-11-29 00:31:52,023 [ scc.git] DEBUG [detached HEAD c2537eb] merge master -Dorg -Ssuccess-only
2025-11-29 00:31:52,024 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:31:52,024 [ scc.repo] DEBUG ## PRs found:
2025-11-29 00:31:52,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-11-29 00:31:53,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/22 HTTP/1.1" 200 None
2025-11-29 00:31:53,004 [ scc.repo] DEBUG # ... Include label: dependencies
2025-11-29 00:31:53,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/8b27e47a330555e99e9594f0c4b546946f4f98aa HTTP/1.1" 200 None
2025-11-29 00:31:54,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/8b27e47a330555e99e9594f0c4b546946f4f98aa/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-11-29 00:31:54,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/8b27e47a330555e99e9594f0c4b546946f4f98aa/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-11-29 00:31:55,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/8b27e47a330555e99e9594f0c4b546946f4f98aa HTTP/1.1" 200 None
2025-11-29 00:31:55,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/8b27e47a330555e99e9594f0c4b546946f4f98aa?per_page=1 HTTP/1.1" 200 2
2025-11-29 00:31:55,647 [ scc.repo] DEBUG - PR 22 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-11-29 00:31:56,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-11-29 00:31:56,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-11-29 00:31:57,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-11-29 00:31:57,559 [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-11-29 00:31:58,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-11-29 00:31:58,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-11-29 00:31:58,557 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-11-29 00:31:58,557 [ scc.repo] DEBUG ## Branches found:
2025-11-29 00:31:58,557 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-11-29 00:31:58,557 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:31:58,557 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:58,560 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-11-29 00:31:58,562 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-11-29 00:31:58,562 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-11-29 00:31:58,564 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-11-29 00:31:58,567 [ scc.git] DEBUG Already up to date.
2025-11-29 00:31:58,567 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-11-29 00:31:58,859 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-11-29 00:31:58,859 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-11-29 00:31:58,863 [ scc.git] DEBUG Calling 'git fetch origin pull/22/head'
2025-11-29 00:31:59,121 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-11-29 00:31:59,121 [ scc.git] DEBUG * branch refs/pull/22/head -> FETCH_HEAD
2025-11-29 00:31:59,125 [ scc.git] DEBUG ## Unique users: []
2025-11-29 00:31:59,125 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:31:59,125 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:59,127 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-11-29 00:31:59,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:59,132 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-11-29 00:31:59,140 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-11-29 00:31:59,140 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-11-29 00:31:59,140 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-11-29 00:31:59,140 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-11-29 00:31:59,140 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-11-29 00:31:59,140 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-11-29 00:31:59,140 [ scc.git] DEBUG Auto-merging setup.py
2025-11-29 00:31:59,140 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-11-29 00:31:59,140 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-11-29 00:31:59,140 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-11-29 00:31:59,142 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-11-29 00:31:59,146 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-11-29 00:31:59,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:31:59,298 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-11-29 00:31:59,301 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-11-29 00:31:59,303 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#587](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/urls.py
- omero_signup/signup_settings.py
- setup.py
- omero_signup/views.py
--conflicts
2025-11-29 00:31:59,305 [ scc.config] DEBUG Found github.token
2025-11-29 00:31:59,305 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-11-29 00:31:59,305 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8b27e47a330555e99e9594f0c4b546946f4f98aa'
2025-11-29 00:31:59,308 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:59,310 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 22 (Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows) 8b27e47a330555e99e9594f0c4b546946f4f98aa'
2025-11-29 00:31:59,316 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-11-29 00:31:59,319 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-11-29 00:31:59,319 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-11-29 00:31:59,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:31:59,693 [ scc.git] DEBUG Calling 'git submodule update'
2025-11-29 00:31:59,730 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:31:59,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:31:59,732 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-11-29 00:31:59,767 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-11-29 00:31:59,770 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f45913c7fd0> has no local changes
2025-11-29 00:31:59,770 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-signup
Already up to date.
Merged PRs:
- PR 22 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Generated by OMERO-plugins-push#587 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/)'
2025-11-29 00:31:59,776 [ scc.git] DEBUG [detached HEAD a582003] merge master -Dorg -Ssuccess-only
2025-11-29 00:31:59,776 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:31:59,776 [ scc.repo] DEBUG ## PRs found:
2025-11-29 00:32:00,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-11-29 00:32:00,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-11-29 00:32:01,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-11-29 00:32:01,810 [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-11-29 00:32:02,301 [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-11-29 00:32:02,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-11-29 00:32:03,258 [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-11-29 00:32:03,258 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-11-29 00:32:03,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-11-29 00:32:04,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-11-29 00:32:04,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-11-29 00:32:05,323 [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-11-29 00:32:05,824 [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-11-29 00:32:06,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-11-29 00:32:06,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-11-29 00:32:07,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-11-29 00:32:07,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-11-29 00:32:08,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-11-29 00:32:08,883 [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-11-29 00:32:09,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-11-29 00:32:09,815 [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-11-29 00:32:09,815 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-11-29 00:32:09,815 [ scc.repo] DEBUG ## Branches found:
2025-11-29 00:32:09,815 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-11-29 00:32:09,815 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:32:09,816 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:09,818 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-11-29 00:32:09,820 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-11-29 00:32:09,820 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-11-29 00:32:09,823 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-11-29 00:32:09,830 [ scc.git] DEBUG Updating cda3ec6..40b2517
2025-11-29 00:32:10,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls/81 HTTP/1.1" 200 None
2025-11-29 00:32:10,524 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-11-29 00:32:10,797 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-11-29 00:32:10,797 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-11-29 00:32:10,800 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-11-29 00:32:11,060 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-11-29 00:32:11,060 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-11-29 00:32:11,064 [ scc.git] DEBUG ## Unique users: []
2025-11-29 00:32:11,064 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:32:11,064 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:11,066 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-11-29 00:32:11,070 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:11,072 [ 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-11-29 00:32:11,082 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-11-29 00:32:11,085 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-11-29 00:32:11,085 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-11-29 00:32:11,085 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-11-29 00:32:11,085 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-11-29 00:32:11,085 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-11-29 00:32:11,085 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-11-29 00:32:11,085 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-11-29 00:32:11,086 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-11-29 00:32:11,086 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-11-29 00:32:11,086 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-11-29 00:32:11,086 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-11-29 00:32:11,087 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-11-29 00:32:11,087 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-11-29 00:32:11,087 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-11-29 00:32:11,087 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-11-29 00:32:11,087 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-11-29 00:32:11,087 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-11-29 00:32:11,087 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-11-29 00:32:11,087 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-11-29 00:32:11,087 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-11-29 00:32:11,087 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-11-29 00:32:11,087 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-11-29 00:32:11,087 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-11-29 00:32:11,087 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-11-29 00:32:11,087 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-11-29 00:32:11,087 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-11-29 00:32:11,087 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-11-29 00:32:11,087 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-11-29 00:32:11,087 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-11-29 00:32:11,087 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-11-29 00:32:11,087 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-11-29 00:32:11,087 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-11-29 00:32:11,087 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-11-29 00:32:11,087 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-11-29 00:32:11,087 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-11-29 00:32:11,087 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-11-29 00:32:11,087 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-11-29 00:32:11,087 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-11-29 00:32:11,087 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-11-29 00:32:11,087 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-11-29 00:32:11,087 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-11-29 00:32:11,087 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-11-29 00:32:11,087 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-11-29 00:32:11,087 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-11-29 00:32:11,087 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-11-29 00:32:11,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:11,240 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-11-29 00:32:11,244 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:11,246 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-11-29 00:32:11,255 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-11-29 00:32:11,257 [ scc.git] DEBUG docker | 1 +
2025-11-29 00:32:11,257 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-11-29 00:32:11,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:11,640 [ scc.git] DEBUG Calling 'git submodule update'
2025-11-29 00:32:11,677 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:32:11,677 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:11,679 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-11-29 00:32:11,715 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-11-29 00:32:11,718 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f45913f8f90> has no local changes
2025-11-29 00:32:11,718 [ 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)
Updating cda3ec6..40b2517
Previously merged:
- PR 81 erickmartins 'add ulimits to omero-server container'
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#587 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/)'
2025-11-29 00:32:11,724 [ scc.git] DEBUG [detached HEAD 1aa63f7] merge master -Dorg -Ssuccess-only
2025-11-29 00:32:11,725 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:11,725 [ scc.repo] DEBUG ## PRs found:
2025-11-29 00:32:12,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 None
2025-11-29 00:32:12,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/issues/14 HTTP/1.1" 200 None
2025-11-29 00:32:12,651 [ scc.repo] DEBUG # ... Include label: dependencies
2025-11-29 00:32:13,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/commits/1a4dbe9a31854f4f65c509ea929debf3319ba1ea HTTP/1.1" 200 None
2025-11-29 00:32:13,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/commits/1a4dbe9a31854f4f65c509ea929debf3319ba1ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-11-29 00:32:14,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/commits/1a4dbe9a31854f4f65c509ea929debf3319ba1ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-11-29 00:32:14,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/commits/1a4dbe9a31854f4f65c509ea929debf3319ba1ea HTTP/1.1" 200 None
2025-11-29 00:32:15,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/statuses/1a4dbe9a31854f4f65c509ea929debf3319ba1ea?per_page=1 HTTP/1.1" 200 2
2025-11-29 00:32:15,156 [ scc.repo] DEBUG - PR 14 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-11-29 00:32:15,156 [ scc.repo] DEBUG ## Branches found:
2025-11-29 00:32:15,156 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-11-29 00:32:15,156 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:32:15,156 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:15,159 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-11-29 00:32:15,161 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-11-29 00:32:15,161 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-11-29 00:32:15,163 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-11-29 00:32:15,166 [ scc.git] DEBUG Already up to date.
2025-11-29 00:32:15,166 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-11-29 00:32:15,428 [ scc.git] DEBUG From https://github.com/ome/omero-upload
2025-11-29 00:32:15,429 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-11-29 00:32:15,432 [ scc.git] DEBUG ## Unique users: []
2025-11-29 00:32:15,432 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:32:15,432 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:15,435 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1a4dbe9a31854f4f65c509ea929debf3319ba1ea'
2025-11-29 00:32:15,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:15,439 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows) 1a4dbe9a31854f4f65c509ea929debf3319ba1ea'
2025-11-29 00:32:15,446 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-11-29 00:32:15,448 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-11-29 00:32:15,448 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-11-29 00:32:15,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:15,610 [ scc.git] DEBUG Calling 'git submodule update'
2025-11-29 00:32:15,647 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:32:15,647 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:15,649 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-11-29 00:32:15,685 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-11-29 00:32:15,688 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f459141c4d0> has no local changes
2025-11-29 00:32:15,688 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-upload
Already up to date.
Merged PRs:
- PR 14 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Generated by OMERO-plugins-push#587 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/)'
2025-11-29 00:32:15,694 [ scc.git] DEBUG [detached HEAD 0825285] merge master -Dorg -Ssuccess-only
2025-11-29 00:32:15,694 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:15,694 [ scc.repo] DEBUG ## PRs found:
2025-11-29 00:32:16,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-11-29 00:32:16,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/22 HTTP/1.1" 200 None
2025-11-29 00:32:16,748 [ scc.repo] DEBUG # ... Include label: dependencies
2025-11-29 00:32:17,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/2ee819462af52bf2878fadf06d6ebdbafb8f1902 HTTP/1.1" 200 None
2025-11-29 00:32:17,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/2ee819462af52bf2878fadf06d6ebdbafb8f1902/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-11-29 00:32:18,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/2ee819462af52bf2878fadf06d6ebdbafb8f1902/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-11-29 00:32:18,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/2ee819462af52bf2878fadf06d6ebdbafb8f1902 HTTP/1.1" 200 None
2025-11-29 00:32:19,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/2ee819462af52bf2878fadf06d6ebdbafb8f1902?per_page=1 HTTP/1.1" 200 2
2025-11-29 00:32:19,263 [ scc.repo] DEBUG - PR 22 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-11-29 00:32:19,263 [ scc.repo] DEBUG ## Branches found:
2025-11-29 00:32:19,263 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-11-29 00:32:19,263 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:32:19,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:19,266 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-11-29 00:32:19,268 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-11-29 00:32:19,268 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-11-29 00:32:19,270 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-11-29 00:32:19,277 [ scc.git] DEBUG Updating deab817..160d894
2025-11-29 00:32:19,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls/20 HTTP/1.1" 200 None
2025-11-29 00:32:19,951 [ scc.git] DEBUG Calling 'git fetch origin pull/22/head'
2025-11-29 00:32:20,222 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-11-29 00:32:20,222 [ scc.git] DEBUG * branch refs/pull/22/head -> FETCH_HEAD
2025-11-29 00:32:20,226 [ scc.git] DEBUG ## Unique users: []
2025-11-29 00:32:20,226 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:32:20,226 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:20,228 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...2ee819462af52bf2878fadf06d6ebdbafb8f1902'
2025-11-29 00:32:20,231 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:20,233 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 22 (Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows) 2ee819462af52bf2878fadf06d6ebdbafb8f1902'
2025-11-29 00:32:20,239 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-11-29 00:32:20,241 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-11-29 00:32:20,241 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-11-29 00:32:20,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:20,386 [ scc.git] DEBUG Calling 'git submodule update'
2025-11-29 00:32:20,422 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:32:20,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:20,424 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-11-29 00:32:20,462 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-11-29 00:32:20,464 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f45913e7e90> has no local changes
2025-11-29 00:32:20,464 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-virtual-microscope
Updating deab817..160d894
Previously merged:
- PR 20 jburel 'Build'
Merged PRs:
- PR 22 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Generated by OMERO-plugins-push#587 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/)'
2025-11-29 00:32:20,470 [ scc.git] DEBUG [detached HEAD 434ba6e] merge master -Dorg -Ssuccess-only
2025-11-29 00:32:20,470 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:20,470 [ scc.git] INFO Overriding base-branch from master to main
2025-11-29 00:32:20,470 [ scc.repo] DEBUG ## PRs found:
2025-11-29 00:32:20,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-11-29 00:32:21,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/21 HTTP/1.1" 200 None
2025-11-29 00:32:21,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/21/comments HTTP/1.1" 200 None
2025-11-29 00:32:22,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/d07067753650282c9e8cdbbeae37897b7ed0d4cc HTTP/1.1" 200 None
2025-11-29 00:32:22,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/d07067753650282c9e8cdbbeae37897b7ed0d4cc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-11-29 00:32:23,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/d07067753650282c9e8cdbbeae37897b7ed0d4cc/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-11-29 00:32:23,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/d07067753650282c9e8cdbbeae37897b7ed0d4cc HTTP/1.1" 200 None
2025-11-29 00:32:24,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/d07067753650282c9e8cdbbeae37897b7ed0d4cc?per_page=1 HTTP/1.1" 200 2
2025-11-29 00:32:24,283 [ scc.repo] DEBUG - PR 21 will-moore 'Web zarr import'
2025-11-29 00:32:24,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-11-29 00:32:25,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-11-29 00:32:25,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-11-29 00:32:26,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-11-29 00:32:26,671 [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-11-29 00:32:27,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-11-29 00:32:27,596 [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-11-29 00:32:27,596 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-11-29 00:32:27,597 [ scc.repo] DEBUG ## Branches found:
2025-11-29 00:32:27,597 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-11-29 00:32:27,597 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:32:27,597 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:27,599 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-11-29 00:32:27,601 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-11-29 00:32:27,601 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-11-29 00:32:27,604 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-11-29 00:32:27,610 [ scc.git] DEBUG Updating 8f3c313..00e0207
2025-11-29 00:32:28,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls/20 HTTP/1.1" 200 None
2025-11-29 00:32:28,310 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-11-29 00:32:28,577 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-11-29 00:32:28,577 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-11-29 00:32:28,581 [ scc.git] DEBUG Calling 'git fetch origin pull/21/head'
2025-11-29 00:32:28,831 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-11-29 00:32:28,831 [ scc.git] DEBUG * branch refs/pull/21/head -> FETCH_HEAD
2025-11-29 00:32:28,835 [ scc.git] DEBUG ## Unique users: []
2025-11-29 00:32:28,836 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:32:28,836 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:28,838 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-11-29 00:32:28,840 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:28,842 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-11-29 00:32:28,849 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-11-29 00:32:28,850 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-11-29 00:32:28,850 [ scc.git] DEBUG Auto-merging omero_web_zarr/views.py
2025-11-29 00:32:28,850 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-11-29 00:32:28,850 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-11-29 00:32:28,852 [ scc.git] DEBUG Calling 'git reset --hard 00e02072dc29b04eba14c080ca8a0175a1499c15'
2025-11-29 00:32:28,856 [ scc.git] DEBUG HEAD is now at 00e0207 Merge pull request #20 from will-moore/zarr_python_v3
2025-11-29 00:32:29,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:29,020 [ scc.git] DEBUG Calling 'git merge-base 00e02072dc29b04eba14c080ca8a0175a1499c15 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-11-29 00:32:29,022 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..00e02072dc29b04eba14c080ca8a0175a1499c15'
2025-11-29 00:32:29,025 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#587](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-11-29 00:32:29,027 [ scc.config] DEBUG Found github.token
2025-11-29 00:32:29,027 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-11-29 00:32:29,027 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d07067753650282c9e8cdbbeae37897b7ed0d4cc'
2025-11-29 00:32:29,030 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:29,032 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 21 (Web zarr import) d07067753650282c9e8cdbbeae37897b7ed0d4cc'
2025-11-29 00:32:29,039 [ scc.git] DEBUG Auto-merging omero_web_zarr/views.py
2025-11-29 00:32:29,040 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-11-29 00:32:29,042 [ scc.git] DEBUG README.rst | 3 +
2025-11-29 00:32:29,042 [ scc.git] DEBUG .../templates/omero_web_zarr/zarr_import.html | 358 +++++++++++++++++++++
2025-11-29 00:32:29,042 [ scc.git] DEBUG omero_web_zarr/urls.py | 2 +
2025-11-29 00:32:29,042 [ scc.git] DEBUG omero_web_zarr/views.py | 43 ++-
2025-11-29 00:32:29,042 [ scc.git] DEBUG setup.py | 5 +-
2025-11-29 00:32:29,042 [ scc.git] DEBUG 5 files changed, 409 insertions(+), 2 deletions(-)
2025-11-29 00:32:29,042 [ scc.git] DEBUG create mode 100644 omero_web_zarr/templates/omero_web_zarr/zarr_import.html
2025-11-29 00:32:29,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:29,454 [ scc.git] DEBUG Calling 'git submodule update'
2025-11-29 00:32:29,491 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:32:29,491 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:29,493 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-11-29 00:32:29,528 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-11-29 00:32:29,531 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4593541ad0> has no local changes
2025-11-29 00:32:29,531 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Updating 8f3c313..00e0207
Previously merged:
- PR 20 will-moore 'Use zarr_format=2 for .zarray and chunk endpoints'
Merged PRs:
- PR 21 will-moore 'Web zarr import'
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Generated by OMERO-plugins-push#587 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/)'
2025-11-29 00:32:29,537 [ scc.git] DEBUG [detached HEAD d03521a] merge master -Dorg -Ssuccess-only
2025-11-29 00:32:29,537 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:29,537 [ scc.repo] DEBUG ## PRs found:
2025-11-29 00:32:29,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 None
2025-11-29 00:32:30,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/issues/25 HTTP/1.1" 200 None
2025-11-29 00:32:30,488 [ scc.repo] DEBUG # ... Include label: dependencies
2025-11-29 00:32:31,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/commits/c73bedb717b9ecce0af666245d3486aa5a2dafe9 HTTP/1.1" 200 None
2025-11-29 00:32:31,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/commits/c73bedb717b9ecce0af666245d3486aa5a2dafe9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-11-29 00:32:32,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/commits/c73bedb717b9ecce0af666245d3486aa5a2dafe9/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-11-29 00:32:32,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/commits/c73bedb717b9ecce0af666245d3486aa5a2dafe9 HTTP/1.1" 200 None
2025-11-29 00:32:32,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/statuses/c73bedb717b9ecce0af666245d3486aa5a2dafe9?per_page=1 HTTP/1.1" 200 2
2025-11-29 00:32:32,948 [ scc.repo] DEBUG - PR 25 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-11-29 00:32:32,948 [ scc.repo] DEBUG ## Branches found:
2025-11-29 00:32:32,948 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-11-29 00:32:32,948 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:32:32,948 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:32,950 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-11-29 00:32:32,952 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-11-29 00:32:32,952 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-11-29 00:32:32,955 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-11-29 00:32:32,957 [ scc.git] DEBUG Already up to date.
2025-11-29 00:32:32,958 [ scc.git] DEBUG Calling 'git fetch origin pull/25/head'
2025-11-29 00:32:33,227 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-weberror
2025-11-29 00:32:33,227 [ scc.git] DEBUG * branch refs/pull/25/head -> FETCH_HEAD
2025-11-29 00:32:33,231 [ scc.git] DEBUG ## Unique users: []
2025-11-29 00:32:33,231 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:32:33,231 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:33,233 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c73bedb717b9ecce0af666245d3486aa5a2dafe9'
2025-11-29 00:32:33,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:33,238 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 25 (Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows) c73bedb717b9ecce0af666245d3486aa5a2dafe9'
2025-11-29 00:32:33,244 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-11-29 00:32:33,246 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-11-29 00:32:33,247 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-11-29 00:32:33,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:33,398 [ scc.git] DEBUG Calling 'git submodule update'
2025-11-29 00:32:33,434 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:32:33,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:33,436 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-11-29 00:32:33,473 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-11-29 00:32:33,476 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4591464550> has no local changes
2025-11-29 00:32:33,476 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-weberror
Already up to date.
Merged PRs:
- PR 25 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Generated by OMERO-plugins-push#587 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/)'
2025-11-29 00:32:33,481 [ scc.git] DEBUG [detached HEAD 8cdda34] merge master -Dorg -Ssuccess-only
2025-11-29 00:32:33,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:33,481 [ scc.repo] DEBUG ## PRs found:
2025-11-29 00:32:33,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 None
2025-11-29 00:32:34,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/issues/37 HTTP/1.1" 200 None
2025-11-29 00:32:34,412 [ scc.repo] DEBUG # ... Include label: dependencies
2025-11-29 00:32:34,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/commits/8cf5f7e65ae8e945b134e41e77bc13a785aff478 HTTP/1.1" 200 None
2025-11-29 00:32:35,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/commits/8cf5f7e65ae8e945b134e41e77bc13a785aff478/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-11-29 00:32:35,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/commits/8cf5f7e65ae8e945b134e41e77bc13a785aff478/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-11-29 00:32:36,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/commits/8cf5f7e65ae8e945b134e41e77bc13a785aff478 HTTP/1.1" 200 None
2025-11-29 00:32:36,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/statuses/8cf5f7e65ae8e945b134e41e77bc13a785aff478?per_page=1 HTTP/1.1" 200 2
2025-11-29 00:32:36,927 [ scc.repo] DEBUG - PR 37 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-11-29 00:32:36,927 [ scc.repo] DEBUG ## Branches found:
2025-11-29 00:32:36,927 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-11-29 00:32:36,927 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:32:36,927 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:36,930 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-11-29 00:32:36,932 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-11-29 00:32:36,932 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-11-29 00:32:36,934 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-11-29 00:32:36,937 [ scc.git] DEBUG Already up to date.
2025-11-29 00:32:36,937 [ scc.git] DEBUG Calling 'git fetch origin pull/37/head'
2025-11-29 00:32:37,211 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-webtest
2025-11-29 00:32:37,212 [ scc.git] DEBUG * branch refs/pull/37/head -> FETCH_HEAD
2025-11-29 00:32:37,215 [ scc.git] DEBUG ## Unique users: []
2025-11-29 00:32:37,215 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:32:37,215 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:37,217 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8cf5f7e65ae8e945b134e41e77bc13a785aff478'
2025-11-29 00:32:37,220 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:37,222 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 37 (Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows) 8cf5f7e65ae8e945b134e41e77bc13a785aff478'
2025-11-29 00:32:37,228 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-11-29 00:32:37,230 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-11-29 00:32:37,230 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-11-29 00:32:37,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:37,385 [ scc.git] DEBUG Calling 'git submodule update'
2025-11-29 00:32:37,422 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:32:37,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:37,424 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-11-29 00:32:37,459 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-11-29 00:32:37,462 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f45935dad50> has no local changes
2025-11-29 00:32:37,462 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-webtest
Already up to date.
Merged PRs:
- PR 37 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Generated by OMERO-plugins-push#587 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/)'
2025-11-29 00:32:37,467 [ scc.git] DEBUG [detached HEAD 153d46b] merge master -Dorg -Ssuccess-only
2025-11-29 00:32:37,467 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:37,467 [ scc.repo] DEBUG ## PRs found:
2025-11-29 00:32:37,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-11-29 00:32:38,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-11-29 00:32:38,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-11-29 00:32:39,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-11-29 00:32:39,796 [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-11-29 00:32:40,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-11-29 00:32:40,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-11-29 00:32:40,753 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-11-29 00:32:40,754 [ scc.repo] DEBUG ## Branches found:
2025-11-29 00:32:40,754 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-11-29 00:32:40,754 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:32:40,754 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:40,756 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-11-29 00:32:40,758 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-11-29 00:32:40,758 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-11-29 00:32:40,760 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-11-29 00:32:40,763 [ scc.git] DEBUG Already up to date.
2025-11-29 00:32:40,763 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-11-29 00:32:41,035 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-11-29 00:32:41,035 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-11-29 00:32:41,039 [ scc.git] DEBUG ## Unique users: []
2025-11-29 00:32:41,039 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:32:41,039 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:41,041 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-11-29 00:32:41,044 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:41,046 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-11-29 00:32:41,054 [ scc.git] DEBUG Auto-merging Dockerfile
2025-11-29 00:32:41,054 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-11-29 00:32:41,054 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-11-29 00:32:41,054 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-11-29 00:32:41,057 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-11-29 00:32:41,061 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-11-29 00:32:41,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:41,368 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-11-29 00:32:41,371 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-11-29 00:32:41,373 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#587](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-11-29 00:32:41,375 [ scc.config] DEBUG Found github.token
2025-11-29 00:32:41,375 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-11-29 00:32:41,375 [ scc.git] DEBUG Calling 'git submodule update'
2025-11-29 00:32:41,413 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:32:41,413 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:41,415 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-11-29 00:32:41,452 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-11-29 00:32:41,455 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f45902784d0> has no local changes
2025-11-29 00:32:41,455 [ 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#587 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/)'
2025-11-29 00:32:41,461 [ scc.git] DEBUG [detached HEAD a14d4f5] merge master -Dorg -Ssuccess-only
2025-11-29 00:32:41,461 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:41,461 [ scc.git] INFO Overriding base-branch from master to develop
2025-11-29 00:32:41,461 [ scc.repo] DEBUG ## PRs found:
2025-11-29 00:32:41,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-11-29 00:32:42,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/229 HTTP/1.1" 200 None
2025-11-29 00:32:42,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/229/comments HTTP/1.1" 200 None
2025-11-29 00:32:43,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-11-29 00:32:43,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-11-29 00:32:43,834 [ scc.repo] DEBUG ## Branches found:
2025-11-29 00:32:43,834 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-11-29 00:32:43,834 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:32:43,834 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:43,836 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-11-29 00:32:43,838 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-11-29 00:32:43,838 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-11-29 00:32:43,841 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-11-29 00:32:43,853 [ scc.git] DEBUG Updating 4b4c755..0c7356a
2025-11-29 00:32:44,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/223 HTTP/1.1" 200 None
2025-11-29 00:32:45,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/230 HTTP/1.1" 200 None
2025-11-29 00:32:45,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/228 HTTP/1.1" 200 None
2025-11-29 00:32:46,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/227 HTTP/1.1" 200 None
2025-11-29 00:32:47,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-11-29 00:32:47,070 [ scc.git] DEBUG ## Unique users: []
2025-11-29 00:32:47,070 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:32:47,070 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:47,072 [ scc.git] DEBUG Calling 'git submodule update'
2025-11-29 00:32:47,109 [ scc.git] DEBUG Get sha1 of %s
2025-11-29 00:32:47,109 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-11-29 00:32:47,111 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-11-29 00:32:47,147 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-11-29 00:32:47,151 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f459027add0> has no local changes
2025-11-29 00:32:47,151 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 229 Rdornier 'Adding support for custom user label' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
Updating 4b4c755..0c7356a
Previously merged:
- PR 223 will-moore 'don't attempt ROI stats on big images'
- PR 230 Rdornier 'Import from csv fix'
- PR 228 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.3.0 to 1.13.0 in /.github/workflows'
- PR 227 jburel 'Replace tostring by tobytes'
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Generated by OMERO-plugins-push#587 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/)'
2025-11-29 00:32:47,156 [ scc.git] DEBUG [detached HEAD 6acde7b] merge master -Dorg -Ssuccess-only
2025-11-29 00:32:47,157 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:47,157 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-11-29 00:32:47,228 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-11-29 00:32:47,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:47,478 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-11-29 00:32:47,480 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-11-29 00:32:47,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:47,874 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-11-29 00:32:47,875 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-11-29 00:32:48,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:48,274 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-11-29 00:32:48,276 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-11-29 00:32:48,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:48,672 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-11-29 00:32:49,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:49,068 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-11-29 00:32:49,070 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-11-29 00:32:49,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:49,478 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-11-29 00:32:49,480 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-11-29 00:32:49,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:49,872 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-11-29 00:32:49,874 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-11-29 00:32:50,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:50,283 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-11-29 00:32:50,285 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-11-29 00:32:50,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:50,683 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-11-29 00:32:50,685 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-11-29 00:32:51,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:51,079 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-11-29 00:32:51,080 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-11-29 00:32:51,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:51,597 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-11-29 00:32:51,599 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-11-29 00:32:51,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:52,000 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-11-29 00:32:52,002 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-11-29 00:32:52,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:52,396 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-11-29 00:32:52,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:52,874 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-11-29 00:32:53,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:53,273 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-11-29 00:32:53,274 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-11-29 00:32:53,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:53,665 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-11-29 00:32:54,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:54,050 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-11-29 00:32:54,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:54,448 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-11-29 00:32:54,449 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-11-29 00:32:54,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:54,855 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-11-29 00:32:54,857 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-11-29 00:32:55,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:55,254 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-11-29 00:32:55,255 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-11-29 00:32:55,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:55,654 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-11-29 00:32:55,655 [ scc.config] DEBUG Found submodule.scripts.url
2025-11-29 00:32:56,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-11-29 00:32:56,047 [ scc.config] DEBUG Found submodule.scripts.branch
2025-11-29 00:32:56,047 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-11-29 00:32:56,123 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4593543f50> has local changes
2025-11-29 00:32:56,123 [ 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.
Merged PRs:
- PR 29 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
- PR 71 dominikl 'Escape slash character in image names'
- PR 73 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (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 167 dominikl 'Add extinfo command' (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..37ea700
Previously merged:
- PR 180 will-moore 'Import command'
- PR 179 will-moore 'Changelog 0.6.0'
- PR 177 jburel 'Replace fromstring by frombuffer'
- PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
- PR 147 will-moore 'Name option'
- PR 173 will-moore 'Add test_export_plate_polygons()'
- PR 171 will-moore 'Initial addition of integration tests'
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 174 will-moore 'Skip wells'
- PR 181 will-moore 'Add labels support for import'
Conflicting PRs (not included):
- PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
- PR 182 will-moore 'Revert "Remove support for Plate import"'
Repository: ome/omero-figure
Excluded PRs:
- PR 647 Rdornier 'enable dragging and resizing shapes without having to select it multi…' (user: Rdornier)
- PR 641 Rdornier 'OMERO ROIs improvements : filtering visible and adding all' (user: Rdornier)
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
Updating 9cc36cde..691a9a60
Previously merged:
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 644 dependabot[bot] 'Bump vite from 6.2.6 to 6.4.1'
- PR 646 JensWendt 'fix word wrap of image names'
- PR 612 will-moore 'Script version'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
- PR 616 Rdornier 'Fix labels around border'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 638 Rdornier 'Fix arrow opacity'
- PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
- PR 635 dependabot[bot] 'Bump esbuild and vite'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 600 Rdornier 'Label on rois'
Conflicting PRs (not included):
- PR 637 Rdornier 'Fix scalebar position'
- PR 643 Rdornier 'Shape scaling'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
- PR 31 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
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 508 will-moore 'Broadcast channel demo' (stage: draft)
- PR 503 will-moore 'Basic working tile-coordinates grid 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)
Updating 7a798ce..bb94cf8
Previously merged:
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
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'
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'
Conflicting PRs (not included):
- PR 95 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
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.
Merged PRs:
- PR 16 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Repository: ome/omero-rois
Excluded PRs:
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Merged PRs:
- PR 33 jo-mueller 'Add roi to array functions'
- PR 34 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Repository: ome/omero-signup
Already up to date.
Merged PRs:
- PR 22 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
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)
Updating cda3ec6..40b2517
Previously merged:
- PR 81 erickmartins 'add ulimits to omero-server container'
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.
Merged PRs:
- PR 14 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Repository: ome/omero-virtual-microscope
Updating deab817..160d894
Previously merged:
- PR 20 jburel 'Build'
Merged PRs:
- PR 22 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Updating 8f3c313..00e0207
Previously merged:
- PR 20 will-moore 'Use zarr_format=2 for .zarray and chunk endpoints'
Merged PRs:
- PR 21 will-moore 'Web zarr import'
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Merged PRs:
- PR 25 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Repository: openmicroscopy/omero-webtest
Already up to date.
Merged PRs:
- PR 37 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 229 Rdornier 'Adding support for custom user label' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
Updating 4b4c755..0c7356a
Previously merged:
- PR 223 will-moore 'don't attempt ROI stats on big images'
- PR 230 Rdornier 'Import from csv fix'
- PR 228 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.3.0 to 1.13.0 in /.github/workflows'
- PR 227 jburel 'Replace tostring by tobytes'
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Generated by OMERO-plugins-push#587 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/587/)'
2025-11-29 00:32:56,133 [ scc.git] DEBUG [detached HEAD 01098dc] merge master -Dorg -Ssuccess-only
2025-11-29 00:32:56,133 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-11-29 00:32:56,133 [ scc.merge] INFO Repository: ome/omero-plugins
2025-11-29 00:32:56,133 [ scc.merge] INFO Already up to date.
2025-11-29 00:32:56,133 [ scc.merge] INFO
2025-11-29 00:32:56,133 [ scc.merge] INFO Merged PRs:
2025-11-29 00:32:56,133 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-11-29 00:32:56,133 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-11-29 00:32:56,133 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-11-29 00:32:56,133 [ scc.merge] INFO
2025-11-29 00:32:56,133 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-11-29 00:32:56,133 [ scc.merge] INFO Already up to date.
2025-11-29 00:32:56,133 [ scc.merge] INFO
2025-11-29 00:32:56,133 [ scc.merge] INFO
2025-11-29 00:32:56,133 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-11-29 00:32:56,133 [ scc.merge] INFO Excluded PRs:
2025-11-29 00:32:56,133 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-11-29 00:32:56,133 [ scc.merge] INFO Already up to date.
2025-11-29 00:32:56,133 [ scc.merge] INFO
2025-11-29 00:32:56,133 [ scc.merge] INFO Merged PRs:
2025-11-29 00:32:56,133 [ scc.merge] INFO - PR 29 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-11-29 00:32:56,133 [ scc.merge] INFO
2025-11-29 00:32:56,133 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-11-29 00:32:56,133 [ scc.merge] INFO Excluded PRs:
2025-11-29 00:32:56,133 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-11-29 00:32:56,133 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-11-29 00:32:56,134 [ scc.merge] INFO Already up to date.
2025-11-29 00:32:56,134 [ scc.merge] INFO
2025-11-29 00:32:56,134 [ scc.merge] INFO Merged PRs:
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 73 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-11-29 00:32:56,134 [ scc.merge] INFO
2025-11-29 00:32:56,134 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-11-29 00:32:56,134 [ scc.merge] INFO Excluded PRs:
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-11-29 00:32:56,134 [ scc.merge] INFO Updating 11d3587..37ea700
2025-11-29 00:32:56,134 [ scc.merge] INFO Previously merged:
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 180 will-moore 'Import command'
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 179 will-moore 'Changelog 0.6.0'
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 177 jburel 'Replace fromstring by frombuffer'
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 173 will-moore 'Add test_export_plate_polygons()'
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-11-29 00:32:56,134 [ scc.merge] INFO
2025-11-29 00:32:56,134 [ scc.merge] INFO Merged PRs:
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 174 will-moore 'Skip wells'
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 181 will-moore 'Add labels support for import'
2025-11-29 00:32:56,134 [ scc.merge] INFO
2025-11-29 00:32:56,134 [ scc.merge] INFO Conflicting PRs (not included):
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 178 will-moore 'Fix export of masks with multi-theC as multi-channel labels'
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 182 will-moore 'Revert "Remove support for Plate import"'
2025-11-29 00:32:56,134 [ scc.merge] INFO
2025-11-29 00:32:56,134 [ scc.merge] INFO Repository: ome/omero-figure
2025-11-29 00:32:56,134 [ scc.merge] INFO Excluded PRs:
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 647 Rdornier 'enable dragging and resizing shapes without having to select it multi…' (user: Rdornier)
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 641 Rdornier 'OMERO ROIs improvements : filtering visible and adding all' (user: Rdornier)
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-11-29 00:32:56,134 [ scc.merge] INFO Updating 9cc36cde..691a9a60
2025-11-29 00:32:56,134 [ scc.merge] INFO Previously merged:
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 644 dependabot[bot] 'Bump vite from 6.2.6 to 6.4.1'
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 646 JensWendt 'fix word wrap of image names'
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-11-29 00:32:56,134 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity'
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-11-29 00:32:56,135 [ scc.merge] INFO
2025-11-29 00:32:56,135 [ scc.merge] INFO Merged PRs:
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-11-29 00:32:56,135 [ scc.merge] INFO
2025-11-29 00:32:56,135 [ scc.merge] INFO Conflicting PRs (not included):
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position'
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 643 Rdornier 'Shape scaling'
2025-11-29 00:32:56,135 [ scc.merge] INFO
2025-11-29 00:32:56,135 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-11-29 00:32:56,135 [ scc.merge] INFO Already up to date.
2025-11-29 00:32:56,135 [ scc.merge] INFO
2025-11-29 00:32:56,135 [ scc.merge] INFO Merged PRs:
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 31 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-11-29 00:32:56,135 [ scc.merge] INFO
2025-11-29 00:32:56,135 [ scc.merge] INFO Repository: ome/omero-gallery
2025-11-29 00:32:56,135 [ scc.merge] INFO Already up to date.
2025-11-29 00:32:56,135 [ scc.merge] INFO
2025-11-29 00:32:56,135 [ scc.merge] INFO Merged PRs:
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-11-29 00:32:56,135 [ scc.merge] INFO
2025-11-29 00:32:56,135 [ scc.merge] INFO Conflicting PRs (not included):
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-11-29 00:32:56,135 [ scc.merge] INFO
2025-11-29 00:32:56,135 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-11-29 00:32:56,135 [ scc.merge] INFO Excluded PRs:
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 508 will-moore 'Broadcast channel demo' (stage: draft)
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates grid shown over the image' (stage: draft)
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-11-29 00:32:56,135 [ scc.merge] INFO Updating 7a798ce..bb94cf8
2025-11-29 00:32:56,135 [ scc.merge] INFO Previously merged:
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-11-29 00:32:56,135 [ scc.merge] INFO
2025-11-29 00:32:56,135 [ scc.merge] INFO Merged PRs:
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-11-29 00:32:56,135 [ scc.merge] INFO
2025-11-29 00:32:56,135 [ scc.merge] INFO Conflicting PRs (not included):
2025-11-29 00:32:56,135 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-11-29 00:32:56,136 [ scc.merge] INFO
2025-11-29 00:32:56,136 [ scc.merge] INFO Repository: ome/omero-mapr
2025-11-29 00:32:56,136 [ scc.merge] INFO Excluded PRs:
2025-11-29 00:32:56,136 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-11-29 00:32:56,136 [ scc.merge] INFO Already up to date.
2025-11-29 00:32:56,136 [ scc.merge] INFO
2025-11-29 00:32:56,136 [ scc.merge] INFO Merged PRs:
2025-11-29 00:32:56,136 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-11-29 00:32:56,136 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-11-29 00:32:56,136 [ scc.merge] INFO
2025-11-29 00:32:56,136 [ scc.merge] INFO Conflicting PRs (not included):
2025-11-29 00:32:56,136 [ scc.merge] INFO - PR 95 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-11-29 00:32:56,136 [ scc.merge] INFO
2025-11-29 00:32:56,136 [ scc.merge] INFO Repository: ome/omero-metadata
2025-11-29 00:32:56,136 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-11-29 00:32:56,136 [ scc.merge] INFO Previously merged:
2025-11-29 00:32:56,136 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-11-29 00:32:56,136 [ scc.merge] INFO
2025-11-29 00:32:56,136 [ scc.merge] INFO Conflicting PRs (not included):
2025-11-29 00:32:56,136 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-11-29 00:32:56,136 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-11-29 00:32:56,136 [ scc.merge] INFO
2025-11-29 00:32:56,136 [ scc.merge] INFO Repository: ome/omero-parade
2025-11-29 00:32:56,136 [ scc.merge] INFO Excluded PRs:
2025-11-29 00:32:56,136 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-11-29 00:32:56,136 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-11-29 00:32:56,136 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-11-29 00:32:56,136 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-11-29 00:32:56,136 [ scc.merge] INFO Already up to date.
2025-11-29 00:32:56,136 [ scc.merge] INFO
2025-11-29 00:32:56,136 [ scc.merge] INFO Merged PRs:
2025-11-29 00:32:56,136 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-11-29 00:32:56,136 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-11-29 00:32:56,136 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-11-29 00:32:56,136 [ scc.merge] INFO
2025-11-29 00:32:56,136 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-11-29 00:32:56,136 [ scc.merge] INFO Already up to date.
2025-11-29 00:32:56,136 [ scc.merge] INFO
2025-11-29 00:32:56,136 [ scc.merge] INFO Merged PRs:
2025-11-29 00:32:56,136 [ scc.merge] INFO - PR 16 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-11-29 00:32:56,136 [ scc.merge] INFO
2025-11-29 00:32:56,136 [ scc.merge] INFO Repository: ome/omero-rois
2025-11-29 00:32:56,136 [ scc.merge] INFO Excluded PRs:
2025-11-29 00:32:56,136 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-11-29 00:32:56,136 [ scc.merge] INFO Already up to date.
2025-11-29 00:32:56,136 [ scc.merge] INFO
2025-11-29 00:32:56,136 [ scc.merge] INFO Merged PRs:
2025-11-29 00:32:56,136 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions'
2025-11-29 00:32:56,136 [ scc.merge] INFO - PR 34 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-11-29 00:32:56,136 [ scc.merge] INFO
2025-11-29 00:32:56,136 [ scc.merge] INFO Repository: ome/omero-signup
2025-11-29 00:32:56,136 [ scc.merge] INFO Already up to date.
2025-11-29 00:32:56,136 [ scc.merge] INFO
2025-11-29 00:32:56,137 [ scc.merge] INFO Merged PRs:
2025-11-29 00:32:56,137 [ scc.merge] INFO - PR 22 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-11-29 00:32:56,137 [ scc.merge] INFO
2025-11-29 00:32:56,137 [ scc.merge] INFO Conflicting PRs (not included):
2025-11-29 00:32:56,137 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-11-29 00:32:56,137 [ scc.merge] INFO
2025-11-29 00:32:56,137 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-11-29 00:32:56,137 [ scc.merge] INFO Excluded PRs:
2025-11-29 00:32:56,137 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-11-29 00:32:56,137 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-11-29 00:32:56,137 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-11-29 00:32:56,137 [ scc.merge] INFO Updating cda3ec6..40b2517
2025-11-29 00:32:56,137 [ scc.merge] INFO Previously merged:
2025-11-29 00:32:56,137 [ scc.merge] INFO - PR 81 erickmartins 'add ulimits to omero-server container'
2025-11-29 00:32:56,137 [ scc.merge] INFO
2025-11-29 00:32:56,137 [ scc.merge] INFO Merged PRs:
2025-11-29 00:32:56,137 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-11-29 00:32:56,137 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-11-29 00:32:56,137 [ scc.merge] INFO
2025-11-29 00:32:56,137 [ scc.merge] INFO Repository: ome/omero-upload
2025-11-29 00:32:56,137 [ scc.merge] INFO Already up to date.
2025-11-29 00:32:56,137 [ scc.merge] INFO
2025-11-29 00:32:56,137 [ scc.merge] INFO Merged PRs:
2025-11-29 00:32:56,137 [ scc.merge] INFO - PR 14 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-11-29 00:32:56,137 [ scc.merge] INFO
2025-11-29 00:32:56,137 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-11-29 00:32:56,137 [ scc.merge] INFO Updating deab817..160d894
2025-11-29 00:32:56,137 [ scc.merge] INFO Previously merged:
2025-11-29 00:32:56,137 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-11-29 00:32:56,137 [ scc.merge] INFO
2025-11-29 00:32:56,137 [ scc.merge] INFO Merged PRs:
2025-11-29 00:32:56,137 [ scc.merge] INFO - PR 22 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-11-29 00:32:56,137 [ scc.merge] INFO
2025-11-29 00:32:56,137 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-11-29 00:32:56,137 [ scc.merge] INFO Excluded PRs:
2025-11-29 00:32:56,137 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-11-29 00:32:56,137 [ scc.merge] INFO Updating 8f3c313..00e0207
2025-11-29 00:32:56,137 [ scc.merge] INFO Previously merged:
2025-11-29 00:32:56,137 [ scc.merge] INFO - PR 20 will-moore 'Use zarr_format=2 for .zarray and chunk endpoints'
2025-11-29 00:32:56,137 [ scc.merge] INFO
2025-11-29 00:32:56,137 [ scc.merge] INFO Merged PRs:
2025-11-29 00:32:56,137 [ scc.merge] INFO - PR 21 will-moore 'Web zarr import'
2025-11-29 00:32:56,137 [ scc.merge] INFO
2025-11-29 00:32:56,137 [ scc.merge] INFO Conflicting PRs (not included):
2025-11-29 00:32:56,137 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-11-29 00:32:56,137 [ scc.merge] INFO
2025-11-29 00:32:56,137 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-11-29 00:32:56,137 [ scc.merge] INFO Already up to date.
2025-11-29 00:32:56,137 [ scc.merge] INFO
2025-11-29 00:32:56,137 [ scc.merge] INFO Merged PRs:
2025-11-29 00:32:56,137 [ scc.merge] INFO - PR 25 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-11-29 00:32:56,137 [ scc.merge] INFO
2025-11-29 00:32:56,138 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-11-29 00:32:56,138 [ scc.merge] INFO Already up to date.
2025-11-29 00:32:56,138 [ scc.merge] INFO
2025-11-29 00:32:56,138 [ scc.merge] INFO Merged PRs:
2025-11-29 00:32:56,138 [ scc.merge] INFO - PR 37 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-11-29 00:32:56,138 [ scc.merge] INFO
2025-11-29 00:32:56,138 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-11-29 00:32:56,138 [ scc.merge] INFO Already up to date.
2025-11-29 00:32:56,138 [ scc.merge] INFO
2025-11-29 00:32:56,138 [ scc.merge] INFO Conflicting PRs (not included):
2025-11-29 00:32:56,138 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-11-29 00:32:56,138 [ scc.merge] INFO
2025-11-29 00:32:56,138 [ scc.merge] INFO Repository: ome/scripts
2025-11-29 00:32:56,138 [ scc.merge] INFO Excluded PRs:
2025-11-29 00:32:56,138 [ scc.merge] INFO - PR 229 Rdornier 'Adding support for custom user label' (user: Rdornier)
2025-11-29 00:32:56,138 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-11-29 00:32:56,138 [ scc.merge] INFO Updating 4b4c755..0c7356a
2025-11-29 00:32:56,138 [ scc.merge] INFO Previously merged:
2025-11-29 00:32:56,138 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-11-29 00:32:56,138 [ scc.merge] INFO - PR 230 Rdornier 'Import from csv fix'
2025-11-29 00:32:56,138 [ scc.merge] INFO - PR 228 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.3.0 to 1.13.0 in /.github/workflows'
2025-11-29 00:32:56,138 [ scc.merge] INFO - PR 227 jburel 'Replace tostring by tobytes'
2025-11-29 00:32:56,138 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-11-29 00:32:56,138 [ scc.merge] INFO
2025-11-29 00:32:56,138 [ scc.merge] INFO
2025-11-29 00:32:56,138 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-11-29 00:32:56,138 [ scc.git] DEBUG Calling 'git remote'
2025-11-29 00:32:56,140 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-11-29 00:32:56,140 [ scc.git] DEBUG Calling 'git remote'
2025-11-29 00:32:56,142 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:56,142 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-11-29 00:32:56,142 [ scc.git] DEBUG Calling 'git remote'
2025-11-29 00:32:56,144 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:56,144 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-11-29 00:32:56,144 [ scc.git] DEBUG Calling 'git remote'
2025-11-29 00:32:56,146 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:56,146 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-11-29 00:32:56,146 [ scc.git] DEBUG Calling 'git remote'
2025-11-29 00:32:56,148 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:56,148 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-11-29 00:32:56,148 [ scc.git] DEBUG Calling 'git remote'
2025-11-29 00:32:56,150 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:56,150 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-11-29 00:32:56,150 [ scc.git] DEBUG Calling 'git remote'
2025-11-29 00:32:56,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:56,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-11-29 00:32:56,153 [ scc.git] DEBUG Calling 'git remote'
2025-11-29 00:32:56,154 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:56,154 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-11-29 00:32:56,154 [ scc.git] DEBUG Calling 'git remote'
2025-11-29 00:32:56,156 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:56,156 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-11-29 00:32:56,156 [ scc.git] DEBUG Calling 'git remote'
2025-11-29 00:32:56,158 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:56,158 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-11-29 00:32:56,158 [ scc.git] DEBUG Calling 'git remote'
2025-11-29 00:32:56,160 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:56,160 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-11-29 00:32:56,160 [ scc.git] DEBUG Calling 'git remote'
2025-11-29 00:32:56,162 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:56,162 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-11-29 00:32:56,162 [ scc.git] DEBUG Calling 'git remote'
2025-11-29 00:32:56,164 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:56,164 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-11-29 00:32:56,164 [ scc.git] DEBUG Calling 'git remote'
2025-11-29 00:32:56,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:56,166 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-11-29 00:32:56,166 [ scc.git] DEBUG Calling 'git remote'
2025-11-29 00:32:56,168 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:56,168 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-11-29 00:32:56,168 [ scc.git] DEBUG Calling 'git remote'
2025-11-29 00:32:56,170 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:56,170 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-11-29 00:32:56,170 [ scc.git] DEBUG Calling 'git remote'
2025-11-29 00:32:56,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:56,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-11-29 00:32:56,172 [ scc.git] DEBUG Calling 'git remote'
2025-11-29 00:32:56,174 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:56,174 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-11-29 00:32:56,174 [ scc.git] DEBUG Calling 'git remote'
2025-11-29 00:32:56,176 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:56,176 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-11-29 00:32:56,176 [ scc.git] DEBUG Calling 'git remote'
2025-11-29 00:32:56,178 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:56,178 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-11-29 00:32:56,178 [ scc.git] DEBUG Calling 'git remote'
2025-11-29 00:32:56,180 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:56,180 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-11-29 00:32:56,180 [ scc.git] DEBUG Calling 'git remote'
2025-11-29 00:32:56,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-11-29 00:32:56,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-11-29 00:32:56,182 [ scc.git] DEBUG Calling 'git remote'
2025-11-29 00:32:56,184 [ 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.4-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 89829b4] 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 c5f04e6] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-11-29 00:33:42,678 [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-11-29 00:33:52,238 [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-11-29 00:33:54,809 [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-11-29 00:33:59,532 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-11-29 00:34:38,818 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
![[Jenkins]](/jenkins/static/aacddba8/images/svgs/logo.svg){kind=logo}
