Skipping 223 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-06-16 09:35:38,252 [ scc.git] DEBUG [detached HEAD f847e1d] merge master -Dorg -Ssuccess-only
2025-06-16 09:35:38,252 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:35:38,252 [ scc.repo] DEBUG ## PRs found:
2025-06-16 09:35:38,393 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:38,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-06-16 09:35:38,923 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:39,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-06-16 09:35:39,413 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:39,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-06-16 09:35:39,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:40,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-06-16 09:35:40,454 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:40,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-06-16 09:35:40,991 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:41,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-06-16 09:35:41,195 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-16 09:35:41,446 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:41,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-06-16 09:35:41,949 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:42,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-06-16 09:35:42,812 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:43,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-06-16 09:35:43,345 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:43,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-06-16 09:35:43,861 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:44,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-06-16 09:35:44,545 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:44,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-06-16 09:35:44,753 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-06-16 09:35:44,754 [ scc.repo] DEBUG ## Branches found:
2025-06-16 09:35:44,754 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-06-16 09:35:44,754 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:35:44,754 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:35:44,757 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-16 09:35:44,759 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-16 09:35:44,759 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-16 09:35:44,762 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-16 09:35:44,766 [ scc.git] DEBUG Already up to date.
2025-06-16 09:35:44,766 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-06-16 09:35:45,060 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-06-16 09:35:45,060 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-06-16 09:35:45,065 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-06-16 09:35:45,334 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-06-16 09:35:45,334 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-06-16 09:35:45,338 [ scc.git] DEBUG ## Unique users: []
2025-06-16 09:35:45,339 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:35:45,339 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:35:45,341 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-06-16 09:35:45,345 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:35:45,347 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-06-16 09:35:45,357 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-16 09:35:45,360 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-06-16 09:35:45,361 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-06-16 09:35:45,361 [ scc.git] DEBUG requirements.txt | 2 +-
2025-06-16 09:35:45,361 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-06-16 09:35:45,361 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-06-16 09:35:45,361 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-06-16 09:35:45,362 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:45,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:35:45,540 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-06-16 09:35:45,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:35:45,546 [ 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-06-16 09:35:45,555 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-16 09:35:45,558 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-06-16 09:35:45,558 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-06-16 09:35:45,791 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:45,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:35:45,991 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-16 09:35:46,032 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:35:46,032 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:35:46,035 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-16 09:35:46,074 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-16 09:35:46,078 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd064210990> has no local changes
2025-06-16 09:35:46,078 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Generated by OMERO-plugins-push#451 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/)'
2025-06-16 09:35:46,084 [ scc.git] DEBUG [detached HEAD 4a08439] merge master -Dorg -Ssuccess-only
2025-06-16 09:35:46,084 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:35:46,085 [ scc.repo] DEBUG ## PRs found:
2025-06-16 09:35:46,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:46,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-06-16 09:35:46,819 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:47,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-06-16 09:35:47,325 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:48,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-06-16 09:35:48,340 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:48,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-06-16 09:35:48,878 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:49,161 [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-06-16 09:35:49,413 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:49,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-06-16 09:35:49,973 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:50,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-06-16 09:35:50,154 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-06-16 09:35:50,405 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:50,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-06-16 09:35:50,895 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:51,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-06-16 09:35:51,400 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:51,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-06-16 09:35:51,953 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:52,191 [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-06-16 09:35:52,443 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:52,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-06-16 09:35:52,998 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:53,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-06-16 09:35:53,192 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-06-16 09:35:53,192 [ scc.repo] DEBUG ## Branches found:
2025-06-16 09:35:53,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-06-16 09:35:53,192 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:35:53,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:35:53,195 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-16 09:35:53,198 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-16 09:35:53,198 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-16 09:35:53,201 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-16 09:35:53,208 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-06-16 09:35:53,443 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:53,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-06-16 09:35:53,886 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-06-16 09:35:54,177 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-06-16 09:35:54,177 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-06-16 09:35:54,182 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-06-16 09:35:54,478 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-06-16 09:35:54,478 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-06-16 09:35:54,482 [ scc.git] DEBUG ## Unique users: []
2025-06-16 09:35:54,483 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:35:54,483 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:35:54,485 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-06-16 09:35:54,490 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:35:54,493 [ 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-06-16 09:35:54,506 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-06-16 09:35:54,506 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-06-16 09:35:54,506 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-06-16 09:35:54,506 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-06-16 09:35:54,507 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-06-16 09:35:54,507 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-06-16 09:35:54,510 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-06-16 09:35:54,514 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-06-16 09:35:54,516 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:54,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:35:54,697 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-06-16 09:35:54,702 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-06-16 09:35:54,705 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#451](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-06-16 09:35:54,707 [ scc.config] DEBUG Found github.token
2025-06-16 09:35:54,707 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-06-16 09:35:54,707 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-06-16 09:35:54,712 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:35:54,714 [ 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-06-16 09:35:54,730 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-06-16 09:35:54,730 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-06-16 09:35:54,730 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-06-16 09:35:54,730 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-06-16 09:35:54,731 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-06-16 09:35:54,734 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-06-16 09:35:54,739 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-06-16 09:35:54,947 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:55,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:35:55,142 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-06-16 09:35:55,147 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-06-16 09:35:55,149 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#451](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/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-06-16 09:35:55,152 [ scc.config] DEBUG Found github.token
2025-06-16 09:35:55,152 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-06-16 09:35:55,152 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-16 09:35:55,193 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:35:55,193 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:35:55,195 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-16 09:35:55,235 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-16 09:35:55,240 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd067447b90> has no local changes
2025-06-16 09:35:55,240 [ 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#451 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/)'
2025-06-16 09:35:55,247 [ scc.git] DEBUG [detached HEAD 79561cd] merge master -Dorg -Ssuccess-only
2025-06-16 09:35:55,247 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:35:55,247 [ scc.repo] DEBUG ## PRs found:
2025-06-16 09:35:55,393 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:55,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-06-16 09:35:55,998 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:56,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-06-16 09:35:56,465 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:56,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-06-16 09:35:56,995 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:57,235 [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-06-16 09:35:57,487 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:57,785 [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-06-16 09:35:58,036 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:58,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-06-16 09:35:58,483 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:58,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-06-16 09:35:58,711 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-16 09:35:58,962 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:59,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-06-16 09:35:59,185 [ scc.repo] DEBUG # ... Include label: dependencies
2025-06-16 09:35:59,436 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:35:59,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-06-16 09:36:00,061 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:00,381 [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-06-16 09:36:00,632 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:00,989 [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-06-16 09:36:01,241 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:01,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-06-16 09:36:01,822 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:02,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-06-16 09:36:02,028 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-06-16 09:36:02,279 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:02,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-06-16 09:36:02,522 [ scc.repo] DEBUG # ... Include label: dependencies
2025-06-16 09:36:02,773 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:03,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-06-16 09:36:03,355 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:03,668 [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-06-16 09:36:03,919 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:04,213 [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-06-16 09:36:04,464 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:04,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-06-16 09:36:05,026 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:05,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-06-16 09:36:05,245 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-06-16 09:36:05,496 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:05,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-06-16 09:36:05,981 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:06,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-06-16 09:36:06,470 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:06,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-06-16 09:36:06,951 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:07,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-06-16 09:36:07,456 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:07,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-06-16 09:36:08,004 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:08,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-06-16 09:36:08,509 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:08,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-06-16 09:36:08,832 [ scc.repo] DEBUG ## Branches found:
2025-06-16 09:36:08,832 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-06-16 09:36:08,832 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:08,832 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:08,835 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-16 09:36:08,837 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-16 09:36:08,837 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-16 09:36:08,841 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-16 09:36:08,844 [ scc.git] DEBUG Already up to date.
2025-06-16 09:36:08,844 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-06-16 09:36:09,160 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-06-16 09:36:09,160 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-06-16 09:36:09,164 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-06-16 09:36:09,478 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-06-16 09:36:09,478 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-06-16 09:36:09,482 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-06-16 09:36:09,755 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-06-16 09:36:09,755 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-06-16 09:36:09,759 [ scc.git] DEBUG ## Unique users: []
2025-06-16 09:36:09,760 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:09,760 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:09,762 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-06-16 09:36:09,765 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:09,767 [ 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-06-16 09:36:09,775 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-16 09:36:09,779 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-06-16 09:36:09,779 [ scc.git] DEBUG package.json | 2 +-
2025-06-16 09:36:09,779 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-06-16 09:36:09,780 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:09,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:36:09,957 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-06-16 09:36:09,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:09,962 [ 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-06-16 09:36:09,972 [ scc.git] DEBUG Auto-merging package-lock.json
2025-06-16 09:36:09,972 [ scc.git] DEBUG Auto-merging package.json
2025-06-16 09:36:09,974 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-16 09:36:09,977 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-06-16 09:36:09,977 [ scc.git] DEBUG package.json | 2 +-
2025-06-16 09:36:09,977 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-06-16 09:36:10,208 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:10,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:36:10,378 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-06-16 09:36:10,381 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:10,383 [ 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-06-16 09:36:10,392 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-16 09:36:10,394 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-06-16 09:36:10,395 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-06-16 09:36:10,629 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:10,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:36:10,804 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-16 09:36:10,848 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:10,848 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:10,850 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-16 09:36:10,891 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-16 09:36:10,895 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd069ab2110> has no local changes
2025-06-16 09:36:10,895 [ 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#451 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/)'
2025-06-16 09:36:10,902 [ scc.git] DEBUG [detached HEAD 2b518a2] merge master -Dorg -Ssuccess-only
2025-06-16 09:36:10,902 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:36:10,902 [ scc.repo] DEBUG ## PRs found:
2025-06-16 09:36:11,055 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:11,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-06-16 09:36:11,272 [ scc.repo] DEBUG ## Branches found:
2025-06-16 09:36:11,272 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-06-16 09:36:11,272 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:11,272 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:11,275 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-16 09:36:11,277 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-16 09:36:11,277 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-16 09:36:11,280 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-16 09:36:11,283 [ scc.git] DEBUG Already up to date.
2025-06-16 09:36:11,283 [ scc.git] DEBUG ## Unique users: []
2025-06-16 09:36:11,283 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:11,283 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:11,285 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-16 09:36:11,327 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:11,327 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:11,330 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-16 09:36:11,370 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-16 09:36:11,373 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd064215a50> has no local changes
2025-06-16 09:36:11,373 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-prometheus-tools
Already up to date.
Generated by OMERO-plugins-push#451 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/)'
2025-06-16 09:36:11,379 [ scc.git] DEBUG [detached HEAD a49ddd0] merge master -Dorg -Ssuccess-only
2025-06-16 09:36:11,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:36:11,380 [ scc.repo] DEBUG ## PRs found:
2025-06-16 09:36:11,523 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:11,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-06-16 09:36:12,090 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:12,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-06-16 09:36:12,603 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:12,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-06-16 09:36:13,103 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:13,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-06-16 09:36:13,373 [ scc.repo] DEBUG ## Branches found:
2025-06-16 09:36:13,373 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-06-16 09:36:13,374 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:13,374 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:13,376 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-16 09:36:13,379 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-16 09:36:13,379 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-16 09:36:13,382 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-16 09:36:13,385 [ scc.git] DEBUG Already up to date.
2025-06-16 09:36:13,385 [ scc.git] DEBUG ## Unique users: []
2025-06-16 09:36:13,385 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:13,385 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:13,387 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-16 09:36:13,429 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:13,429 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:13,432 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-16 09:36:13,472 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-16 09:36:13,475 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd064234310> has no local changes
2025-06-16 09:36:13,476 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Generated by OMERO-plugins-push#451 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/)'
2025-06-16 09:36:13,482 [ scc.git] DEBUG [detached HEAD 343e000] merge master -Dorg -Ssuccess-only
2025-06-16 09:36:13,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:36:13,482 [ scc.repo] DEBUG ## PRs found:
2025-06-16 09:36:13,624 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:13,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-06-16 09:36:14,223 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:14,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-06-16 09:36:14,717 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:15,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-06-16 09:36:15,272 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:15,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-06-16 09:36:15,870 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:16,078 [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-06-16 09:36:16,329 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:16,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-06-16 09:36:16,916 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:17,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-06-16 09:36:17,133 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-06-16 09:36:17,133 [ scc.repo] DEBUG ## Branches found:
2025-06-16 09:36:17,133 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-06-16 09:36:17,133 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:17,133 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:17,136 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-16 09:36:17,139 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-16 09:36:17,139 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-16 09:36:17,142 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-16 09:36:17,145 [ scc.git] DEBUG Already up to date.
2025-06-16 09:36:17,145 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-06-16 09:36:17,460 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-06-16 09:36:17,460 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-06-16 09:36:17,465 [ scc.git] DEBUG ## Unique users: []
2025-06-16 09:36:17,465 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:17,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:17,467 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-06-16 09:36:17,471 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:17,473 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-06-16 09:36:17,482 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-06-16 09:36:17,482 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-06-16 09:36:17,482 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-06-16 09:36:17,482 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-06-16 09:36:17,482 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-06-16 09:36:17,482 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-06-16 09:36:17,482 [ scc.git] DEBUG Auto-merging setup.py
2025-06-16 09:36:17,482 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-06-16 09:36:17,482 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-06-16 09:36:17,483 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-06-16 09:36:17,486 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-06-16 09:36:17,490 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-06-16 09:36:17,491 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:17,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:36:17,676 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-06-16 09:36:17,680 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-06-16 09:36:17,683 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#451](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_signup/views.py
- omero_signup/signup_settings.py
- omero_signup/urls.py
- setup.py
--conflicts
2025-06-16 09:36:17,686 [ scc.config] DEBUG Found github.token
2025-06-16 09:36:17,686 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-06-16 09:36:17,686 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-16 09:36:17,727 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:17,727 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:17,729 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-16 09:36:17,769 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-16 09:36:17,772 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd064215d10> has no local changes
2025-06-16 09:36:17,772 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Generated by OMERO-plugins-push#451 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/)'
2025-06-16 09:36:17,779 [ scc.git] DEBUG [detached HEAD 606223a] merge master -Dorg -Ssuccess-only
2025-06-16 09:36:17,779 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:36:17,780 [ scc.repo] DEBUG ## PRs found:
2025-06-16 09:36:17,927 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:18,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-06-16 09:36:18,482 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:18,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-06-16 09:36:18,989 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:19,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-06-16 09:36:19,605 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:19,928 [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-06-16 09:36:20,179 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:20,464 [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-06-16 09:36:20,715 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:21,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-06-16 09:36:21,309 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:21,499 [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-06-16 09:36:21,499 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-06-16 09:36:21,751 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:22,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-06-16 09:36:22,285 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:22,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-06-16 09:36:22,802 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:23,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-06-16 09:36:23,324 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:23,631 [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-06-16 09:36:23,883 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:24,178 [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-06-16 09:36:24,429 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:24,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-06-16 09:36:24,945 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:25,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-06-16 09:36:25,430 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:25,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-06-16 09:36:25,909 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:26,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-06-16 09:36:26,399 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:26,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-06-16 09:36:26,945 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:27,171 [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-06-16 09:36:27,423 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:27,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-06-16 09:36:27,921 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:28,128 [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-06-16 09:36:28,128 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-06-16 09:36:28,129 [ scc.repo] DEBUG ## Branches found:
2025-06-16 09:36:28,129 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-06-16 09:36:28,129 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:28,129 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:28,132 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-16 09:36:28,134 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-16 09:36:28,134 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-16 09:36:28,137 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-16 09:36:28,140 [ scc.git] DEBUG Already up to date.
2025-06-16 09:36:28,140 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-06-16 09:36:28,437 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-06-16 09:36:28,438 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-06-16 09:36:28,442 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-06-16 09:36:29,249 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-06-16 09:36:29,249 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-06-16 09:36:29,253 [ scc.git] DEBUG ## Unique users: []
2025-06-16 09:36:29,253 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:29,253 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:29,255 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-06-16 09:36:29,260 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:29,262 [ 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-06-16 09:36:29,274 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-16 09:36:29,278 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-06-16 09:36:29,279 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-06-16 09:36:29,279 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-06-16 09:36:29,279 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-06-16 09:36:29,279 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-06-16 09:36:29,279 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-06-16 09:36:29,279 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-06-16 09:36:29,279 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-06-16 09:36:29,279 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-06-16 09:36:29,279 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-06-16 09:36:29,280 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:29,280 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-06-16 09:36:29,280 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-06-16 09:36:29,280 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-06-16 09:36:29,280 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-06-16 09:36:29,280 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-06-16 09:36:29,280 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-06-16 09:36:29,280 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-06-16 09:36:29,280 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-06-16 09:36:29,280 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-06-16 09:36:29,280 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-06-16 09:36:29,280 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-06-16 09:36:29,280 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-06-16 09:36:29,280 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-06-16 09:36:29,280 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-06-16 09:36:29,280 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-06-16 09:36:29,280 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-06-16 09:36:29,281 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-06-16 09:36:29,281 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-06-16 09:36:29,281 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-06-16 09:36:29,281 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-06-16 09:36:29,281 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-06-16 09:36:29,281 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-06-16 09:36:29,281 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-06-16 09:36:29,281 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-06-16 09:36:29,281 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-06-16 09:36:29,281 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-06-16 09:36:29,281 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-06-16 09:36:29,281 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-06-16 09:36:29,281 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-06-16 09:36:29,281 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-06-16 09:36:29,281 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-06-16 09:36:29,281 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-06-16 09:36:29,281 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-06-16 09:36:29,281 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-06-16 09:36:29,281 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-06-16 09:36:29,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:36:29,456 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-06-16 09:36:29,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:29,463 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-06-16 09:36:29,473 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-16 09:36:29,476 [ scc.git] DEBUG docker | 1 +
2025-06-16 09:36:29,476 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-06-16 09:36:29,707 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:29,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:36:29,877 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-16 09:36:29,918 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:29,918 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:29,920 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-16 09:36:29,962 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-16 09:36:29,966 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd064257050> has no local changes
2025-06-16 09:36:29,966 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
- PR 76 will-moore 'Run cli deps'
Generated by OMERO-plugins-push#451 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/)'
2025-06-16 09:36:29,974 [ scc.git] DEBUG [detached HEAD c5063a9] merge master -Dorg -Ssuccess-only
2025-06-16 09:36:29,974 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:36:29,974 [ scc.repo] DEBUG ## PRs found:
2025-06-16 09:36:30,128 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:30,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-06-16 09:36:30,327 [ scc.repo] DEBUG ## Branches found:
2025-06-16 09:36:30,328 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-06-16 09:36:30,328 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:30,328 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:30,330 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-16 09:36:30,333 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-16 09:36:30,333 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-16 09:36:30,336 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-16 09:36:30,339 [ scc.git] DEBUG Already up to date.
2025-06-16 09:36:30,339 [ scc.git] DEBUG ## Unique users: []
2025-06-16 09:36:30,339 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:30,339 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:30,341 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-16 09:36:30,384 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:30,384 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:30,387 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-16 09:36:30,428 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-16 09:36:30,431 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd067435690> has no local changes
2025-06-16 09:36:30,431 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-upload
Already up to date.
Generated by OMERO-plugins-push#451 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/)'
2025-06-16 09:36:30,496 [ scc.git] DEBUG [detached HEAD 6cf1f53] merge master -Dorg -Ssuccess-only
2025-06-16 09:36:30,496 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:36:30,496 [ scc.repo] DEBUG ## PRs found:
2025-06-16 09:36:30,579 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:30,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 2
2025-06-16 09:36:30,781 [ scc.repo] DEBUG ## Branches found:
2025-06-16 09:36:30,781 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-06-16 09:36:30,781 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:30,781 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:30,784 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-16 09:36:30,786 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-16 09:36:30,786 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-16 09:36:30,789 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-16 09:36:30,797 [ scc.git] DEBUG Updating deab817..160d894
2025-06-16 09:36:31,032 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:31,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls/20 HTTP/1.1" 200 None
2025-06-16 09:36:31,478 [ scc.git] DEBUG ## Unique users: []
2025-06-16 09:36:31,478 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:31,478 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:31,481 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-16 09:36:31,522 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:31,523 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:31,525 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-16 09:36:31,566 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-16 09:36:31,569 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd064298bd0> has no local changes
2025-06-16 09:36:31,569 [ 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'
Generated by OMERO-plugins-push#451 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/)'
2025-06-16 09:36:31,576 [ scc.git] DEBUG [detached HEAD 3a52fda] merge master -Dorg -Ssuccess-only
2025-06-16 09:36:31,576 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:36:31,576 [ scc.git] INFO Overriding base-branch from master to main
2025-06-16 09:36:31,576 [ scc.repo] DEBUG ## PRs found:
2025-06-16 09:36:31,729 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:32,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-06-16 09:36:32,315 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:32,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-06-16 09:36:32,806 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:33,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-06-16 09:36:33,305 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:33,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-06-16 09:36:33,900 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:34,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-06-16 09:36:34,462 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:34,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-06-16 09:36:35,025 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:35,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-06-16 09:36:35,561 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:35,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-06-16 09:36:36,038 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:36,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-06-16 09:36:36,524 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:36,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-06-16 09:36:37,064 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:37,279 [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-06-16 09:36:37,531 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:37,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-06-16 09:36:38,095 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:38,296 [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-06-16 09:36:38,297 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-06-16 09:36:38,297 [ scc.repo] DEBUG ## Branches found:
2025-06-16 09:36:38,297 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-06-16 09:36:38,297 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:38,297 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:38,300 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-06-16 09:36:38,302 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-16 09:36:38,302 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-06-16 09:36:38,305 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-06-16 09:36:38,309 [ scc.git] DEBUG Already up to date.
2025-06-16 09:36:38,309 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-06-16 09:36:38,655 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-06-16 09:36:38,655 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-06-16 09:36:38,660 [ scc.git] DEBUG ## Unique users: []
2025-06-16 09:36:38,660 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:38,660 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:38,663 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-06-16 09:36:38,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:38,668 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-06-16 09:36:38,676 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-06-16 09:36:38,676 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-06-16 09:36:38,676 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-06-16 09:36:38,677 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-06-16 09:36:38,679 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-06-16 09:36:38,683 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-06-16 09:36:38,684 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:38,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:36:38,862 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-06-16 09:36:38,865 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-06-16 09:36:38,868 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#451](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-06-16 09:36:38,870 [ scc.config] DEBUG Found github.token
2025-06-16 09:36:38,870 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-06-16 09:36:38,870 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-16 09:36:38,913 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:38,913 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:38,915 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-16 09:36:38,953 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-16 09:36:38,956 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd064246250> has no local changes
2025-06-16 09:36:38,957 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Generated by OMERO-plugins-push#451 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/)'
2025-06-16 09:36:38,963 [ scc.git] DEBUG [detached HEAD 1522ea3] merge master -Dorg -Ssuccess-only
2025-06-16 09:36:38,964 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:36:38,964 [ scc.repo] DEBUG ## PRs found:
2025-06-16 09:36:39,113 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:39,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-06-16 09:36:39,309 [ scc.repo] DEBUG ## Branches found:
2025-06-16 09:36:39,309 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-06-16 09:36:39,309 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:39,309 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:39,311 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-16 09:36:39,314 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-16 09:36:39,314 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-16 09:36:39,317 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-16 09:36:39,320 [ scc.git] DEBUG Already up to date.
2025-06-16 09:36:39,320 [ scc.git] DEBUG ## Unique users: []
2025-06-16 09:36:39,320 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:39,320 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:39,322 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-16 09:36:39,362 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:39,362 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:39,364 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-16 09:36:39,403 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-16 09:36:39,406 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd0642b1d90> has no local changes
2025-06-16 09:36:39,406 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-weberror
Already up to date.
Generated by OMERO-plugins-push#451 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/)'
2025-06-16 09:36:39,413 [ scc.git] DEBUG [detached HEAD a6eeb3e] merge master -Dorg -Ssuccess-only
2025-06-16 09:36:39,413 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:36:39,413 [ scc.repo] DEBUG ## PRs found:
2025-06-16 09:36:39,560 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:39,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-06-16 09:36:39,798 [ scc.repo] DEBUG ## Branches found:
2025-06-16 09:36:39,798 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-06-16 09:36:39,798 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:39,798 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:39,801 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-16 09:36:39,803 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-16 09:36:39,803 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-16 09:36:39,806 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-16 09:36:39,809 [ scc.git] DEBUG Already up to date.
2025-06-16 09:36:39,809 [ scc.git] DEBUG ## Unique users: []
2025-06-16 09:36:39,809 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:39,809 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:39,811 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-16 09:36:39,850 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:39,850 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:39,852 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-16 09:36:39,891 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-16 09:36:39,895 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd06426ca50> has no local changes
2025-06-16 09:36:39,895 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: openmicroscopy/omero-webtest
Already up to date.
Generated by OMERO-plugins-push#451 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/)'
2025-06-16 09:36:39,901 [ scc.git] DEBUG [detached HEAD fbace31] merge master -Dorg -Ssuccess-only
2025-06-16 09:36:39,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:36:39,901 [ scc.repo] DEBUG ## PRs found:
2025-06-16 09:36:40,049 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:40,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-06-16 09:36:40,615 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:40,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-06-16 09:36:41,095 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:41,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-06-16 09:36:41,551 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:41,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-06-16 09:36:42,094 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:42,341 [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-06-16 09:36:42,593 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:42,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-06-16 09:36:43,057 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:43,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-06-16 09:36:43,273 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-06-16 09:36:43,273 [ scc.repo] DEBUG ## Branches found:
2025-06-16 09:36:43,273 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-06-16 09:36:43,273 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:43,273 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:43,276 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-06-16 09:36:43,279 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-16 09:36:43,279 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-06-16 09:36:43,282 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-06-16 09:36:43,285 [ scc.git] DEBUG Already up to date.
2025-06-16 09:36:43,285 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-06-16 09:36:43,590 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-06-16 09:36:43,590 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-06-16 09:36:43,595 [ scc.git] DEBUG ## Unique users: []
2025-06-16 09:36:43,595 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:43,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:43,597 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-06-16 09:36:43,600 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:43,602 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-06-16 09:36:43,611 [ scc.git] DEBUG Auto-merging Dockerfile
2025-06-16 09:36:43,611 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-06-16 09:36:43,612 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-06-16 09:36:43,612 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-06-16 09:36:43,615 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-06-16 09:36:43,620 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-06-16 09:36:43,621 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:43,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:36:43,776 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-06-16 09:36:43,779 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-06-16 09:36:43,782 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#451](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-06-16 09:36:43,784 [ scc.config] DEBUG Found github.token
2025-06-16 09:36:43,784 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-06-16 09:36:43,784 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-16 09:36:43,827 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:43,827 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:43,829 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-16 09:36:43,868 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-16 09:36:43,872 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd064234b90> has no local changes
2025-06-16 09:36:43,872 [ 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#451 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/)'
2025-06-16 09:36:43,879 [ scc.git] DEBUG [detached HEAD ec2df24] merge master -Dorg -Ssuccess-only
2025-06-16 09:36:43,879 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:36:43,879 [ scc.git] INFO Overriding base-branch from master to develop
2025-06-16 09:36:43,879 [ scc.repo] DEBUG ## PRs found:
2025-06-16 09:36:44,027 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:44,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-06-16 09:36:44,660 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:44,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/227 HTTP/1.1" 200 None
2025-06-16 09:36:45,130 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:45,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/227/comments HTTP/1.1" 200 None
2025-06-16 09:36:45,600 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:45,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1f29df2ee64c201958e73f0d5a38c4c4a325bf65 HTTP/1.1" 200 None
2025-06-16 09:36:46,050 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:46,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1f29df2ee64c201958e73f0d5a38c4c4a325bf65/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-06-16 09:36:46,555 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:46,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1f29df2ee64c201958e73f0d5a38c4c4a325bf65/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-06-16 09:36:47,032 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:47,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1f29df2ee64c201958e73f0d5a38c4c4a325bf65 HTTP/1.1" 200 None
2025-06-16 09:36:47,565 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:47,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1f29df2ee64c201958e73f0d5a38c4c4a325bf65?per_page=1 HTTP/1.1" 200 2
2025-06-16 09:36:47,775 [ scc.repo] DEBUG - PR 227 jburel 'Replace tostring by tobytes'
2025-06-16 09:36:48,026 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:48,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-06-16 09:36:48,520 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:48,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-06-16 09:36:49,018 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:49,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-06-16 09:36:49,465 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:49,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-06-16 09:36:49,968 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:50,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-06-16 09:36:50,475 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:50,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-06-16 09:36:51,035 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:51,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-06-16 09:36:51,210 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-06-16 09:36:51,461 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:51,701 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-06-16 09:36:51,953 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:52,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-06-16 09:36:52,499 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:52,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-06-16 09:36:53,028 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:53,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-06-16 09:36:53,482 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:53,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-06-16 09:36:54,049 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:54,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-06-16 09:36:54,240 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-06-16 09:36:54,491 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:54,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-06-16 09:36:54,994 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:55,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-06-16 09:36:55,518 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:55,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-06-16 09:36:56,002 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:56,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-06-16 09:36:56,257 [ scc.repo] DEBUG ## Branches found:
2025-06-16 09:36:56,257 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-06-16 09:36:56,257 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:56,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:56,260 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-06-16 09:36:56,262 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-06-16 09:36:56,262 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-06-16 09:36:56,265 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-06-16 09:36:56,274 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-06-16 09:36:56,507 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:57,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-06-16 09:36:57,036 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-06-16 09:36:57,338 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-06-16 09:36:57,338 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-06-16 09:36:57,342 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-06-16 09:36:57,650 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-06-16 09:36:57,650 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-06-16 09:36:57,654 [ scc.git] DEBUG Calling 'git fetch origin pull/227/head'
2025-06-16 09:36:57,961 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-06-16 09:36:57,961 [ scc.git] DEBUG * branch refs/pull/227/head -> FETCH_HEAD
2025-06-16 09:36:57,965 [ scc.git] DEBUG ## Unique users: []
2025-06-16 09:36:57,965 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:57,965 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:57,968 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-06-16 09:36:57,973 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:57,976 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-06-16 09:36:57,987 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-06-16 09:36:57,987 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-06-16 09:36:57,988 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-06-16 09:36:57,990 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-06-16 09:36:57,994 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-06-16 09:36:57,995 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:58,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:36:58,202 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-06-16 09:36:58,207 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-06-16 09:36:58,211 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#451](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-06-16 09:36:58,213 [ scc.config] DEBUG Found github.token
2025-06-16 09:36:58,213 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-06-16 09:36:58,214 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-06-16 09:36:58,218 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:58,220 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-06-16 09:36:58,230 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-16 09:36:58,233 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-06-16 09:36:58,233 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-06-16 09:36:58,453 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:58,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:36:58,621 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1f29df2ee64c201958e73f0d5a38c4c4a325bf65'
2025-06-16 09:36:58,624 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:58,627 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 227 (Replace tostring by tobytes) 1f29df2ee64c201958e73f0d5a38c4c4a325bf65'
2025-06-16 09:36:58,636 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-06-16 09:36:58,640 [ scc.git] DEBUG omero/export_scripts/Make_Movie.py | 2 +-
2025-06-16 09:36:58,640 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-06-16 09:36:58,872 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:59,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:36:59,032 [ scc.git] DEBUG Calling 'git submodule update'
2025-06-16 09:36:59,074 [ scc.git] DEBUG Get sha1 of %s
2025-06-16 09:36:59,074 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-06-16 09:36:59,076 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-16 09:36:59,117 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-16 09:36:59,121 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd0675fa890> has no local changes
2025-06-16 09:36:59,121 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
- PR 227 jburel 'Replace tostring by tobytes'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#451 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/)'
2025-06-16 09:36:59,128 [ scc.git] DEBUG [detached HEAD 7fc5d9a] merge master -Dorg -Ssuccess-only
2025-06-16 09:36:59,128 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:36:59,128 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-06-16 09:36:59,205 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-06-16 09:36:59,283 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:36:59,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:36:59,447 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-06-16 09:36:59,449 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-06-16 09:36:59,693 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:37:00,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:37:00,042 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-06-16 09:37:00,044 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-06-16 09:37:00,289 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:37:00,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:37:00,460 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-06-16 09:37:00,462 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-06-16 09:37:00,706 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:37:00,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:37:00,906 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-06-16 09:37:01,151 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:37:01,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:37:01,317 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-06-16 09:37:01,319 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-06-16 09:37:01,563 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:37:01,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:37:01,755 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-06-16 09:37:01,757 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-06-16 09:37:02,002 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:37:02,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:37:02,202 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-06-16 09:37:02,204 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-06-16 09:37:02,449 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:37:02,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:37:02,616 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-06-16 09:37:02,618 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-06-16 09:37:02,862 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:37:03,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:37:03,030 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-06-16 09:37:03,032 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-06-16 09:37:03,276 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:37:03,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:37:03,465 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-06-16 09:37:03,467 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-06-16 09:37:03,712 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:37:03,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:37:03,900 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-06-16 09:37:03,902 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-06-16 09:37:04,147 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:37:04,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:37:04,319 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-06-16 09:37:04,320 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-06-16 09:37:04,565 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:37:04,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:37:04,744 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-06-16 09:37:04,988 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:37:05,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:37:05,182 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-06-16 09:37:05,427 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:37:05,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:37:05,589 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-06-16 09:37:05,591 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-06-16 09:37:05,836 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:37:06,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:37:06,015 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-06-16 09:37:06,259 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:37:06,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:37:06,427 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-06-16 09:37:06,672 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:37:06,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:37:06,840 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-06-16 09:37:06,842 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-06-16 09:37:07,086 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:37:07,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:37:07,259 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-06-16 09:37:07,261 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-06-16 09:37:07,506 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:37:07,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:37:07,696 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-06-16 09:37:07,698 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-06-16 09:37:07,943 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:37:08,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:37:08,120 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-06-16 09:37:08,122 [ scc.config] DEBUG Found submodule.scripts.url
2025-06-16 09:37:08,367 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-06-16 09:37:08,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-06-16 09:37:08,551 [ scc.config] DEBUG Found submodule.scripts.branch
2025-06-16 09:37:08,551 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-06-16 09:37:08,639 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd0674d6650> has local changes
2025-06-16 09:37:08,640 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
- PR 71 dominikl 'Escape slash character in image names'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 174 will-moore 'Skip wells' (stage: draft)
- 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..d0c57bc
Previously merged:
- 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 175 will-moore 'Pin ome-zarr-py <0.12.0'
- PR 177 jburel 'Replace fromstring by frombuffer'
Repository: ome/omero-figure
Excluded PRs:
- PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
- PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..3e8fa730
Previously merged:
- PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
- PR 635 dependabot[bot] 'Bump esbuild and vite'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
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'
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
- PR 76 will-moore 'Run cli deps'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Updating deab817..160d894
Previously merged:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
- PR 227 jburel 'Replace tostring by tobytes'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#451 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/451/)'
2025-06-16 09:37:08,653 [ scc.git] DEBUG [detached HEAD 92db448] merge master -Dorg -Ssuccess-only
2025-06-16 09:37:08,653 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-06-16 09:37:08,653 [ scc.merge] INFO Repository: ome/omero-plugins
2025-06-16 09:37:08,653 [ scc.merge] INFO Already up to date.
2025-06-16 09:37:08,653 [ scc.merge] INFO
2025-06-16 09:37:08,653 [ scc.merge] INFO Merged PRs:
2025-06-16 09:37:08,653 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-06-16 09:37:08,653 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-06-16 09:37:08,653 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-06-16 09:37:08,653 [ scc.merge] INFO
2025-06-16 09:37:08,653 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-06-16 09:37:08,653 [ scc.merge] INFO Already up to date.
2025-06-16 09:37:08,653 [ scc.merge] INFO
2025-06-16 09:37:08,653 [ scc.merge] INFO
2025-06-16 09:37:08,653 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-06-16 09:37:08,653 [ scc.merge] INFO Excluded PRs:
2025-06-16 09:37:08,653 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-06-16 09:37:08,653 [ scc.merge] INFO Already up to date.
2025-06-16 09:37:08,654 [ scc.merge] INFO
2025-06-16 09:37:08,654 [ scc.merge] INFO
2025-06-16 09:37:08,654 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-06-16 09:37:08,654 [ scc.merge] INFO Excluded PRs:
2025-06-16 09:37:08,654 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-06-16 09:37:08,654 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-06-16 09:37:08,654 [ scc.merge] INFO Already up to date.
2025-06-16 09:37:08,654 [ scc.merge] INFO
2025-06-16 09:37:08,654 [ scc.merge] INFO Merged PRs:
2025-06-16 09:37:08,654 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-06-16 09:37:08,654 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-06-16 09:37:08,654 [ scc.merge] INFO - PR 71 dominikl 'Escape slash character in image names'
2025-06-16 09:37:08,654 [ scc.merge] INFO
2025-06-16 09:37:08,654 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-06-16 09:37:08,654 [ scc.merge] INFO Excluded PRs:
2025-06-16 09:37:08,654 [ scc.merge] INFO - PR 174 will-moore 'Skip wells' (stage: draft)
2025-06-16 09:37:08,654 [ scc.merge] INFO - PR 172 will-moore 'Use zarr v3 and updated ome-zarr-py' (status: failure)
2025-06-16 09:37:08,654 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-06-16 09:37:08,654 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-06-16 09:37:08,654 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command' (stage: draft)
2025-06-16 09:37:08,654 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-06-16 09:37:08,654 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-06-16 09:37:08,654 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-06-16 09:37:08,654 [ scc.merge] INFO Updating 11d3587..d0c57bc
2025-06-16 09:37:08,654 [ scc.merge] INFO Previously merged:
2025-06-16 09:37:08,654 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-06-16 09:37:08,654 [ scc.merge] INFO - PR 173 will-moore 'Add test_export_plate_polygons()'
2025-06-16 09:37:08,654 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests'
2025-06-16 09:37:08,654 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-16 09:37:08,654 [ scc.merge] INFO
2025-06-16 09:37:08,654 [ scc.merge] INFO Merged PRs:
2025-06-16 09:37:08,654 [ scc.merge] INFO - PR 175 will-moore 'Pin ome-zarr-py <0.12.0'
2025-06-16 09:37:08,654 [ scc.merge] INFO - PR 177 jburel 'Replace fromstring by frombuffer'
2025-06-16 09:37:08,654 [ scc.merge] INFO
2025-06-16 09:37:08,654 [ scc.merge] INFO Repository: ome/omero-figure
2025-06-16 09:37:08,654 [ scc.merge] INFO Excluded PRs:
2025-06-16 09:37:08,654 [ scc.merge] INFO - PR 638 Rdornier 'Fix arrow opacity' (user: Rdornier)
2025-06-16 09:37:08,654 [ scc.merge] INFO - PR 637 Rdornier 'Fix scalebar position' (user: Rdornier)
2025-06-16 09:37:08,654 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-06-16 09:37:08,655 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-06-16 09:37:08,655 [ scc.merge] INFO Updating 9cc36cde..3e8fa730
2025-06-16 09:37:08,655 [ scc.merge] INFO Previously merged:
2025-06-16 09:37:08,655 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-06-16 09:37:08,655 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-06-16 09:37:08,655 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-06-16 09:37:08,655 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-16 09:37:08,655 [ scc.merge] INFO
2025-06-16 09:37:08,655 [ scc.merge] INFO Merged PRs:
2025-06-16 09:37:08,655 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-06-16 09:37:08,655 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-06-16 09:37:08,655 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-06-16 09:37:08,655 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-06-16 09:37:08,655 [ scc.merge] INFO - PR 639 dependabot[bot] 'Bump vite from 6.2.6 to 6.2.7'
2025-06-16 09:37:08,655 [ scc.merge] INFO
2025-06-16 09:37:08,655 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-16 09:37:08,655 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-06-16 09:37:08,655 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-06-16 09:37:08,655 [ scc.merge] INFO
2025-06-16 09:37:08,655 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-06-16 09:37:08,655 [ scc.merge] INFO Already up to date.
2025-06-16 09:37:08,655 [ scc.merge] INFO
2025-06-16 09:37:08,655 [ scc.merge] INFO Merged PRs:
2025-06-16 09:37:08,655 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-06-16 09:37:08,655 [ scc.merge] INFO
2025-06-16 09:37:08,655 [ scc.merge] INFO Repository: ome/omero-gallery
2025-06-16 09:37:08,655 [ scc.merge] INFO Already up to date.
2025-06-16 09:37:08,655 [ scc.merge] INFO
2025-06-16 09:37:08,655 [ scc.merge] INFO Merged PRs:
2025-06-16 09:37:08,655 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-06-16 09:37:08,655 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-06-16 09:37:08,655 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-06-16 09:37:08,655 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-06-16 09:37:08,655 [ scc.merge] INFO
2025-06-16 09:37:08,655 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-16 09:37:08,655 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-06-16 09:37:08,655 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-06-16 09:37:08,656 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-06-16 09:37:08,656 [ scc.merge] INFO
2025-06-16 09:37:08,656 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-06-16 09:37:08,656 [ scc.merge] INFO Excluded PRs:
2025-06-16 09:37:08,656 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-06-16 09:37:08,656 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-06-16 09:37:08,656 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-06-16 09:37:08,656 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-06-16 09:37:08,656 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-06-16 09:37:08,656 [ scc.merge] INFO Updating 7a798ce..bb94cf8
2025-06-16 09:37:08,656 [ scc.merge] INFO Previously merged:
2025-06-16 09:37:08,656 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-16 09:37:08,656 [ scc.merge] INFO
2025-06-16 09:37:08,656 [ scc.merge] INFO Merged PRs:
2025-06-16 09:37:08,656 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-06-16 09:37:08,656 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-06-16 09:37:08,656 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-06-16 09:37:08,656 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-06-16 09:37:08,656 [ scc.merge] INFO
2025-06-16 09:37:08,656 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-16 09:37:08,656 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-06-16 09:37:08,656 [ scc.merge] INFO
2025-06-16 09:37:08,656 [ scc.merge] INFO Repository: ome/omero-mapr
2025-06-16 09:37:08,656 [ scc.merge] INFO Excluded PRs:
2025-06-16 09:37:08,656 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-06-16 09:37:08,656 [ scc.merge] INFO Already up to date.
2025-06-16 09:37:08,656 [ scc.merge] INFO
2025-06-16 09:37:08,656 [ scc.merge] INFO Merged PRs:
2025-06-16 09:37:08,656 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-06-16 09:37:08,656 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-16 09:37:08,656 [ scc.merge] INFO
2025-06-16 09:37:08,656 [ scc.merge] INFO Repository: ome/omero-metadata
2025-06-16 09:37:08,656 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-06-16 09:37:08,656 [ scc.merge] INFO Previously merged:
2025-06-16 09:37:08,656 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-16 09:37:08,656 [ scc.merge] INFO
2025-06-16 09:37:08,656 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-16 09:37:08,656 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-06-16 09:37:08,657 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-06-16 09:37:08,657 [ scc.merge] INFO
2025-06-16 09:37:08,657 [ scc.merge] INFO Repository: ome/omero-parade
2025-06-16 09:37:08,657 [ scc.merge] INFO Excluded PRs:
2025-06-16 09:37:08,657 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-06-16 09:37:08,657 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-06-16 09:37:08,657 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-06-16 09:37:08,657 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-06-16 09:37:08,657 [ scc.merge] INFO Already up to date.
2025-06-16 09:37:08,657 [ scc.merge] INFO
2025-06-16 09:37:08,657 [ scc.merge] INFO Merged PRs:
2025-06-16 09:37:08,657 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-06-16 09:37:08,657 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-06-16 09:37:08,657 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-06-16 09:37:08,657 [ scc.merge] INFO
2025-06-16 09:37:08,657 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-06-16 09:37:08,657 [ scc.merge] INFO Already up to date.
2025-06-16 09:37:08,657 [ scc.merge] INFO
2025-06-16 09:37:08,657 [ scc.merge] INFO
2025-06-16 09:37:08,657 [ scc.merge] INFO Repository: ome/omero-rois
2025-06-16 09:37:08,657 [ scc.merge] INFO Excluded PRs:
2025-06-16 09:37:08,657 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-06-16 09:37:08,657 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-06-16 09:37:08,657 [ scc.merge] INFO Already up to date.
2025-06-16 09:37:08,657 [ scc.merge] INFO
2025-06-16 09:37:08,657 [ scc.merge] INFO
2025-06-16 09:37:08,657 [ scc.merge] INFO Repository: ome/omero-signup
2025-06-16 09:37:08,657 [ scc.merge] INFO Already up to date.
2025-06-16 09:37:08,657 [ scc.merge] INFO
2025-06-16 09:37:08,657 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-16 09:37:08,657 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-06-16 09:37:08,657 [ scc.merge] INFO
2025-06-16 09:37:08,657 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-06-16 09:37:08,657 [ scc.merge] INFO Excluded PRs:
2025-06-16 09:37:08,657 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-06-16 09:37:08,657 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-06-16 09:37:08,657 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-06-16 09:37:08,657 [ scc.merge] INFO Already up to date.
2025-06-16 09:37:08,657 [ scc.merge] INFO
2025-06-16 09:37:08,658 [ scc.merge] INFO Merged PRs:
2025-06-16 09:37:08,658 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-06-16 09:37:08,658 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-06-16 09:37:08,658 [ scc.merge] INFO
2025-06-16 09:37:08,658 [ scc.merge] INFO Repository: ome/omero-upload
2025-06-16 09:37:08,658 [ scc.merge] INFO Already up to date.
2025-06-16 09:37:08,658 [ scc.merge] INFO
2025-06-16 09:37:08,658 [ scc.merge] INFO
2025-06-16 09:37:08,658 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-06-16 09:37:08,658 [ scc.merge] INFO Updating deab817..160d894
2025-06-16 09:37:08,658 [ scc.merge] INFO Previously merged:
2025-06-16 09:37:08,658 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-06-16 09:37:08,658 [ scc.merge] INFO
2025-06-16 09:37:08,658 [ scc.merge] INFO
2025-06-16 09:37:08,658 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-06-16 09:37:08,658 [ scc.merge] INFO Excluded PRs:
2025-06-16 09:37:08,658 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-06-16 09:37:08,658 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-06-16 09:37:08,658 [ scc.merge] INFO Already up to date.
2025-06-16 09:37:08,658 [ scc.merge] INFO
2025-06-16 09:37:08,658 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-16 09:37:08,658 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-06-16 09:37:08,658 [ scc.merge] INFO
2025-06-16 09:37:08,658 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-06-16 09:37:08,658 [ scc.merge] INFO Already up to date.
2025-06-16 09:37:08,658 [ scc.merge] INFO
2025-06-16 09:37:08,658 [ scc.merge] INFO
2025-06-16 09:37:08,658 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-06-16 09:37:08,658 [ scc.merge] INFO Already up to date.
2025-06-16 09:37:08,658 [ scc.merge] INFO
2025-06-16 09:37:08,658 [ scc.merge] INFO
2025-06-16 09:37:08,658 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-06-16 09:37:08,658 [ scc.merge] INFO Already up to date.
2025-06-16 09:37:08,658 [ scc.merge] INFO
2025-06-16 09:37:08,658 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-16 09:37:08,658 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-06-16 09:37:08,658 [ scc.merge] INFO
2025-06-16 09:37:08,658 [ scc.merge] INFO Repository: ome/scripts
2025-06-16 09:37:08,658 [ scc.merge] INFO Excluded PRs:
2025-06-16 09:37:08,659 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-06-16 09:37:08,659 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-06-16 09:37:08,659 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-06-16 09:37:08,659 [ scc.merge] INFO Previously merged:
2025-06-16 09:37:08,659 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-06-16 09:37:08,659 [ scc.merge] INFO
2025-06-16 09:37:08,659 [ scc.merge] INFO Merged PRs:
2025-06-16 09:37:08,659 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-06-16 09:37:08,659 [ scc.merge] INFO - PR 227 jburel 'Replace tostring by tobytes'
2025-06-16 09:37:08,659 [ scc.merge] INFO
2025-06-16 09:37:08,659 [ scc.merge] INFO Conflicting PRs (not included):
2025-06-16 09:37:08,659 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-06-16 09:37:08,659 [ scc.merge] INFO
2025-06-16 09:37:08,659 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-06-16 09:37:08,659 [ scc.git] DEBUG Calling 'git remote'
2025-06-16 09:37:08,661 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-06-16 09:37:08,661 [ scc.git] DEBUG Calling 'git remote'
2025-06-16 09:37:08,663 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:37:08,663 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-06-16 09:37:08,663 [ scc.git] DEBUG Calling 'git remote'
2025-06-16 09:37:08,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:37:08,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-06-16 09:37:08,666 [ scc.git] DEBUG Calling 'git remote'
2025-06-16 09:37:08,668 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:37:08,668 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-06-16 09:37:08,668 [ scc.git] DEBUG Calling 'git remote'
2025-06-16 09:37:08,670 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:37:08,670 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-06-16 09:37:08,670 [ scc.git] DEBUG Calling 'git remote'
2025-06-16 09:37:08,673 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:37:08,673 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-06-16 09:37:08,673 [ scc.git] DEBUG Calling 'git remote'
2025-06-16 09:37:08,675 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:37:08,675 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-06-16 09:37:08,675 [ scc.git] DEBUG Calling 'git remote'
2025-06-16 09:37:08,677 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:37:08,677 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-06-16 09:37:08,677 [ scc.git] DEBUG Calling 'git remote'
2025-06-16 09:37:08,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:37:08,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-06-16 09:37:08,679 [ scc.git] DEBUG Calling 'git remote'
2025-06-16 09:37:08,681 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:37:08,682 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-06-16 09:37:08,682 [ scc.git] DEBUG Calling 'git remote'
2025-06-16 09:37:08,684 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:37:08,684 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-06-16 09:37:08,684 [ scc.git] DEBUG Calling 'git remote'
2025-06-16 09:37:08,686 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:37:08,686 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-06-16 09:37:08,686 [ scc.git] DEBUG Calling 'git remote'
2025-06-16 09:37:08,688 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:37:08,688 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-06-16 09:37:08,688 [ scc.git] DEBUG Calling 'git remote'
2025-06-16 09:37:08,690 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:37:08,691 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-06-16 09:37:08,691 [ scc.git] DEBUG Calling 'git remote'
2025-06-16 09:37:08,693 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:37:08,693 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-06-16 09:37:08,693 [ scc.git] DEBUG Calling 'git remote'
2025-06-16 09:37:08,695 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:37:08,695 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-06-16 09:37:08,695 [ scc.git] DEBUG Calling 'git remote'
2025-06-16 09:37:08,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:37:08,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-06-16 09:37:08,697 [ scc.git] DEBUG Calling 'git remote'
2025-06-16 09:37:08,699 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:37:08,699 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-06-16 09:37:08,699 [ scc.git] DEBUG Calling 'git remote'
2025-06-16 09:37:08,701 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:37:08,702 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-06-16 09:37:08,702 [ scc.git] DEBUG Calling 'git remote'
2025-06-16 09:37:08,704 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:37:08,704 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-06-16 09:37:08,704 [ scc.git] DEBUG Calling 'git remote'
2025-06-16 09:37:08,706 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:37:08,706 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-06-16 09:37:08,706 [ scc.git] DEBUG Calling 'git remote'
2025-06-16 09:37:08,708 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-06-16 09:37:08,708 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-06-16 09:37:08,708 [ scc.git] DEBUG Calling 'git remote'
2025-06-16 09:37:08,710 [ 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 f9fe423] 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 5a8cb70] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-06-16 09:37:57,461 [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-06-16 09:38:07,251 [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-06-16 09:38:09,862 [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-06-16 09:38:14,839 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-06-16 09:38:56,044 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-plugins/tree/merge_ci
[Pipeline] archiveArtifacts
Archiving artifacts
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
Finished: SUCCESS
![[Jenkins]](/jenkins/static/eb00aee0/images/svgs/logo.svg){kind=logo}
