Skipping 224 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTest
2025-04-23 02:05:21,560 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:05:21,561 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:05:21,563 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-23 02:05:21,599 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-23 02:05:21,604 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe7a811a150> has no local changes
2025-04-23 02:05:21,604 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Generated by OMERO-plugins-push#396 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/)'
2025-04-23 02:05:21,611 [ scc.git] DEBUG [detached HEAD c4fab27] merge master -Dorg -Ssuccess-only
2025-04-23 02:05:21,611 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:05:21,612 [ scc.repo] DEBUG ## PRs found:
2025-04-23 02:05:21,772 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:22,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/pulls HTTP/1.1" 200 None
2025-04-23 02:05:22,324 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:22,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/94 HTTP/1.1" 200 None
2025-04-23 02:05:22,807 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:23,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-23 02:05:23,319 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:23,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-23 02:05:23,763 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:24,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/1896cfebc876f939f8d83bd1cf56b8584ff2921d HTTP/1.1" 200 None
2025-04-23 02:05:24,301 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:24,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/1896cfebc876f939f8d83bd1cf56b8584ff2921d?per_page=1 HTTP/1.1" 200 2
2025-04-23 02:05:24,498 [ scc.repo] DEBUG - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-23 02:05:24,749 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:24,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74 HTTP/1.1" 200 None
2025-04-23 02:05:25,233 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:25,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/issues/74/comments HTTP/1.1" 200 None
2025-04-23 02:05:25,793 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:26,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-23 02:05:26,350 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:26,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-23 02:05:26,824 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:27,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/commits/45ee35acc44a7d119aa20b38b0427efbe5405322 HTTP/1.1" 200 None
2025-04-23 02:05:27,286 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:27,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-mapr/statuses/45ee35acc44a7d119aa20b38b0427efbe5405322?per_page=1 HTTP/1.1" 200 2
2025-04-23 02:05:27,476 [ scc.repo] DEBUG - PR 74 will-moore 'mapr extension of webclient'
2025-04-23 02:05:27,476 [ scc.repo] DEBUG ## Branches found:
2025-04-23 02:05:27,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-23 02:05:27,477 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:05:27,477 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:05:27,480 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-23 02:05:27,482 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-23 02:05:27,482 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-23 02:05:27,485 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-23 02:05:27,488 [ scc.git] DEBUG Already up to date.
2025-04-23 02:05:27,488 [ scc.git] DEBUG Calling 'git fetch origin pull/74/head'
2025-04-23 02:05:28,491 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-23 02:05:28,492 [ scc.git] DEBUG * branch refs/pull/74/head -> FETCH_HEAD
2025-04-23 02:05:28,495 [ scc.git] DEBUG Calling 'git fetch origin pull/94/head'
2025-04-23 02:05:28,777 [ scc.git] DEBUG From https://github.com/ome/omero-mapr
2025-04-23 02:05:28,777 [ scc.git] DEBUG * branch refs/pull/94/head -> FETCH_HEAD
2025-04-23 02:05:28,782 [ scc.git] DEBUG ## Unique users: []
2025-04-23 02:05:28,782 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:05:28,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:05:28,784 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-23 02:05:28,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:05:28,790 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 74 (mapr extension of webclient) 45ee35acc44a7d119aa20b38b0427efbe5405322'
2025-04-23 02:05:28,857 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-23 02:05:28,860 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 182 +++++++++++++
2025-04-23 02:05:28,860 [ scc.git] DEBUG .../data/includes/right_plugin.general.js.html | 290 ---------------------
2025-04-23 02:05:28,860 [ scc.git] DEBUG requirements.txt | 2 +-
2025-04-23 02:05:28,860 [ scc.git] DEBUG 3 files changed, 183 insertions(+), 291 deletions(-)
2025-04-23 02:05:28,861 [ scc.git] DEBUG create mode 100644 omero_mapr/templates/webclient/base/base_container.html
2025-04-23 02:05:28,861 [ scc.git] DEBUG delete mode 100644 omero_mapr/templates/webclient/data/includes/right_plugin.general.js.html
2025-04-23 02:05:28,862 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:29,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:05:29,016 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-23 02:05:29,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:05:29,022 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 94 (Use the release/v1 branch for the PyPA action publishing to PyPI) 1896cfebc876f939f8d83bd1cf56b8584ff2921d'
2025-04-23 02:05:29,031 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-23 02:05:29,033 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-23 02:05:29,033 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-23 02:05:29,267 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:29,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:05:29,428 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-23 02:05:29,465 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:05:29,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:05:29,468 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-23 02:05:29,503 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-23 02:05:29,507 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe7aa504b90> has no local changes
2025-04-23 02:05:29,507 [ 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#396 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/)'
2025-04-23 02:05:29,513 [ scc.git] DEBUG [detached HEAD d1ee10f] merge master -Dorg -Ssuccess-only
2025-04-23 02:05:29,514 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:05:29,514 [ scc.repo] DEBUG ## PRs found:
2025-04-23 02:05:29,679 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:30,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls HTTP/1.1" 200 None
2025-04-23 02:05:30,986 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:31,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64 HTTP/1.1" 200 None
2025-04-23 02:05:31,479 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:31,817 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/64/comments HTTP/1.1" 200 None
2025-04-23 02:05:32,069 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:32,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-23 02:05:32,602 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:33,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-23 02:05:34,153 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:34,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/78e55539b68e351ed5ef202854718b49a37729a7 HTTP/1.1" 200 None
2025-04-23 02:05:34,675 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:35,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/78e55539b68e351ed5ef202854718b49a37729a7?per_page=1 HTTP/1.1" 200 2
2025-04-23 02:05:35,247 [ scc.repo] DEBUG - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-23 02:05:35,498 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:35,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55 HTTP/1.1" 200 None
2025-04-23 02:05:36,112 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:36,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/issues/55/comments HTTP/1.1" 200 None
2025-04-23 02:05:36,622 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:37,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-23 02:05:37,590 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:37,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-23 02:05:38,105 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:38,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/commits/14f0448a90ccd781126a5c9dc267f4d0a6939102 HTTP/1.1" 200 None
2025-04-23 02:05:38,615 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:38,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/statuses/14f0448a90ccd781126a5c9dc267f4d0a6939102?per_page=1 HTTP/1.1" 200 2
2025-04-23 02:05:38,795 [ scc.repo] DEBUG - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-23 02:05:38,795 [ scc.repo] DEBUG ## Branches found:
2025-04-23 02:05:38,795 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-23 02:05:38,795 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:05:38,795 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:05:38,798 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-23 02:05:38,801 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-23 02:05:38,801 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-23 02:05:38,804 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-23 02:05:38,811 [ scc.git] DEBUG Updating 3cd120c..55060a2
2025-04-23 02:05:39,046 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:39,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-metadata/pulls/90 HTTP/1.1" 200 None
2025-04-23 02:05:39,468 [ scc.git] DEBUG Calling 'git fetch origin pull/55/head'
2025-04-23 02:05:40,337 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-23 02:05:40,337 [ scc.git] DEBUG * branch refs/pull/55/head -> FETCH_HEAD
2025-04-23 02:05:40,342 [ scc.git] DEBUG Calling 'git fetch origin pull/64/head'
2025-04-23 02:05:41,206 [ scc.git] DEBUG From https://github.com/ome/omero-metadata
2025-04-23 02:05:41,206 [ scc.git] DEBUG * branch refs/pull/64/head -> FETCH_HEAD
2025-04-23 02:05:41,210 [ scc.git] DEBUG ## Unique users: []
2025-04-23 02:05:41,210 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:05:41,210 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:05:41,213 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-23 02:05:41,217 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:05:41,220 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 55 (Prevent users from creating columns with python keyword names) 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-23 02:05:41,386 [ scc.git] DEBUG Auto-merging src/omero_metadata/cli.py
2025-04-23 02:05:41,386 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/cli.py
2025-04-23 02:05:41,386 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-23 02:05:41,386 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-23 02:05:41,387 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-23 02:05:41,387 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-23 02:05:41,389 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-23 02:05:41,394 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-23 02:05:41,395 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:41,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:05:41,587 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 14f0448a90ccd781126a5c9dc267f4d0a6939102'
2025-04-23 02:05:41,592 [ scc.git] DEBUG Calling 'git diff --name-only 27cc7289e9da842ed29a8192419a6b9ef851256d..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-23 02:05:41,595 [ scc.git] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
Conflicting PR. Removed from build [OMERO-plugins-push#396](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/consoleText) for more details.
Possible conflicts:
- Upstream changes
- src/omero_metadata/cli.py
- src/omero_metadata/populate.py
--conflicts
2025-04-23 02:05:41,597 [ scc.config] DEBUG Found github.token
2025-04-23 02:05:41,597 [ scc.git] DEBUG Not adding comment to issue #55, already --conflicts.
2025-04-23 02:05:41,597 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-23 02:05:41,602 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:05:41,604 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 64 (Support images_by_name for Screen and Plate) 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-23 02:05:41,949 [ scc.git] DEBUG Auto-merging src/omero_metadata/populate.py
2025-04-23 02:05:41,949 [ scc.git] DEBUG CONFLICT (content): Merge conflict in src/omero_metadata/populate.py
2025-04-23 02:05:41,949 [ scc.git] DEBUG Auto-merging test/integration/metadata/test_populate.py
2025-04-23 02:05:41,950 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-23 02:05:41,950 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-23 02:05:41,953 [ scc.git] DEBUG Calling 'git reset --hard 55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-23 02:05:41,958 [ scc.git] DEBUG HEAD is now at 55060a2 Merge pull request #90 from will-moore/pypi_release_action
2025-04-23 02:05:41,959 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:42,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:05:42,125 [ scc.git] DEBUG Calling 'git merge-base 55060a256e99567f21e64ff3c225d933fba1c501 78e55539b68e351ed5ef202854718b49a37729a7'
2025-04-23 02:05:42,129 [ scc.git] DEBUG Calling 'git diff --name-only 298f02623cd90268162161a988575db0b8c3d1ab..55060a256e99567f21e64ff3c225d933fba1c501'
2025-04-23 02:05:42,131 [ scc.git] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
Conflicting PR. Removed from build [OMERO-plugins-push#396](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/consoleText) for more details.
Possible conflicts:
- PR #55 kkoz 'Prevent users from creating columns with python keyword names'
- src/omero_metadata/populate.py
- Upstream changes
- src/omero_metadata/populate.py
--conflicts
2025-04-23 02:05:42,133 [ scc.config] DEBUG Found github.token
2025-04-23 02:05:42,133 [ scc.git] DEBUG Not adding comment to issue #64, already --conflicts.
2025-04-23 02:05:42,134 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-23 02:05:42,171 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:05:42,171 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:05:42,173 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-23 02:05:42,209 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-23 02:05:42,213 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe7aa242a90> has no local changes
2025-04-23 02:05:42,213 [ 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#396 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/)'
2025-04-23 02:05:42,219 [ scc.git] DEBUG [detached HEAD 3f0ba6e] merge master -Dorg -Ssuccess-only
2025-04-23 02:05:42,219 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:05:42,220 [ scc.repo] DEBUG ## PRs found:
2025-04-23 02:05:42,376 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:42,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/pulls HTTP/1.1" 200 None
2025-04-23 02:05:42,981 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:43,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/142 HTTP/1.1" 200 None
2025-04-23 02:05:43,453 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:43,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-23 02:05:43,987 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:44,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-23 02:05:44,496 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:44,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-23 02:05:45,012 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:45,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/16e9698187d538ee54a603e8f6c8c95a6ae448e0 HTTP/1.1" 200 None
2025-04-23 02:05:45,533 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:45,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/16e9698187d538ee54a603e8f6c8c95a6ae448e0?per_page=1 HTTP/1.1" 200 2
2025-04-23 02:05:45,719 [ scc.repo] DEBUG - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-23 02:05:45,970 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:46,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/141 HTTP/1.1" 200 None
2025-04-23 02:05:46,194 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-23 02:05:46,445 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:46,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-23 02:05:47,006 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:47,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-23 02:05:47,527 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:47,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-23 02:05:48,081 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:48,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/de7db17cd62b498179713df276cff151a1f36d80 HTTP/1.1" 200 None
2025-04-23 02:05:48,651 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:48,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/de7db17cd62b498179713df276cff151a1f36d80?per_page=1 HTTP/1.1" 200 2
2025-04-23 02:05:48,832 [ scc.repo] DEBUG - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-23 02:05:49,083 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:49,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/140 HTTP/1.1" 200 None
2025-04-23 02:05:49,309 [ scc.repo] DEBUG # ... Include label: dependencies
2025-04-23 02:05:49,559 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:49,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-23 02:05:50,017 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:50,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-23 02:05:50,559 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:50,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-23 02:05:51,080 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:51,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/commits/6301bc61b0a877104173846d526382bf15cc70a0 HTTP/1.1" 200 None
2025-04-23 02:05:51,540 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:51,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/statuses/6301bc61b0a877104173846d526382bf15cc70a0?per_page=1 HTTP/1.1" 200 2
2025-04-23 02:05:51,729 [ scc.repo] DEBUG - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-23 02:05:51,980 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:52,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/139 HTTP/1.1" 200 None
2025-04-23 02:05:52,471 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:52,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94 HTTP/1.1" 200 None
2025-04-23 02:05:52,958 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:53,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/94/comments HTTP/1.1" 200 None
2025-04-23 02:05:53,439 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:53,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86 HTTP/1.1" 200 None
2025-04-23 02:05:53,919 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:54,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/86/comments HTTP/1.1" 200 None
2025-04-23 02:05:54,431 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:54,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39 HTTP/1.1" 200 None
2025-04-23 02:05:54,920 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:55,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-parade/issues/39/comments HTTP/1.1" 200 None
2025-04-23 02:05:55,252 [ scc.repo] DEBUG ## Branches found:
2025-04-23 02:05:55,252 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-23 02:05:55,252 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:05:55,252 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:05:55,255 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-23 02:05:55,257 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-23 02:05:55,257 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-23 02:05:55,260 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-23 02:05:55,263 [ scc.git] DEBUG Already up to date.
2025-04-23 02:05:55,263 [ scc.git] DEBUG Calling 'git fetch origin pull/140/head'
2025-04-23 02:05:55,554 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-23 02:05:55,555 [ scc.git] DEBUG * branch refs/pull/140/head -> FETCH_HEAD
2025-04-23 02:05:55,559 [ scc.git] DEBUG Calling 'git fetch origin pull/141/head'
2025-04-23 02:05:55,840 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-23 02:05:55,840 [ scc.git] DEBUG * branch refs/pull/141/head -> FETCH_HEAD
2025-04-23 02:05:55,844 [ scc.git] DEBUG Calling 'git fetch origin pull/142/head'
2025-04-23 02:05:56,135 [ scc.git] DEBUG From https://github.com/ome/omero-parade
2025-04-23 02:05:56,135 [ scc.git] DEBUG * branch refs/pull/142/head -> FETCH_HEAD
2025-04-23 02:05:56,139 [ scc.git] DEBUG ## Unique users: []
2025-04-23 02:05:56,139 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:05:56,140 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:05:56,142 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-23 02:05:56,159 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:05:56,161 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 140 (Bump vite from 4.2.3 to 4.5.9) 6301bc61b0a877104173846d526382bf15cc70a0'
2025-04-23 02:05:56,183 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-23 02:05:56,186 [ scc.git] DEBUG package-lock.json | 289 ++++++++++++++++++++++++++----------------------------
2025-04-23 02:05:56,186 [ scc.git] DEBUG package.json | 2 +-
2025-04-23 02:05:56,186 [ scc.git] DEBUG 2 files changed, 138 insertions(+), 153 deletions(-)
2025-04-23 02:05:56,187 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:56,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:05:56,347 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...de7db17cd62b498179713df276cff151a1f36d80'
2025-04-23 02:05:56,359 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:05:56,361 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 141 (Bump axios from 1.6.0 to 1.8.2) de7db17cd62b498179713df276cff151a1f36d80'
2025-04-23 02:05:56,386 [ scc.git] DEBUG Auto-merging package-lock.json
2025-04-23 02:05:56,386 [ scc.git] DEBUG Auto-merging package.json
2025-04-23 02:05:56,387 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-23 02:05:56,390 [ scc.git] DEBUG package-lock.json | 18 ++++++++++--------
2025-04-23 02:05:56,390 [ scc.git] DEBUG package.json | 2 +-
2025-04-23 02:05:56,390 [ scc.git] DEBUG 2 files changed, 11 insertions(+), 9 deletions(-)
2025-04-23 02:05:56,598 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:56,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:05:56,792 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-23 02:05:56,795 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:05:56,797 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 142 (Use the release/v1 branch for the PyPA action publishing to PyPI) 16e9698187d538ee54a603e8f6c8c95a6ae448e0'
2025-04-23 02:05:56,806 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-23 02:05:56,809 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-04-23 02:05:56,809 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-04-23 02:05:57,043 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:57,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:05:57,237 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-23 02:05:57,275 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:05:57,275 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:05:57,278 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-23 02:05:57,315 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-23 02:05:57,319 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe7aa284b90> has no local changes
2025-04-23 02:05:57,319 [ 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#396 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/)'
2025-04-23 02:05:57,325 [ scc.git] DEBUG [detached HEAD d73fd47] merge master -Dorg -Ssuccess-only
2025-04-23 02:05:57,325 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:05:57,325 [ scc.repo] DEBUG ## PRs found:
2025-04-23 02:05:57,488 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:57,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-prometheus-tools/pulls HTTP/1.1" 200 2
2025-04-23 02:05:57,676 [ scc.repo] DEBUG ## Branches found:
2025-04-23 02:05:57,676 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-23 02:05:57,676 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:05:57,676 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:05:57,678 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-23 02:05:57,680 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-23 02:05:57,680 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-23 02:05:57,683 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-23 02:05:57,686 [ scc.git] DEBUG Already up to date.
2025-04-23 02:05:57,686 [ scc.git] DEBUG ## Unique users: []
2025-04-23 02:05:57,686 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:05:57,686 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:05:57,688 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-23 02:05:57,725 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:05:57,725 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:05:57,727 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-23 02:05:57,764 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-23 02:05:57,767 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe7a814f190> has no local changes
2025-04-23 02:05:57,768 [ 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#396 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/)'
2025-04-23 02:05:57,773 [ scc.git] DEBUG [detached HEAD 8637fcb] merge master -Dorg -Ssuccess-only
2025-04-23 02:05:57,774 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:05:57,774 [ scc.repo] DEBUG ## PRs found:
2025-04-23 02:05:57,927 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:58,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/pulls HTTP/1.1" 200 None
2025-04-23 02:05:58,475 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:58,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33 HTTP/1.1" 200 None
2025-04-23 02:05:58,967 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:59,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/33/comments HTTP/1.1" 200 None
2025-04-23 02:05:59,447 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:05:59,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-rois/issues/32 HTTP/1.1" 200 None
2025-04-23 02:05:59,683 [ scc.repo] DEBUG ## Branches found:
2025-04-23 02:05:59,683 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-23 02:05:59,683 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:05:59,683 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:05:59,686 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-23 02:05:59,688 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-23 02:05:59,688 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-23 02:05:59,691 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-23 02:05:59,694 [ scc.git] DEBUG Already up to date.
2025-04-23 02:05:59,694 [ scc.git] DEBUG ## Unique users: []
2025-04-23 02:05:59,694 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:05:59,694 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:05:59,696 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-23 02:05:59,733 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:05:59,733 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:05:59,735 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-23 02:05:59,771 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-23 02:05:59,774 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe7a8151350> has no local changes
2025-04-23 02:05:59,774 [ 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#396 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/)'
2025-04-23 02:05:59,780 [ scc.git] DEBUG [detached HEAD 1e50da8] merge master -Dorg -Ssuccess-only
2025-04-23 02:05:59,780 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:05:59,780 [ scc.repo] DEBUG ## PRs found:
2025-04-23 02:05:59,934 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:00,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/pulls HTTP/1.1" 200 None
2025-04-23 02:06:00,461 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:00,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14 HTTP/1.1" 200 None
2025-04-23 02:06:00,960 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:01,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/issues/14/comments HTTP/1.1" 200 None
2025-04-23 02:06:01,467 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:01,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-23 02:06:02,088 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:02,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-23 02:06:02,577 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:02,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/commits/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d HTTP/1.1" 200 None
2025-04-23 02:06:03,142 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:03,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-signup/statuses/b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d?per_page=1 HTTP/1.1" 200 2
2025-04-23 02:06:03,325 [ scc.repo] DEBUG - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-23 02:06:03,325 [ scc.repo] DEBUG ## Branches found:
2025-04-23 02:06:03,325 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-23 02:06:03,325 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:03,325 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:03,328 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-23 02:06:03,330 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-23 02:06:03,330 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-23 02:06:03,333 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-23 02:06:03,336 [ scc.git] DEBUG Already up to date.
2025-04-23 02:06:03,336 [ scc.git] DEBUG Calling 'git fetch origin pull/14/head'
2025-04-23 02:06:03,943 [ scc.git] DEBUG From https://github.com/ome/omero-signup
2025-04-23 02:06:03,944 [ scc.git] DEBUG * branch refs/pull/14/head -> FETCH_HEAD
2025-04-23 02:06:03,948 [ scc.git] DEBUG ## Unique users: []
2025-04-23 02:06:03,948 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:03,948 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:03,951 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-23 02:06:03,954 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:03,957 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 14 (Add pre-commit (black, flake8)) b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-23 02:06:04,071 [ scc.git] DEBUG Auto-merging omero_signup/signup_settings.py
2025-04-23 02:06:04,072 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/signup_settings.py
2025-04-23 02:06:04,072 [ scc.git] DEBUG Auto-merging omero_signup/urls.py
2025-04-23 02:06:04,072 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/urls.py
2025-04-23 02:06:04,072 [ scc.git] DEBUG Auto-merging omero_signup/views.py
2025-04-23 02:06:04,072 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_signup/views.py
2025-04-23 02:06:04,072 [ scc.git] DEBUG Auto-merging setup.py
2025-04-23 02:06:04,072 [ scc.git] DEBUG CONFLICT (content): Merge conflict in setup.py
2025-04-23 02:06:04,072 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-23 02:06:04,072 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-23 02:06:04,075 [ scc.git] DEBUG Calling 'git reset --hard be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-23 02:06:04,080 [ scc.git] DEBUG HEAD is now at be76813 Merge pull request #21 from jburel/build
2025-04-23 02:06:04,081 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:04,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:04,236 [ scc.git] DEBUG Calling 'git merge-base be76813540a02082196cac2ffee151e3f68cb71e b6aaf8b1b1af424ed458b3fe51d67ed0838d9e2d'
2025-04-23 02:06:04,239 [ scc.git] DEBUG Calling 'git diff --name-only f7ab15963cb5284a255b8574c8675437644fbdf1..be76813540a02082196cac2ffee151e3f68cb71e'
2025-04-23 02:06:04,242 [ scc.git] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
Conflicting PR. Removed from build [OMERO-plugins-push#396](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/consoleText) for more details.
Possible conflicts:
- Upstream changes
- setup.py
- omero_signup/urls.py
- omero_signup/views.py
- omero_signup/signup_settings.py
--conflicts
2025-04-23 02:06:04,245 [ scc.config] DEBUG Found github.token
2025-04-23 02:06:04,245 [ scc.git] DEBUG Not adding comment to issue #14, already --conflicts.
2025-04-23 02:06:04,245 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-23 02:06:04,282 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:04,282 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:04,285 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-23 02:06:04,321 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-23 02:06:04,325 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe7aa339410> has no local changes
2025-04-23 02:06:04,325 [ 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#396 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/)'
2025-04-23 02:06:04,332 [ scc.git] DEBUG [detached HEAD eb799a0] merge master -Dorg -Ssuccess-only
2025-04-23 02:06:04,332 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:04,332 [ scc.repo] DEBUG ## PRs found:
2025-04-23 02:06:04,487 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:04,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/pulls HTTP/1.1" 200 None
2025-04-23 02:06:05,068 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:05,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/76 HTTP/1.1" 200 None
2025-04-23 02:06:05,548 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:05,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-04-23 02:06:06,162 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:06,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-23 02:06:06,702 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:06,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-23 02:06:07,188 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:07,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6 HTTP/1.1" 200 None
2025-04-23 02:06:07,761 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:07,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6?per_page=1 HTTP/1.1" 200 2
2025-04-23 02:06:07,936 [ scc.repo] DEBUG - PR 76 will-moore 'Run cli deps'
2025-04-23 02:06:08,187 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:08,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/75 HTTP/1.1" 200 None
2025-04-23 02:06:08,672 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:08,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/74 HTTP/1.1" 200 None
2025-04-23 02:06:09,145 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:09,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623 HTTP/1.1" 200 None
2025-04-23 02:06:09,668 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:09,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-23 02:06:10,163 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:10,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/c18c080227e97899382d3464baa7c7885a621623/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-23 02:06:10,634 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:10,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73 HTTP/1.1" 200 None
2025-04-23 02:06:11,115 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:11,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/73/comments HTTP/1.1" 200 None
2025-04-23 02:06:11,621 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:11,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12 HTTP/1.1" 200 None
2025-04-23 02:06:12,087 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:12,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/issues/12/comments HTTP/1.1" 200 None
2025-04-23 02:06:12,551 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:12,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-23 02:06:13,078 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:13,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-23 02:06:13,596 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:13,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/commits/425319051224e8481afc40083fd9b5db4bc99928 HTTP/1.1" 200 None
2025-04-23 02:06:14,127 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:14,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-test-infra/statuses/425319051224e8481afc40083fd9b5db4bc99928?per_page=1 HTTP/1.1" 200 2
2025-04-23 02:06:14,304 [ scc.repo] DEBUG - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-23 02:06:14,304 [ scc.repo] DEBUG ## Branches found:
2025-04-23 02:06:14,304 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-23 02:06:14,304 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:14,304 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:14,307 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-23 02:06:14,309 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-23 02:06:14,309 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-23 02:06:14,312 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-23 02:06:14,315 [ scc.git] DEBUG Already up to date.
2025-04-23 02:06:14,315 [ scc.git] DEBUG Calling 'git fetch origin pull/12/head'
2025-04-23 02:06:14,756 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-23 02:06:14,756 [ scc.git] DEBUG * branch refs/pull/12/head -> FETCH_HEAD
2025-04-23 02:06:14,760 [ scc.git] DEBUG Calling 'git fetch origin pull/76/head'
2025-04-23 02:06:15,043 [ scc.git] DEBUG From https://github.com/openmicroscopy/omero-test-infra
2025-04-23 02:06:15,044 [ scc.git] DEBUG * branch refs/pull/76/head -> FETCH_HEAD
2025-04-23 02:06:15,048 [ scc.git] DEBUG ## Unique users: []
2025-04-23 02:06:15,048 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:15,048 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:15,050 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...425319051224e8481afc40083fd9b5db4bc99928'
2025-04-23 02:06:15,054 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:15,057 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 12 (IDR: use downloaded ansible templates & variables to configure infra) 425319051224e8481afc40083fd9b5db4bc99928'
2025-04-23 02:06:15,117 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-23 02:06:15,121 [ scc.git] DEBUG idr-compose.yml | 66 ++++++++++++++
2025-04-23 02:06:15,121 [ scc.git] DEBUG idr-haproxy.yml | 58 +++++++++++++
2025-04-23 02:06:15,121 [ scc.git] DEBUG idr/40-ansible.sh | 7 ++
2025-04-23 02:06:15,121 [ scc.git] DEBUG idr/70-reset-password.sh | 1 +
2025-04-23 02:06:15,121 [ scc.git] DEBUG idr/nginx/conf.d/default.conf | 1 +
2025-04-23 02:06:15,121 [ scc.git] DEBUG idr/nginx/conf.d/example_ssl.conf | 1 +
2025-04-23 02:06:15,121 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cache.conf | 53 +++++++++++
2025-04-23 02:06:15,121 [ scc.git] DEBUG idr/nginx/conf.d/proxy-cachebuster.conf | 114 ++++++++++++++++++++++++
2025-04-23 02:06:15,121 [ scc.git] DEBUG idr/nginx/conf.d/proxy-default.conf | 135 +++++++++++++++++++++++++++++
2025-04-23 02:06:15,122 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:15,122 [ scc.git] DEBUG idr/nginx/conf.d/proxy-omeroreadwrite.conf | 115 ++++++++++++++++++++++++
2025-04-23 02:06:15,122 [ scc.git] DEBUG idr/nginx/conf.d/proxy-redirect.conf | 15 ++++
2025-04-23 02:06:15,122 [ scc.git] DEBUG idr/nginx/conf.d/proxy-upstream.conf | 13 +++
2025-04-23 02:06:15,122 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v0.conf | 26 ++++++
2025-04-23 02:06:15,122 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v1.conf | 30 +++++++
2025-04-23 02:06:15,122 [ scc.git] DEBUG idr/nginx/conf.d/proxy-v2.conf | 30 +++++++
2025-04-23 02:06:15,122 [ scc.git] DEBUG idr/nginx/conf.d/proxy-websockets.conf | 6 ++
2025-04-23 02:06:15,122 [ scc.git] DEBUG idr/nginx/nginx.conf | 53 +++++++++++
2025-04-23 02:06:15,122 [ scc.git] DEBUG idr/omero/Dockerfile | 3 +
2025-04-23 02:06:15,122 [ scc.git] DEBUG idr/omero/playbook.yml | 41 +++++++++
2025-04-23 02:06:15,122 [ scc.git] DEBUG idr/redirect/Dockerfile | 6 ++
2025-04-23 02:06:15,122 [ scc.git] DEBUG idr/web/Dockerfile | 5 ++
2025-04-23 02:06:15,122 [ scc.git] DEBUG idr/web/playbook.yml | 45 ++++++++++
2025-04-23 02:06:15,122 [ scc.git] DEBUG 22 files changed, 824 insertions(+)
2025-04-23 02:06:15,122 [ scc.git] DEBUG create mode 100644 idr-compose.yml
2025-04-23 02:06:15,122 [ scc.git] DEBUG create mode 100644 idr-haproxy.yml
2025-04-23 02:06:15,122 [ scc.git] DEBUG create mode 100755 idr/40-ansible.sh
2025-04-23 02:06:15,122 [ scc.git] DEBUG create mode 100755 idr/70-reset-password.sh
2025-04-23 02:06:15,122 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/default.conf
2025-04-23 02:06:15,122 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/example_ssl.conf
2025-04-23 02:06:15,123 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cache.conf
2025-04-23 02:06:15,123 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-cachebuster.conf
2025-04-23 02:06:15,123 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-default.conf
2025-04-23 02:06:15,123 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-omeroreadwrite.conf
2025-04-23 02:06:15,123 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-redirect.conf
2025-04-23 02:06:15,123 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-upstream.conf
2025-04-23 02:06:15,123 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v0.conf
2025-04-23 02:06:15,123 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v1.conf
2025-04-23 02:06:15,123 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-v2.conf
2025-04-23 02:06:15,123 [ scc.git] DEBUG create mode 100644 idr/nginx/conf.d/proxy-websockets.conf
2025-04-23 02:06:15,123 [ scc.git] DEBUG create mode 100644 idr/nginx/nginx.conf
2025-04-23 02:06:15,123 [ scc.git] DEBUG create mode 100644 idr/omero/Dockerfile
2025-04-23 02:06:15,123 [ scc.git] DEBUG create mode 100644 idr/omero/playbook.yml
2025-04-23 02:06:15,123 [ scc.git] DEBUG create mode 100644 idr/redirect/Dockerfile
2025-04-23 02:06:15,123 [ scc.git] DEBUG create mode 100644 idr/web/Dockerfile
2025-04-23 02:06:15,123 [ scc.git] DEBUG create mode 100644 idr/web/playbook.yml
2025-04-23 02:06:15,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:15,281 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-04-23 02:06:15,285 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:15,287 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 76 (Run cli deps) bd0bdd4d987dbcec28e1780f65ad3bbbe18d1aa6'
2025-04-23 02:06:15,297 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-23 02:06:15,300 [ scc.git] DEBUG docker | 1 +
2025-04-23 02:06:15,300 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2025-04-23 02:06:15,532 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:15,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:15,713 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-23 02:06:15,751 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:15,751 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:15,754 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-23 02:06:15,791 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-23 02:06:15,795 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe7a8178690> has no local changes
2025-04-23 02:06:15,795 [ 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#396 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/)'
2025-04-23 02:06:15,802 [ scc.git] DEBUG [detached HEAD 0bfeced] merge master -Dorg -Ssuccess-only
2025-04-23 02:06:15,802 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:15,802 [ scc.repo] DEBUG ## PRs found:
2025-04-23 02:06:15,964 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:16,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-upload/pulls HTTP/1.1" 200 2
2025-04-23 02:06:16,165 [ scc.repo] DEBUG ## Branches found:
2025-04-23 02:06:16,165 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-23 02:06:16,165 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:16,165 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:16,168 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-23 02:06:16,170 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-23 02:06:16,170 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-23 02:06:16,173 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-23 02:06:16,176 [ scc.git] DEBUG Already up to date.
2025-04-23 02:06:16,176 [ scc.git] DEBUG ## Unique users: []
2025-04-23 02:06:16,176 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:16,176 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:16,178 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-23 02:06:16,215 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:16,215 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:16,217 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-23 02:06:16,252 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-23 02:06:16,256 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe7a8145050> has no local changes
2025-04-23 02:06:16,256 [ 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#396 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/)'
2025-04-23 02:06:16,261 [ scc.git] DEBUG [detached HEAD 8b00227] merge master -Dorg -Ssuccess-only
2025-04-23 02:06:16,262 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:16,262 [ scc.repo] DEBUG ## PRs found:
2025-04-23 02:06:16,416 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:16,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/pulls HTTP/1.1" 200 None
2025-04-23 02:06:16,948 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:17,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20 HTTP/1.1" 200 None
2025-04-23 02:06:17,439 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:17,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/issues/20/comments HTTP/1.1" 200 None
2025-04-23 02:06:17,903 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:18,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-23 02:06:18,425 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:18,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-23 02:06:18,968 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:19,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-23 02:06:19,469 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:19,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/commits/14c890a5b62ef9937c751230251154351debb9ea HTTP/1.1" 200 None
2025-04-23 02:06:19,997 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:20,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-virtual-microscope/statuses/14c890a5b62ef9937c751230251154351debb9ea?per_page=1 HTTP/1.1" 200 2
2025-04-23 02:06:20,178 [ scc.repo] DEBUG - PR 20 jburel 'Build'
2025-04-23 02:06:20,178 [ scc.repo] DEBUG ## Branches found:
2025-04-23 02:06:20,178 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-23 02:06:20,178 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:20,178 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:20,181 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-23 02:06:20,184 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-23 02:06:20,184 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-23 02:06:20,186 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-23 02:06:20,189 [ scc.git] DEBUG Already up to date.
2025-04-23 02:06:20,189 [ scc.git] DEBUG Calling 'git fetch origin pull/20/head'
2025-04-23 02:06:20,822 [ scc.git] DEBUG From https://github.com/ome/omero-virtual-microscope
2025-04-23 02:06:20,822 [ scc.git] DEBUG * branch refs/pull/20/head -> FETCH_HEAD
2025-04-23 02:06:20,826 [ scc.git] DEBUG ## Unique users: []
2025-04-23 02:06:20,826 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:20,827 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:20,829 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...14c890a5b62ef9937c751230251154351debb9ea'
2025-04-23 02:06:20,832 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:20,834 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 20 (Build) 14c890a5b62ef9937c751230251154351debb9ea'
2025-04-23 02:06:20,842 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-23 02:06:20,845 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2025-04-23 02:06:20,845 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 12 +++++++-----
2025-04-23 02:06:20,845 [ scc.git] DEBUG .omeroci/app-build | 19 +++++++++++++++++++
2025-04-23 02:06:20,845 [ scc.git] DEBUG 3 files changed, 27 insertions(+), 6 deletions(-)
2025-04-23 02:06:20,845 [ scc.git] DEBUG create mode 100755 .omeroci/app-build
2025-04-23 02:06:20,846 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:21,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:21,021 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-23 02:06:21,060 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:21,060 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:21,062 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-23 02:06:21,099 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-23 02:06:21,103 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe7a81a0550> has no local changes
2025-04-23 02:06:21,103 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Generated by OMERO-plugins-push#396 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/)'
2025-04-23 02:06:21,109 [ scc.git] DEBUG [detached HEAD 0c1cd0f] merge master -Dorg -Ssuccess-only
2025-04-23 02:06:21,109 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:21,109 [ scc.git] INFO Overriding base-branch from master to main
2025-04-23 02:06:21,109 [ scc.repo] DEBUG ## PRs found:
2025-04-23 02:06:21,272 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:21,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/pulls HTTP/1.1" 200 None
2025-04-23 02:06:21,831 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:22,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18 HTTP/1.1" 200 None
2025-04-23 02:06:22,318 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:22,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/18/comments HTTP/1.1" 200 None
2025-04-23 02:06:22,811 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:23,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec HTTP/1.1" 200 None
2025-04-23 02:06:23,343 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:23,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-23 02:06:23,852 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:24,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/fec20a6fff48522621889a53c632b0cd439e57ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-23 02:06:24,361 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:24,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/16 HTTP/1.1" 200 None
2025-04-23 02:06:24,838 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:25,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10 HTTP/1.1" 200 None
2025-04-23 02:06:25,397 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:25,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/issues/10/comments HTTP/1.1" 200 None
2025-04-23 02:06:25,892 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:26,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-23 02:06:26,419 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:26,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-23 02:06:27,015 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:27,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/commits/85cf4c893f393da6763bf4cee2a308832a41a9e8 HTTP/1.1" 200 None
2025-04-23 02:06:27,531 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:27,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web-zarr/statuses/85cf4c893f393da6763bf4cee2a308832a41a9e8?per_page=1 HTTP/1.1" 200 2
2025-04-23 02:06:27,720 [ scc.repo] DEBUG - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-23 02:06:27,720 [ scc.repo] DEBUG ## Branches found:
2025-04-23 02:06:27,720 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-23 02:06:27,720 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:27,720 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:27,723 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/main'
2025-04-23 02:06:27,725 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-23 02:06:27,726 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/main'
2025-04-23 02:06:27,728 [ scc.git] DEBUG Calling 'git merge --ff-only origin/main'
2025-04-23 02:06:27,731 [ scc.git] DEBUG Already up to date.
2025-04-23 02:06:27,732 [ scc.git] DEBUG Calling 'git fetch origin pull/10/head'
2025-04-23 02:06:28,214 [ scc.git] DEBUG From https://github.com/ome/omero-web-zarr
2025-04-23 02:06:28,214 [ scc.git] DEBUG * branch refs/pull/10/head -> FETCH_HEAD
2025-04-23 02:06:28,219 [ scc.git] DEBUG ## Unique users: []
2025-04-23 02:06:28,219 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:28,219 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:28,222 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-23 02:06:28,225 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:28,227 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 10 (Add Openwith -> itk-vtk viewer) 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-23 02:06:28,319 [ scc.git] DEBUG Auto-merging omero_web_zarr/urls.py
2025-04-23 02:06:28,319 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero_web_zarr/urls.py
2025-04-23 02:06:28,319 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-23 02:06:28,319 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-23 02:06:28,322 [ scc.git] DEBUG Calling 'git reset --hard 8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-23 02:06:28,326 [ scc.git] DEBUG HEAD is now at 8f3c313 Merge pull request #17 from jburel/build
2025-04-23 02:06:28,327 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:28,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:28,494 [ scc.git] DEBUG Calling 'git merge-base 8f3c31388de8a7c44f18a6f0e20ea41d35fae041 85cf4c893f393da6763bf4cee2a308832a41a9e8'
2025-04-23 02:06:28,497 [ scc.git] DEBUG Calling 'git diff --name-only daa26b83ec1c94ace0c1eedcfb7d38c9185503d7..8f3c31388de8a7c44f18a6f0e20ea41d35fae041'
2025-04-23 02:06:28,500 [ scc.git] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Conflicting PR. Removed from build [OMERO-plugins-push#396](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero_web_zarr/urls.py
--conflicts
2025-04-23 02:06:28,502 [ scc.config] DEBUG Found github.token
2025-04-23 02:06:28,502 [ scc.git] DEBUG Not adding comment to issue #10, already --conflicts.
2025-04-23 02:06:28,502 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-23 02:06:28,539 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:28,539 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:28,541 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-23 02:06:28,577 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-23 02:06:28,580 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe7aa325690> has no local changes
2025-04-23 02:06:28,580 [ 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#396 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/)'
2025-04-23 02:06:28,586 [ scc.git] DEBUG [detached HEAD 69d61ee] merge master -Dorg -Ssuccess-only
2025-04-23 02:06:28,587 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:28,587 [ scc.repo] DEBUG ## PRs found:
2025-04-23 02:06:28,745 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:28,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-weberror/pulls HTTP/1.1" 200 2
2025-04-23 02:06:28,934 [ scc.repo] DEBUG ## Branches found:
2025-04-23 02:06:28,934 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-23 02:06:28,935 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:28,935 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:28,937 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-23 02:06:28,939 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-23 02:06:28,939 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-23 02:06:28,942 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-23 02:06:28,945 [ scc.git] DEBUG Already up to date.
2025-04-23 02:06:28,945 [ scc.git] DEBUG ## Unique users: []
2025-04-23 02:06:28,945 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:28,945 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:28,947 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-23 02:06:28,984 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:28,984 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:28,986 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-23 02:06:29,022 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-23 02:06:29,025 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe7a8133e50> has no local changes
2025-04-23 02:06:29,025 [ 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#396 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/)'
2025-04-23 02:06:29,031 [ scc.git] DEBUG [detached HEAD c06be62] merge master -Dorg -Ssuccess-only
2025-04-23 02:06:29,031 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:29,031 [ scc.repo] DEBUG ## PRs found:
2025-04-23 02:06:29,186 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:29,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-webtest/pulls HTTP/1.1" 200 2
2025-04-23 02:06:29,376 [ scc.repo] DEBUG ## Branches found:
2025-04-23 02:06:29,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-23 02:06:29,377 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:29,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:29,379 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-23 02:06:29,381 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-23 02:06:29,381 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-23 02:06:29,384 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-23 02:06:29,387 [ scc.git] DEBUG Already up to date.
2025-04-23 02:06:29,387 [ scc.git] DEBUG ## Unique users: []
2025-04-23 02:06:29,387 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:29,387 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:29,389 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-23 02:06:29,425 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:29,425 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:29,427 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-23 02:06:29,465 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-23 02:06:29,468 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe7a81a4f90> has no local changes
2025-04-23 02:06:29,468 [ 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#396 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/)'
2025-04-23 02:06:29,474 [ scc.git] DEBUG [detached HEAD e750721] merge master -Dorg -Ssuccess-only
2025-04-23 02:06:29,474 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:29,475 [ scc.repo] DEBUG ## PRs found:
2025-04-23 02:06:29,628 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:29,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/pulls HTTP/1.1" 200 None
2025-04-23 02:06:30,142 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:30,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100 HTTP/1.1" 200 None
2025-04-23 02:06:30,631 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:30,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/issues/100/comments HTTP/1.1" 200 None
2025-04-23 02:06:31,094 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:31,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-23 02:06:31,635 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:31,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-23 02:06:32,178 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:32,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/commits/b4abacf0cb9b7aee150761d320bdbb80762cd6e7 HTTP/1.1" 200 None
2025-04-23 02:06:32,691 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:32,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/rOMERO-gateway/statuses/b4abacf0cb9b7aee150761d320bdbb80762cd6e7?per_page=1 HTTP/1.1" 200 2
2025-04-23 02:06:32,870 [ scc.repo] DEBUG - PR 100 dominikl 'Run tests properly'
2025-04-23 02:06:32,870 [ scc.repo] DEBUG ## Branches found:
2025-04-23 02:06:32,871 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-23 02:06:32,871 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:32,871 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:32,873 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-04-23 02:06:32,876 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-23 02:06:32,876 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-04-23 02:06:32,879 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-04-23 02:06:32,882 [ scc.git] DEBUG Already up to date.
2025-04-23 02:06:32,882 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2025-04-23 02:06:33,335 [ scc.git] DEBUG From https://github.com/ome/rOMERO-gateway
2025-04-23 02:06:33,335 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2025-04-23 02:06:33,339 [ scc.git] DEBUG ## Unique users: []
2025-04-23 02:06:33,339 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:33,339 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:33,341 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-23 02:06:33,344 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:33,346 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Run tests properly) b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-23 02:06:33,517 [ scc.git] DEBUG Auto-merging Dockerfile
2025-04-23 02:06:33,518 [ scc.git] DEBUG CONFLICT (content): Merge conflict in Dockerfile
2025-04-23 02:06:33,518 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-23 02:06:33,518 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-23 02:06:33,521 [ scc.git] DEBUG Calling 'git reset --hard 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-23 02:06:33,527 [ scc.git] DEBUG HEAD is now at 7b5d64d Merge pull request #106 from dominikl/add_examples_2
2025-04-23 02:06:33,529 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:33,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:33,724 [ scc.git] DEBUG Calling 'git merge-base 7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9 b4abacf0cb9b7aee150761d320bdbb80762cd6e7'
2025-04-23 02:06:33,727 [ scc.git] DEBUG Calling 'git diff --name-only 8b424d2d21f70d07729c4da38a9241b9a9f483be..7b5d64d3cdf825a6952b40d5b2f550d8d794b0a9'
2025-04-23 02:06:33,729 [ scc.git] INFO - PR 100 dominikl 'Run tests properly'
Conflicting PR. Removed from build [OMERO-plugins-push#396](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/consoleText) for more details.
Possible conflicts:
- Upstream changes
- Dockerfile
--conflicts
2025-04-23 02:06:33,731 [ scc.config] DEBUG Found github.token
2025-04-23 02:06:33,731 [ scc.git] DEBUG Not adding comment to issue #100, already --conflicts.
2025-04-23 02:06:33,732 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-23 02:06:33,770 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:33,770 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:33,772 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-23 02:06:33,810 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-23 02:06:33,814 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe7aa4cfa50> has no local changes
2025-04-23 02:06:33,814 [ 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#396 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/)'
2025-04-23 02:06:33,821 [ scc.git] DEBUG [detached HEAD 746f32d] merge master -Dorg -Ssuccess-only
2025-04-23 02:06:33,821 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:33,821 [ scc.git] INFO Overriding base-branch from master to develop
2025-04-23 02:06:33,821 [ scc.repo] DEBUG ## PRs found:
2025-04-23 02:06:33,975 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:34,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-04-23 02:06:34,524 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:34,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-04-23 02:06:35,009 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:35,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-04-23 02:06:35,710 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:36,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-23 02:06:36,254 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:36,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-23 02:06:36,753 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:37,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-04-23 02:06:37,257 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:37,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-04-23 02:06:37,737 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:37,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-04-23 02:06:37,922 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-23 02:06:38,173 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:38,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-04-23 02:06:38,643 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:38,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-04-23 02:06:39,130 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:39,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-23 02:06:39,594 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:39,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-04-23 02:06:40,054 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:40,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-04-23 02:06:40,510 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:40,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-04-23 02:06:40,686 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-23 02:06:40,937 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:41,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-04-23 02:06:41,444 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:41,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-04-23 02:06:41,999 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:42,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-04-23 02:06:42,492 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:42,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-04-23 02:06:42,745 [ scc.repo] DEBUG ## Branches found:
2025-04-23 02:06:42,745 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-23 02:06:42,745 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:42,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:42,748 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-04-23 02:06:42,751 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-04-23 02:06:42,751 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-04-23 02:06:42,754 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-04-23 02:06:42,762 [ scc.git] DEBUG Updating 4b4c755..950b28b
2025-04-23 02:06:42,995 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:43,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls/225 HTTP/1.1" 200 None
2025-04-23 02:06:43,469 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-04-23 02:06:44,315 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-23 02:06:44,315 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-04-23 02:06:44,319 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-04-23 02:06:44,903 [ scc.git] DEBUG From https://github.com/ome/scripts
2025-04-23 02:06:44,903 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-04-23 02:06:44,907 [ scc.git] DEBUG ## Unique users: []
2025-04-23 02:06:44,907 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:44,908 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:44,910 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-23 02:06:44,916 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:44,918 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-23 02:06:45,088 [ scc.git] DEBUG CONFLICT (modify/delete): omero/annotation_scripts/KeyVal_to_csv.py deleted in HEAD and modified in 1fd6030669613cdb8879cfe6395db8c820fdcf19. Version 1fd6030669613cdb8879cfe6395db8c820fdcf19 of omero/annotation_scripts/KeyVal_to_csv.py left in tree.
2025-04-23 02:06:45,089 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-04-23 02:06:45,089 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-04-23 02:06:45,091 [ scc.git] DEBUG Calling 'git reset --hard 950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-23 02:06:45,095 [ scc.git] DEBUG HEAD is now at 950b28b Merge pull request #225 from will-moore/test_fixes
2025-04-23 02:06:45,096 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:45,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:45,262 [ scc.git] DEBUG Calling 'git merge-base 950b28b31e228ae7b317cbd159235faf4023e4dc 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-04-23 02:06:45,267 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..950b28b31e228ae7b317cbd159235faf4023e4dc'
2025-04-23 02:06:45,271 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-plugins-push#396](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-04-23 02:06:45,273 [ scc.config] DEBUG Found github.token
2025-04-23 02:06:45,273 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-04-23 02:06:45,273 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-23 02:06:45,278 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:45,280 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 223 (don't attempt ROI stats on big images) d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-04-23 02:06:45,289 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-04-23 02:06:45,292 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-04-23 02:06:45,292 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-04-23 02:06:45,513 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:45,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:45,690 [ scc.git] DEBUG Calling 'git submodule update'
2025-04-23 02:06:45,728 [ scc.git] DEBUG Get sha1 of %s
2025-04-23 02:06:45,729 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-04-23 02:06:45,731 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-23 02:06:45,767 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-23 02:06:45,771 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe7a815b350> has no local changes
2025-04-23 02:06:45,771 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#396 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/)'
2025-04-23 02:06:45,778 [ scc.git] DEBUG [detached HEAD 3b5be83] merge master -Dorg -Ssuccess-only
2025-04-23 02:06:45,778 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:45,778 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-04-23 02:06:45,852 [ scc.config] DEBUG Found submodule.minimal-omero-client.url
2025-04-23 02:06:45,941 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:46,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:46,103 [ scc.config] DEBUG Found submodule.minimal-omero-client.branch
2025-04-23 02:06:46,105 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.url
2025-04-23 02:06:46,349 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:46,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:46,520 [ scc.config] DEBUG Found submodule.omero-cli-duplicate.branch
2025-04-23 02:06:46,522 [ scc.config] DEBUG Found submodule.omero-cli-render.url
2025-04-23 02:06:46,766 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:46,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:46,930 [ scc.config] DEBUG Found submodule.omero-cli-render.branch
2025-04-23 02:06:46,932 [ scc.config] DEBUG Found submodule.omero-cli-zarr.url
2025-04-23 02:06:47,176 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:47,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:47,345 [ scc.config] DEBUG Found submodule.omero-figure.url
2025-04-23 02:06:47,589 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:47,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:47,764 [ scc.config] DEBUG Found submodule.omero-figure.branch
2025-04-23 02:06:47,766 [ scc.config] DEBUG Found submodule.omero-fpbioimage.url
2025-04-23 02:06:48,010 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:48,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:48,212 [ scc.config] DEBUG Found submodule.omero-fpbioimage.branch
2025-04-23 02:06:48,214 [ scc.config] DEBUG Found submodule.omero-gallery.url
2025-04-23 02:06:48,458 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:48,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:48,631 [ scc.config] DEBUG Found submodule.omero-gallery.branch
2025-04-23 02:06:48,633 [ scc.config] DEBUG Found submodule.omero-iviewer.url
2025-04-23 02:06:48,878 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:49,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:49,043 [ scc.config] DEBUG Found submodule.omero-iviewer.branch
2025-04-23 02:06:49,045 [ scc.config] DEBUG Found submodule.omero-mapr.url
2025-04-23 02:06:49,290 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:49,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:49,461 [ scc.config] DEBUG Found submodule.omero-mapr.branch
2025-04-23 02:06:49,463 [ scc.config] DEBUG Found submodule.omero-metadata.url
2025-04-23 02:06:49,708 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:49,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:49,879 [ scc.config] DEBUG Found submodule.omero-metadata.branch
2025-04-23 02:06:49,881 [ scc.config] DEBUG Found submodule.omero-parade.url
2025-04-23 02:06:50,126 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:50,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:50,300 [ scc.config] DEBUG Found submodule.omero-parade.branch
2025-04-23 02:06:50,302 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.url
2025-04-23 02:06:50,546 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:50,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:50,711 [ scc.config] DEBUG Found submodule.omero-prometheus-tools.branch
2025-04-23 02:06:50,713 [ scc.config] DEBUG Found submodule.omero-rois.url
2025-04-23 02:06:50,956 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:51,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:51,118 [ scc.config] DEBUG Found submodule.omero-signup.url
2025-04-23 02:06:51,363 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:51,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:51,530 [ scc.config] DEBUG Found submodule.omero-test-infra.url
2025-04-23 02:06:51,775 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:51,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:51,951 [ scc.config] DEBUG Found submodule.omero-test-infra.branch
2025-04-23 02:06:51,953 [ scc.config] DEBUG Found submodule.omero-upload.url
2025-04-23 02:06:52,197 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:52,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:52,374 [ scc.config] DEBUG Found submodule.omero-virtual-microscope.url
2025-04-23 02:06:52,618 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:52,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:52,790 [ scc.config] DEBUG Found submodule.omero-web-zarr.url
2025-04-23 02:06:53,034 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:53,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:53,196 [ scc.config] DEBUG Found submodule.omero-web-zarr.branch
2025-04-23 02:06:53,198 [ scc.config] DEBUG Found submodule.omero-weberror.url
2025-04-23 02:06:53,443 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:53,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:53,608 [ scc.config] DEBUG Found submodule.omero-weberror.branch
2025-04-23 02:06:53,611 [ scc.config] DEBUG Found submodule.omero-webtest.url
2025-04-23 02:06:53,855 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:54,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:54,029 [ scc.config] DEBUG Found submodule.omero-webtest.branch
2025-04-23 02:06:54,032 [ scc.config] DEBUG Found submodule.rOMERO-gateway.url
2025-04-23 02:06:54,275 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:54,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:54,443 [ scc.config] DEBUG Found submodule.rOMERO-gateway.branch
2025-04-23 02:06:54,445 [ scc.config] DEBUG Found submodule.scripts.url
2025-04-23 02:06:54,689 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-04-23 02:06:54,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-04-23 02:06:54,865 [ scc.config] DEBUG Found submodule.scripts.branch
2025-04-23 02:06:54,865 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-04-23 02:06:54,953 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe7aa511ad0> has local changes
2025-04-23 02:06:54,953 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-plugins
Already up to date.
Merged PRs:
- PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
- PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
- PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
Repository: ome/minimal-omero-client
Already up to date.
Repository: ome/omero-cli-duplicate
Excluded PRs:
- PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
Already up to date.
Repository: ome/omero-cli-render
Excluded PRs:
- PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
- PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
Already up to date.
Merged PRs:
- PR 59 will-moore 'Apply settings to Plate'
- PR 69 dominikl 'Fix help text for impo/export commands'
Repository: ome/omero-cli-zarr
Excluded PRs:
- PR 171 will-moore 'Initial addition of integration tests' (status: failure)
- PR 170 will-moore 'Use ome zarr models py' (stage: draft)
- PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
- PR 166 will-moore 'Downsample scale option' (stage: draft)
- PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
Updating 11d3587..7a2c812
Previously merged:
- PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 147 will-moore 'Name option'
Conflicting PRs (not included):
- PR 167 dominikl 'Add extinfo command'
Repository: ome/omero-figure
Excluded PRs:
- PR 619 will-moore 'OME-Zarr support' (stage: draft)
- PR 543 will-moore 'Plate well labels' (exclude comment)
Updating 9cc36cde..4f0362e2
Previously merged:
- PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Merged PRs:
- PR 600 Rdornier 'Label on rois'
- PR 605 Tom-TBT 'Colorbar feature'
- PR 610 will-moore 'Add docs/contributing.rst'
- PR 612 will-moore 'Script version'
- PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
- PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
- PR 635 dependabot[bot] 'Bump esbuild and vite'
Conflicting PRs (not included):
- PR 616 Rdornier 'Fix labels around border'
- PR 630 will-moore 'Fix color and position for ALL new panel insets'
Repository: ome/omero-fpbioimage
Already up to date.
Merged PRs:
- PR 18 jburel 'default size z value'
Repository: ome/omero-gallery
Already up to date.
Merged PRs:
- PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
- PR 114 dependabot[bot] 'Bump tar and fsevents'
- PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
- PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
Conflicting PRs (not included):
- PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
- PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
- PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
Repository: ome/omero-iviewer
Excluded PRs:
- PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
- PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
- PR 420 will-moore 'Add release process to README' (exclude comment)
- PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
- PR 227 will-moore 'Vectortile investigation' (status: failure)
Already up to date.
Merged PRs:
- PR 460 will-moore 'Channel min spinner fix'
- PR 465 will-moore 'Save as Figure'
- PR 471 will-moore 'Z projection disabled tooltip'
- PR 499 dependabot[bot] 'Bump nanoid and mocha'
- PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
Repository: ome/omero-mapr
Excluded PRs:
- PR 79 will-moore 'Right panel title' (exclude comment)
Already up to date.
Merged PRs:
- PR 74 will-moore 'mapr extension of webclient'
- PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-metadata
Updating 3cd120c..55060a2
Previously merged:
- PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Conflicting PRs (not included):
- PR 55 kkoz 'Prevent users from creating columns with python keyword names'
- PR 64 will-moore 'Support images_by_name for Screen and Plate'
Repository: ome/omero-parade
Excluded PRs:
- PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
- PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
- PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
- PR 39 chris-allan 'Expand all for Screens' (exclude comment)
Already up to date.
Merged PRs:
- PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
- PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
- PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
Repository: ome/omero-prometheus-tools
Already up to date.
Repository: ome/omero-rois
Excluded PRs:
- PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
- PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
Already up to date.
Repository: ome/omero-signup
Already up to date.
Conflicting PRs (not included):
- PR 14 manics 'Add pre-commit (black, flake8)'
Repository: openmicroscopy/omero-test-infra
Excluded PRs:
- PR 75 marimeireles 'Microservices' (user: marimeireles)
- PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
- PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
Already up to date.
Merged PRs:
- PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
- PR 76 will-moore 'Run cli deps'
Repository: ome/omero-upload
Already up to date.
Repository: ome/omero-virtual-microscope
Already up to date.
Merged PRs:
- PR 20 jburel 'Build'
Repository: ome/omero-web-zarr
Excluded PRs:
- PR 18 will-moore 'Build' (status: failure)
- PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
Already up to date.
Conflicting PRs (not included):
- PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
Repository: openmicroscopy/omero-weberror
Already up to date.
Repository: openmicroscopy/omero-webtest
Already up to date.
Repository: ome/rOMERO-gateway
Already up to date.
Conflicting PRs (not included):
- PR 100 dominikl 'Run tests properly'
Repository: ome/scripts
Excluded PRs:
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Updating 4b4c755..950b28b
Previously merged:
- PR 225 will-moore 'Fix param names and assertion texts in tests'
Merged PRs:
- PR 223 will-moore 'don't attempt ROI stats on big images'
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-plugins-push#396 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-plugins-push/396/)'
2025-04-23 02:06:54,967 [ scc.git] DEBUG [detached HEAD caae89a] merge master -Dorg -Ssuccess-only
2025-04-23 02:06:54,967 [ scc.git] DEBUG 23 files changed, 44 insertions(+), 44 deletions(-)
2025-04-23 02:06:54,967 [ scc.merge] INFO Repository: ome/omero-plugins
2025-04-23 02:06:54,968 [ scc.merge] INFO Already up to date.
2025-04-23 02:06:54,968 [ scc.merge] INFO
2025-04-23 02:06:54,968 [ scc.merge] INFO Merged PRs:
2025-04-23 02:06:54,968 [ scc.merge] INFO - PR 429 dependabot[bot] 'Bump scripts from `312afbe` to `4b4c755`'
2025-04-23 02:06:54,968 [ scc.merge] INFO - PR 432 dependabot[bot] 'Bump omero-figure from `fb316a7` to `9cc36cd`'
2025-04-23 02:06:54,968 [ scc.merge] INFO - PR 433 dependabot[bot] 'Bump omero-iviewer from `b4102d4` to `7a798ce`'
2025-04-23 02:06:54,968 [ scc.merge] INFO
2025-04-23 02:06:54,968 [ scc.merge] INFO Repository: ome/minimal-omero-client
2025-04-23 02:06:54,968 [ scc.merge] INFO Already up to date.
2025-04-23 02:06:54,968 [ scc.merge] INFO
2025-04-23 02:06:54,968 [ scc.merge] INFO
2025-04-23 02:06:54,968 [ scc.merge] INFO Repository: ome/omero-cli-duplicate
2025-04-23 02:06:54,968 [ scc.merge] INFO Excluded PRs:
2025-04-23 02:06:54,968 [ scc.merge] INFO - PR 18 joshmoore 'Enable pipeline of duplicate output to, e.g., chgrp' (exclude comment)
2025-04-23 02:06:54,968 [ scc.merge] INFO Already up to date.
2025-04-23 02:06:54,968 [ scc.merge] INFO
2025-04-23 02:06:54,968 [ scc.merge] INFO
2025-04-23 02:06:54,968 [ scc.merge] INFO Repository: ome/omero-cli-render
2025-04-23 02:06:54,968 [ scc.merge] INFO Excluded PRs:
2025-04-23 02:06:54,968 [ scc.merge] INFO - PR 70 dominikl 'Update changelog for 0.8.2 release' (stage: draft)
2025-04-23 02:06:54,968 [ scc.merge] INFO - PR 52 manics ' Add batchset for rendering a hierarchy of containers (single file)' (stage: draft)
2025-04-23 02:06:54,968 [ scc.merge] INFO Already up to date.
2025-04-23 02:06:54,968 [ scc.merge] INFO
2025-04-23 02:06:54,968 [ scc.merge] INFO Merged PRs:
2025-04-23 02:06:54,968 [ scc.merge] INFO - PR 59 will-moore 'Apply settings to Plate'
2025-04-23 02:06:54,968 [ scc.merge] INFO - PR 69 dominikl 'Fix help text for impo/export commands'
2025-04-23 02:06:54,968 [ scc.merge] INFO
2025-04-23 02:06:54,968 [ scc.merge] INFO Repository: ome/omero-cli-zarr
2025-04-23 02:06:54,968 [ scc.merge] INFO Excluded PRs:
2025-04-23 02:06:54,968 [ scc.merge] INFO - PR 171 will-moore 'Initial addition of integration tests' (status: failure)
2025-04-23 02:06:54,968 [ scc.merge] INFO - PR 170 will-moore 'Use ome zarr models py' (stage: draft)
2025-04-23 02:06:54,968 [ scc.merge] INFO - PR 169 will-moore 'Remove ome-zarr-py dependency' (stage: draft)
2025-04-23 02:06:54,968 [ scc.merge] INFO - PR 166 will-moore 'Downsample scale option' (stage: draft)
2025-04-23 02:06:54,968 [ scc.merge] INFO - PR 162 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-23 02:06:54,968 [ scc.merge] INFO - PR 123 will-moore 'Support export of Fileset:ID' (exclude comment)
2025-04-23 02:06:54,968 [ scc.merge] INFO Updating 11d3587..7a2c812
2025-04-23 02:06:54,968 [ scc.merge] INFO Previously merged:
2025-04-23 02:06:54,968 [ scc.merge] INFO - PR 168 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-23 02:06:54,968 [ scc.merge] INFO
2025-04-23 02:06:54,969 [ scc.merge] INFO Merged PRs:
2025-04-23 02:06:54,969 [ scc.merge] INFO - PR 147 will-moore 'Name option'
2025-04-23 02:06:54,969 [ scc.merge] INFO
2025-04-23 02:06:54,969 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-23 02:06:54,969 [ scc.merge] INFO - PR 167 dominikl 'Add extinfo command'
2025-04-23 02:06:54,969 [ scc.merge] INFO
2025-04-23 02:06:54,969 [ scc.merge] INFO Repository: ome/omero-figure
2025-04-23 02:06:54,969 [ scc.merge] INFO Excluded PRs:
2025-04-23 02:06:54,969 [ scc.merge] INFO - PR 619 will-moore 'OME-Zarr support' (stage: draft)
2025-04-23 02:06:54,969 [ scc.merge] INFO - PR 543 will-moore 'Plate well labels' (exclude comment)
2025-04-23 02:06:54,969 [ scc.merge] INFO Updating 9cc36cde..4f0362e2
2025-04-23 02:06:54,969 [ scc.merge] INFO Previously merged:
2025-04-23 02:06:54,969 [ scc.merge] INFO - PR 631 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-23 02:06:54,969 [ scc.merge] INFO
2025-04-23 02:06:54,969 [ scc.merge] INFO Merged PRs:
2025-04-23 02:06:54,969 [ scc.merge] INFO - PR 600 Rdornier 'Label on rois'
2025-04-23 02:06:54,969 [ scc.merge] INFO - PR 605 Tom-TBT 'Colorbar feature'
2025-04-23 02:06:54,969 [ scc.merge] INFO - PR 610 will-moore 'Add docs/contributing.rst'
2025-04-23 02:06:54,969 [ scc.merge] INFO - PR 612 will-moore 'Script version'
2025-04-23 02:06:54,969 [ scc.merge] INFO - PR 623 will-moore 'Fix wrapping of label X button. see issues/622'
2025-04-23 02:06:54,969 [ scc.merge] INFO - PR 633 dependabot[bot] 'Bump dompurify from 2.5.4 to 3.2.4'
2025-04-23 02:06:54,969 [ scc.merge] INFO - PR 635 dependabot[bot] 'Bump esbuild and vite'
2025-04-23 02:06:54,969 [ scc.merge] INFO
2025-04-23 02:06:54,969 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-23 02:06:54,969 [ scc.merge] INFO - PR 616 Rdornier 'Fix labels around border'
2025-04-23 02:06:54,969 [ scc.merge] INFO - PR 630 will-moore 'Fix color and position for ALL new panel insets'
2025-04-23 02:06:54,969 [ scc.merge] INFO
2025-04-23 02:06:54,969 [ scc.merge] INFO Repository: ome/omero-fpbioimage
2025-04-23 02:06:54,969 [ scc.merge] INFO Already up to date.
2025-04-23 02:06:54,969 [ scc.merge] INFO
2025-04-23 02:06:54,969 [ scc.merge] INFO Merged PRs:
2025-04-23 02:06:54,969 [ scc.merge] INFO - PR 18 jburel 'default size z value'
2025-04-23 02:06:54,969 [ scc.merge] INFO
2025-04-23 02:06:54,969 [ scc.merge] INFO Repository: ome/omero-gallery
2025-04-23 02:06:54,969 [ scc.merge] INFO Already up to date.
2025-04-23 02:06:54,969 [ scc.merge] INFO
2025-04-23 02:06:54,969 [ scc.merge] INFO Merged PRs:
2025-04-23 02:06:54,969 [ scc.merge] INFO - PR 113 dependabot[bot] 'Bump elliptic from 6.5.4 to 6.6.1'
2025-04-23 02:06:54,969 [ scc.merge] INFO - PR 114 dependabot[bot] 'Bump tar and fsevents'
2025-04-23 02:06:54,969 [ scc.merge] INFO - PR 116 dependabot[bot] 'Bump browserify-sign from 4.0.4 to 4.2.3'
2025-04-23 02:06:54,969 [ scc.merge] INFO - PR 117 dependabot[bot] 'Bump cross-spawn from 6.0.5 to 6.0.6'
2025-04-23 02:06:54,969 [ scc.merge] INFO
2025-04-23 02:06:54,969 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-23 02:06:54,970 [ scc.merge] INFO - PR 115 dependabot[bot] 'Bump micromatch, webpack-cli and webpack'
2025-04-23 02:06:54,970 [ scc.merge] INFO - PR 118 dependabot[bot] 'Bump braces, webpack-cli and webpack'
2025-04-23 02:06:54,970 [ scc.merge] INFO - PR 119 dependabot[bot] 'Bump serialize-javascript and webpack'
2025-04-23 02:06:54,970 [ scc.merge] INFO
2025-04-23 02:06:54,970 [ scc.merge] INFO Repository: ome/omero-iviewer
2025-04-23 02:06:54,970 [ scc.merge] INFO Excluded PRs:
2025-04-23 02:06:54,970 [ scc.merge] INFO - PR 503 will-moore 'Basic working tile-coordinates shown over the image' (stage: draft)
2025-04-23 02:06:54,970 [ scc.merge] INFO - PR 497 will-moore 'Minimal add tags to ROI functionality' (stage: draft)
2025-04-23 02:06:54,970 [ scc.merge] INFO - PR 420 will-moore 'Add release process to README' (exclude comment)
2025-04-23 02:06:54,970 [ scc.merge] INFO - PR 372 will-moore 'viewport URL includes z-plane' (exclude comment)
2025-04-23 02:06:54,970 [ scc.merge] INFO - PR 227 will-moore 'Vectortile investigation' (status: failure)
2025-04-23 02:06:54,970 [ scc.merge] INFO Already up to date.
2025-04-23 02:06:54,970 [ scc.merge] INFO
2025-04-23 02:06:54,970 [ scc.merge] INFO Merged PRs:
2025-04-23 02:06:54,970 [ scc.merge] INFO - PR 460 will-moore 'Channel min spinner fix'
2025-04-23 02:06:54,970 [ scc.merge] INFO - PR 465 will-moore 'Save as Figure'
2025-04-23 02:06:54,970 [ scc.merge] INFO - PR 471 will-moore 'Z projection disabled tooltip'
2025-04-23 02:06:54,970 [ scc.merge] INFO - PR 499 dependabot[bot] 'Bump nanoid and mocha'
2025-04-23 02:06:54,970 [ scc.merge] INFO - PR 506 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-23 02:06:54,970 [ scc.merge] INFO
2025-04-23 02:06:54,970 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-23 02:06:54,970 [ scc.merge] INFO - PR 502 dependabot[bot] 'Bump serialize-javascript and mocha'
2025-04-23 02:06:54,970 [ scc.merge] INFO
2025-04-23 02:06:54,970 [ scc.merge] INFO Repository: ome/omero-mapr
2025-04-23 02:06:54,970 [ scc.merge] INFO Excluded PRs:
2025-04-23 02:06:54,970 [ scc.merge] INFO - PR 79 will-moore 'Right panel title' (exclude comment)
2025-04-23 02:06:54,970 [ scc.merge] INFO Already up to date.
2025-04-23 02:06:54,970 [ scc.merge] INFO
2025-04-23 02:06:54,970 [ scc.merge] INFO Merged PRs:
2025-04-23 02:06:54,970 [ scc.merge] INFO - PR 74 will-moore 'mapr extension of webclient'
2025-04-23 02:06:54,970 [ scc.merge] INFO - PR 94 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-23 02:06:54,970 [ scc.merge] INFO
2025-04-23 02:06:54,970 [ scc.merge] INFO Repository: ome/omero-metadata
2025-04-23 02:06:54,970 [ scc.merge] INFO Updating 3cd120c..55060a2
2025-04-23 02:06:54,970 [ scc.merge] INFO Previously merged:
2025-04-23 02:06:54,970 [ scc.merge] INFO - PR 90 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-23 02:06:54,970 [ scc.merge] INFO
2025-04-23 02:06:54,970 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-23 02:06:54,970 [ scc.merge] INFO - PR 55 kkoz 'Prevent users from creating columns with python keyword names'
2025-04-23 02:06:54,970 [ scc.merge] INFO - PR 64 will-moore 'Support images_by_name for Screen and Plate'
2025-04-23 02:06:54,970 [ scc.merge] INFO
2025-04-23 02:06:54,970 [ scc.merge] INFO Repository: ome/omero-parade
2025-04-23 02:06:54,971 [ scc.merge] INFO Excluded PRs:
2025-04-23 02:06:54,971 [ scc.merge] INFO - PR 139 will-moore 'JS code handles 'tag' node in jsTree' (stage: draft)
2025-04-23 02:06:54,971 [ scc.merge] INFO - PR 94 will-moore 'Move axes state to Layout from Plot' (exclude comment)
2025-04-23 02:06:54,971 [ scc.merge] INFO - PR 86 will-moore 'Support filtering by OMERO.tables on Dataset' (exclude comment)
2025-04-23 02:06:54,971 [ scc.merge] INFO - PR 39 chris-allan 'Expand all for Screens' (exclude comment)
2025-04-23 02:06:54,971 [ scc.merge] INFO Already up to date.
2025-04-23 02:06:54,971 [ scc.merge] INFO
2025-04-23 02:06:54,971 [ scc.merge] INFO Merged PRs:
2025-04-23 02:06:54,971 [ scc.merge] INFO - PR 140 dependabot[bot] 'Bump vite from 4.2.3 to 4.5.9'
2025-04-23 02:06:54,971 [ scc.merge] INFO - PR 141 dependabot[bot] 'Bump axios from 1.6.0 to 1.8.2'
2025-04-23 02:06:54,971 [ scc.merge] INFO - PR 142 will-moore 'Use the release/v1 branch for the PyPA action publishing to PyPI'
2025-04-23 02:06:54,971 [ scc.merge] INFO
2025-04-23 02:06:54,971 [ scc.merge] INFO Repository: ome/omero-prometheus-tools
2025-04-23 02:06:54,971 [ scc.merge] INFO Already up to date.
2025-04-23 02:06:54,971 [ scc.merge] INFO
2025-04-23 02:06:54,971 [ scc.merge] INFO
2025-04-23 02:06:54,971 [ scc.merge] INFO Repository: ome/omero-rois
2025-04-23 02:06:54,971 [ scc.merge] INFO Excluded PRs:
2025-04-23 02:06:54,971 [ scc.merge] INFO - PR 33 jo-mueller 'Add roi to array functions' (user: jo-mueller)
2025-04-23 02:06:54,971 [ scc.merge] INFO - PR 32 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-04-23 02:06:54,971 [ scc.merge] INFO Already up to date.
2025-04-23 02:06:54,971 [ scc.merge] INFO
2025-04-23 02:06:54,971 [ scc.merge] INFO
2025-04-23 02:06:54,971 [ scc.merge] INFO Repository: ome/omero-signup
2025-04-23 02:06:54,971 [ scc.merge] INFO Already up to date.
2025-04-23 02:06:54,971 [ scc.merge] INFO
2025-04-23 02:06:54,971 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-23 02:06:54,971 [ scc.merge] INFO - PR 14 manics 'Add pre-commit (black, flake8)'
2025-04-23 02:06:54,971 [ scc.merge] INFO
2025-04-23 02:06:54,971 [ scc.merge] INFO Repository: openmicroscopy/omero-test-infra
2025-04-23 02:06:54,971 [ scc.merge] INFO Excluded PRs:
2025-04-23 02:06:54,971 [ scc.merge] INFO - PR 75 marimeireles 'Microservices' (user: marimeireles)
2025-04-23 02:06:54,971 [ scc.merge] INFO - PR 74 joshmoore 'Add 'ms' target for ./docker' (status: failure)
2025-04-23 02:06:54,971 [ scc.merge] INFO - PR 73 marimeireles 'Rm python, add miniconda to CI' (user: marimeireles)
2025-04-23 02:06:54,971 [ scc.merge] INFO Already up to date.
2025-04-23 02:06:54,971 [ scc.merge] INFO
2025-04-23 02:06:54,971 [ scc.merge] INFO Merged PRs:
2025-04-23 02:06:54,971 [ scc.merge] INFO - PR 12 joshmoore 'IDR: use downloaded ansible templates & variables to configure infra'
2025-04-23 02:06:54,971 [ scc.merge] INFO - PR 76 will-moore 'Run cli deps'
2025-04-23 02:06:54,971 [ scc.merge] INFO
2025-04-23 02:06:54,971 [ scc.merge] INFO Repository: ome/omero-upload
2025-04-23 02:06:54,971 [ scc.merge] INFO Already up to date.
2025-04-23 02:06:54,971 [ scc.merge] INFO
2025-04-23 02:06:54,972 [ scc.merge] INFO
2025-04-23 02:06:54,972 [ scc.merge] INFO Repository: ome/omero-virtual-microscope
2025-04-23 02:06:54,972 [ scc.merge] INFO Already up to date.
2025-04-23 02:06:54,972 [ scc.merge] INFO
2025-04-23 02:06:54,972 [ scc.merge] INFO Merged PRs:
2025-04-23 02:06:54,972 [ scc.merge] INFO - PR 20 jburel 'Build'
2025-04-23 02:06:54,972 [ scc.merge] INFO
2025-04-23 02:06:54,972 [ scc.merge] INFO Repository: ome/omero-web-zarr
2025-04-23 02:06:54,972 [ scc.merge] INFO Excluded PRs:
2025-04-23 02:06:54,972 [ scc.merge] INFO - PR 18 will-moore 'Build' (status: failure)
2025-04-23 02:06:54,972 [ scc.merge] INFO - PR 16 will-moore 'Vizarr for s3 ngff' (stage: draft)
2025-04-23 02:06:54,972 [ scc.merge] INFO Already up to date.
2025-04-23 02:06:54,972 [ scc.merge] INFO
2025-04-23 02:06:54,972 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-23 02:06:54,972 [ scc.merge] INFO - PR 10 will-moore 'Add Openwith -> itk-vtk viewer'
2025-04-23 02:06:54,972 [ scc.merge] INFO
2025-04-23 02:06:54,972 [ scc.merge] INFO Repository: openmicroscopy/omero-weberror
2025-04-23 02:06:54,972 [ scc.merge] INFO Already up to date.
2025-04-23 02:06:54,972 [ scc.merge] INFO
2025-04-23 02:06:54,972 [ scc.merge] INFO
2025-04-23 02:06:54,972 [ scc.merge] INFO Repository: openmicroscopy/omero-webtest
2025-04-23 02:06:54,972 [ scc.merge] INFO Already up to date.
2025-04-23 02:06:54,972 [ scc.merge] INFO
2025-04-23 02:06:54,972 [ scc.merge] INFO
2025-04-23 02:06:54,972 [ scc.merge] INFO Repository: ome/rOMERO-gateway
2025-04-23 02:06:54,972 [ scc.merge] INFO Already up to date.
2025-04-23 02:06:54,972 [ scc.merge] INFO
2025-04-23 02:06:54,972 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-23 02:06:54,972 [ scc.merge] INFO - PR 100 dominikl 'Run tests properly'
2025-04-23 02:06:54,972 [ scc.merge] INFO
2025-04-23 02:06:54,972 [ scc.merge] INFO Repository: ome/scripts
2025-04-23 02:06:54,972 [ scc.merge] INFO Excluded PRs:
2025-04-23 02:06:54,972 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-04-23 02:06:54,972 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-04-23 02:06:54,972 [ scc.merge] INFO Updating 4b4c755..950b28b
2025-04-23 02:06:54,972 [ scc.merge] INFO Previously merged:
2025-04-23 02:06:54,972 [ scc.merge] INFO - PR 225 will-moore 'Fix param names and assertion texts in tests'
2025-04-23 02:06:54,972 [ scc.merge] INFO
2025-04-23 02:06:54,972 [ scc.merge] INFO Merged PRs:
2025-04-23 02:06:54,972 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-04-23 02:06:54,972 [ scc.merge] INFO
2025-04-23 02:06:54,972 [ scc.merge] INFO Conflicting PRs (not included):
2025-04-23 02:06:54,972 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-04-23 02:06:54,972 [ scc.merge] INFO
2025-04-23 02:06:54,973 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-04-23 02:06:54,973 [ scc.git] DEBUG Calling 'git remote'
2025-04-23 02:06:54,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/minimal-omero-client
2025-04-23 02:06:54,975 [ scc.git] DEBUG Calling 'git remote'
2025-04-23 02:06:54,977 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:54,977 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-duplicate
2025-04-23 02:06:54,977 [ scc.git] DEBUG Calling 'git remote'
2025-04-23 02:06:54,979 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:54,979 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-render
2025-04-23 02:06:54,979 [ scc.git] DEBUG Calling 'git remote'
2025-04-23 02:06:54,981 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:54,981 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-cli-zarr
2025-04-23 02:06:54,981 [ scc.git] DEBUG Calling 'git remote'
2025-04-23 02:06:54,983 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:54,984 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-figure
2025-04-23 02:06:54,984 [ scc.git] DEBUG Calling 'git remote'
2025-04-23 02:06:54,986 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:54,986 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-fpbioimage
2025-04-23 02:06:54,986 [ scc.git] DEBUG Calling 'git remote'
2025-04-23 02:06:54,988 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:54,988 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-gallery
2025-04-23 02:06:54,988 [ scc.git] DEBUG Calling 'git remote'
2025-04-23 02:06:54,990 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:54,990 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-iviewer
2025-04-23 02:06:54,990 [ scc.git] DEBUG Calling 'git remote'
2025-04-23 02:06:54,992 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:54,992 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-mapr
2025-04-23 02:06:54,992 [ scc.git] DEBUG Calling 'git remote'
2025-04-23 02:06:54,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:54,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-metadata
2025-04-23 02:06:54,994 [ scc.git] DEBUG Calling 'git remote'
2025-04-23 02:06:54,996 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:54,996 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-parade
2025-04-23 02:06:54,996 [ scc.git] DEBUG Calling 'git remote'
2025-04-23 02:06:54,998 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:54,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-prometheus-tools
2025-04-23 02:06:54,999 [ scc.git] DEBUG Calling 'git remote'
2025-04-23 02:06:55,001 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:55,001 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-rois
2025-04-23 02:06:55,001 [ scc.git] DEBUG Calling 'git remote'
2025-04-23 02:06:55,003 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:55,003 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-signup
2025-04-23 02:06:55,003 [ scc.git] DEBUG Calling 'git remote'
2025-04-23 02:06:55,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:55,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-test-infra
2025-04-23 02:06:55,005 [ scc.git] DEBUG Calling 'git remote'
2025-04-23 02:06:55,007 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:55,007 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-upload
2025-04-23 02:06:55,007 [ scc.git] DEBUG Calling 'git remote'
2025-04-23 02:06:55,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:55,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-virtual-microscope
2025-04-23 02:06:55,009 [ scc.git] DEBUG Calling 'git remote'
2025-04-23 02:06:55,011 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:55,011 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-web-zarr
2025-04-23 02:06:55,011 [ scc.git] DEBUG Calling 'git remote'
2025-04-23 02:06:55,013 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:55,013 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-weberror
2025-04-23 02:06:55,014 [ scc.git] DEBUG Calling 'git remote'
2025-04-23 02:06:55,016 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:55,016 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/omero-webtest
2025-04-23 02:06:55,016 [ scc.git] DEBUG Calling 'git remote'
2025-04-23 02:06:55,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:55,018 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/rOMERO-gateway
2025-04-23 02:06:55,018 [ scc.git] DEBUG Calling 'git remote'
2025-04-23 02:06:55,020 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
2025-04-23 02:06:55,020 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push/scripts
2025-04-23 02:06:55,020 [ scc.git] DEBUG Calling 'git remote'
2025-04-23 02:06:55,022 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-plugins-push
Update component versions
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/minimal-omero-client/setup.py': [Errno 2] No such file or directory
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/installer.py:27: SetuptoolsDeprecationWarning: setuptools.installer is deprecated. Requirements should be satisfied by a PEP 517 installer.
warnings.warn(
WARNING: The wheel package is not available.
WARNING: The wheel package is not available.
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:530: UserWarning: Normalizing '0.4.2dev0' to '0.4.2.dev0'
warnings.warn(tmpl.format(**locals()))
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-iviewer/setup.py': [Errno 2] No such file or directory
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/omero-test-infra/setup.py': [Errno 2] No such file or directory
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
WARNING: '' not a valid package name; please use only .-separated package names in setup.py
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
/home/omero/workspace/OMERO-plugins-push/build/venv/lib64/python3.11/site-packages/setuptools/dist.py:771: UserWarning: Usage of dash-separated 'description-file' will not be supported in future versions. Please use the underscore name 'description_file' instead
warnings.warn(
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
python3.11: can't open file '/home/omero/workspace/OMERO-plugins-push/rOMERO-gateway/setup.py': [Errno 2] No such file or directory
Updating omero-gateway from 5.10.0 to 5.10.3-SNAPSHOT
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'minimal-omero-client'
Entering 'omero-cli-duplicate'
Entering 'omero-cli-render'
Entering 'omero-cli-zarr'
Entering 'omero-figure'
Entering 'omero-fpbioimage'
Entering 'omero-gallery'
Entering 'omero-iviewer'
Entering 'omero-mapr'
Entering 'omero-metadata'
Entering 'omero-parade'
Entering 'omero-prometheus-tools'
Entering 'omero-rois'
Entering 'omero-signup'
Entering 'omero-test-infra'
Entering 'omero-upload'
Entering 'omero-virtual-microscope'
Entering 'omero-web-zarr'
Entering 'omero-weberror'
Entering 'omero-webtest'
Entering 'rOMERO-gateway'
Entering 'scripts'
Entering 'minimal-omero-client'
[detached HEAD 1b2eb49] 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 1f7b316] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
2025-04-23 02:07:43,036 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-test-infra to /repositories/111908919
Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
2025-04-23 02:07:52,673 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-weberror to /repositories/38373425
Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
2025-04-23 02:07:55,256 [github.Reque] INFO Following Github server redirection from /repos/openmicroscopy/omero-webtest to /repositories/25970383
Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-23 02:08:00,029 [github.Reque] INFO Following Github server redirection from /repos/ome/scripts to /repositories/4865545
2025-04-23 02:08:40,309 [ 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