Console Output
+ export BASE_REPO=omero-python-superbuild.git
+ BASE_REPO=omero-python-superbuild.git
+ export BASE_BRANCH=master
+ BASE_BRANCH=master
+ export VERSION_LOG=/home/omero/workspace/OMERO-python-superbuild-push/build/version.tsv
+ VERSION_LOG=/home/omero/workspace/OMERO-python-superbuild-push/build/version.tsv
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ unset VIRTUAL_ENV_PROMPT
++ '[' '!' nondestructive = nondestructive ']'
++ VIRTUAL_ENV=/home/omero/workspace/OMERO-python-superbuild-push/build/venv
++ export VIRTUAL_ENV
++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ PATH=/home/omero/workspace/OMERO-python-superbuild-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ export PATH
++ '[' -n '' ']'
++ '[' -z '' ']'
++ _OLD_VIRTUAL_PS1=
++ PS1='(venv) '
++ export PS1
++ VIRTUAL_ENV_PROMPT='(venv) '
++ export VIRTUAL_ENV_PROMPT
++ hash -r
+ '[' merge_ci '!=' null ']'
+ export PUSH_BRANCH=merge_ci
+ PUSH_BRANCH=merge_ci
+ '[' null '!=' null ']'
+ export STATUS=success-only 'MERGE_OPTIONS=-vvv --no-ask --reset --comment'
+ STATUS=success-only
+ MERGE_OPTIONS='-vvv --no-ask --reset --comment'
+ bash build/build-infra-master/recursive-merge
Merge base repository (no submodule updates)
2025-10-02 13:35:29,853 [ scc.config] DEBUG Found github.token
2025-10-02 13:35:29,854 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-10-02 13:35:30,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:35:30,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:35:30,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2025-10-02 13:35:30,876 [ scc.gh] DEBUG 4994 remaining from 5000 (Reset at 14:10
2025-10-02 13:35:30,877 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-10-02 13:35:30,879 [ scc.git] DEBUG Check current status
2025-10-02 13:35:30,879 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-10-02 13:35:30,882 [ scc.git] DEBUG b68c3cf Merge pull request #332 from ome/dependabot/submodules/omero-py-780876c
2025-10-02 13:35:30,882 [ scc.git] DEBUG Calling 'git submodule status'
2025-10-02 13:35:30,920 [ scc.git] DEBUG 01fa0c567e5391e5f920bd17d6e9eab210c9df67 omero-dropbox (v5.7.0-7-g01fa0c5)
2025-10-02 13:35:30,923 [ scc.git] DEBUG 6d44f663b2c9680b027c29da4e98430e03403bb1 omero-marshal (v0.9.0-13-g6d44f66)
2025-10-02 13:35:30,930 [ scc.git] DEBUG 780876c5f6b48c327ef1685b377bac2c3cc46797 omero-py (v5.21.1-15-g780876c5)
2025-10-02 13:35:30,934 [ scc.git] DEBUG 03b9116196e1a799dd18a666559613d912be01a5 omero-scripts (v5.9.1-3-g03b9116)
2025-10-02 13:35:30,938 [ scc.git] DEBUG 2a7c4d2e3a98d90b3345039bf70dcc0d96b36135 omero-web (v5.29.2-1-g2a7c4d2e3)
2025-10-02 13:35:30,940 [ scc.config] DEBUG Found remote.origin.url
2025-10-02 13:35:31,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2025-10-02 13:35:31,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-10-02 13:35:32,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-10-02 13:35:32,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-10-02 13:35:33,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-10-02 13:35:33,229 [ scc.git] DEBUG Resetting...
2025-10-02 13:35:33,229 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2025-10-02 13:35:33,233 [ scc.git] DEBUG HEAD is now at b68c3cf Merge pull request #332 from ome/dependabot/submodules/omero-py-780876c
2025-10-02 13:35:33,234 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2025-10-02 13:35:33,283 [ scc.git] DEBUG Check current status
2025-10-02 13:35:33,283 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-10-02 13:35:33,285 [ scc.git] DEBUG b68c3cf Merge pull request #332 from ome/dependabot/submodules/omero-py-780876c
2025-10-02 13:35:33,285 [ scc.git] DEBUG Calling 'git submodule status'
2025-10-02 13:35:33,322 [ scc.git] DEBUG 01fa0c567e5391e5f920bd17d6e9eab210c9df67 omero-dropbox (v5.7.0-7-g01fa0c5)
2025-10-02 13:35:33,325 [ scc.git] DEBUG 6d44f663b2c9680b027c29da4e98430e03403bb1 omero-marshal (v0.9.0-13-g6d44f66)
2025-10-02 13:35:33,332 [ scc.git] DEBUG 780876c5f6b48c327ef1685b377bac2c3cc46797 omero-py (v5.21.1-15-g780876c5)
2025-10-02 13:35:33,336 [ scc.git] DEBUG 03b9116196e1a799dd18a666559613d912be01a5 omero-scripts (v5.9.1-3-g03b9116)
2025-10-02 13:35:33,340 [ scc.git] DEBUG 2a7c4d2e3a98d90b3345039bf70dcc0d96b36135 omero-web (v5.29.2-1-g2a7c4d2e3)
2025-10-02 13:35:33,340 [ scc.merge] INFO Merging Pull Request(s) based on master
2025-10-02 13:35:33,341 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2025-10-02 13:35:33,341 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2025-10-02 13:35:33,341 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2025-10-02 13:35:33,341 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2025-10-02 13:35:33,341 [ scc.repo] DEBUG ## PRs found:
2025-10-02 13:35:33,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2025-10-02 13:35:34,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/334 HTTP/1.1" 200 None
2025-10-02 13:35:34,252 [ scc.repo] DEBUG # ... Include label: dependencies
2025-10-02 13:35:34,252 [ scc.repo] DEBUG - PR 334 dependabot[bot] 'Bump omero-marshal from `6d44f66` to `a3dd99b`'
2025-10-02 13:35:34,253 [ scc.repo] DEBUG ## Branches found:
2025-10-02 13:35:34,253 [ scc.git] DEBUG Get sha1 of %s
2025-10-02 13:35:34,253 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:35:34,255 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-02 13:35:34,257 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-02 13:35:34,257 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-02 13:35:34,260 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-02 13:35:34,262 [ scc.git] DEBUG Already up to date.
2025-10-02 13:35:34,262 [ scc.git] DEBUG Calling 'git fetch origin pull/334/head'
2025-10-02 13:35:34,567 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2025-10-02 13:35:34,567 [ scc.git] DEBUG * branch refs/pull/334/head -> FETCH_HEAD
2025-10-02 13:35:34,572 [ scc.git] DEBUG ## Unique users: []
2025-10-02 13:35:34,572 [ scc.git] DEBUG Get sha1 of %s
2025-10-02 13:35:34,572 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:35:34,574 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e5077065e3781e634471b4828f120f18c16dad1c'
2025-10-02 13:35:34,577 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:35:34,578 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 334 (Bump omero-marshal from `6d44f66` to `a3dd99b`) e5077065e3781e634471b4828f120f18c16dad1c'
2025-10-02 13:35:34,586 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-02 13:35:34,589 [ scc.git] DEBUG omero-marshal | 2 +-
2025-10-02 13:35:34,589 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-10-02 13:35:34,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:35:34,736 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-02 13:35:34,783 [ scc.git] DEBUG Submodule path 'omero-marshal': checked out 'a3dd99b825ad44c9beadc38a8ae8ba94a155f62c'
2025-10-02 13:35:34,783 [ scc.git] DEBUG Get sha1 of %s
2025-10-02 13:35:34,784 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:35:34,785 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-02 13:35:34,815 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fba2f1da710> has no local changes
2025-10-02 13:35:34,815 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone
Repository: ome/omero-python-superbuild
Already up to date.
Merged PRs:
- PR 334 dependabot[bot] 'Bump omero-marshal from `6d44f66` to `a3dd99b`'
Generated by OMERO-python-superbuild-push#536 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/536/)'
2025-10-02 13:35:34,837 [ scc.git] DEBUG [detached HEAD c56d4f1] merge master -Dorg -Snone
2025-10-02 13:35:34,837 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2025-10-02 13:35:34,837 [ scc.merge] INFO Already up to date.
2025-10-02 13:35:34,837 [ scc.merge] INFO
2025-10-02 13:35:34,837 [ scc.merge] INFO Merged PRs:
2025-10-02 13:35:34,837 [ scc.merge] INFO - PR 334 dependabot[bot] 'Bump omero-marshal from `6d44f66` to `a3dd99b`'
2025-10-02 13:35:34,837 [ scc.merge] INFO
2025-10-02 13:35:34,837 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-10-02 13:35:34,837 [ scc.git] DEBUG Calling 'git remote'
Synchronizing submodule url for 'omero-dropbox'
Synchronizing submodule url for 'omero-marshal'
Synchronizing submodule url for 'omero-py'
Synchronizing submodule url for 'omero-scripts'
Synchronizing submodule url for 'omero-web'
Merge all submodules using repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2025-10-02 13:35:36,844 [ scc.config] DEBUG Found github.token
2025-10-02 13:35:36,845 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-10-02 13:35:37,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:35:37,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:35:37,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2025-10-02 13:35:37,839 [ scc.gh] DEBUG 4984 remaining from 5000 (Reset at 14:10
2025-10-02 13:35:37,840 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-10-02 13:35:37,842 [ scc.git] DEBUG Check current status
2025-10-02 13:35:37,842 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-10-02 13:35:37,844 [ scc.git] DEBUG c56d4f1 merge master -Dorg -Snone
2025-10-02 13:35:37,844 [ scc.git] DEBUG Calling 'git submodule status'
2025-10-02 13:35:37,883 [ scc.git] DEBUG 01fa0c567e5391e5f920bd17d6e9eab210c9df67 omero-dropbox (v5.7.0-7-g01fa0c5)
2025-10-02 13:35:37,886 [ scc.git] DEBUG a3dd99b825ad44c9beadc38a8ae8ba94a155f62c omero-marshal (v0.9.0-18-ga3dd99b)
2025-10-02 13:35:37,893 [ scc.git] DEBUG 780876c5f6b48c327ef1685b377bac2c3cc46797 omero-py (v5.21.1-15-g780876c5)
2025-10-02 13:35:37,896 [ scc.git] DEBUG 03b9116196e1a799dd18a666559613d912be01a5 omero-scripts (v5.9.1-3-g03b9116)
2025-10-02 13:35:37,900 [ scc.git] DEBUG 2a7c4d2e3a98d90b3345039bf70dcc0d96b36135 omero-web (v5.29.2-1-g2a7c4d2e3)
2025-10-02 13:35:37,902 [ scc.config] DEBUG Found remote.origin.url
2025-10-02 13:35:37,902 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2025-10-02 13:35:37,904 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2025-10-02 13:35:38,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2025-10-02 13:35:38,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-10-02 13:35:39,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-10-02 13:35:39,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-10-02 13:35:40,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-10-02 13:35:40,141 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-02 13:35:40,185 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2025-10-02 13:35:40,185 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-10-02 13:35:40,187 [ scc.git] DEBUG Check current status
2025-10-02 13:35:40,187 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-10-02 13:35:40,190 [ scc.git] DEBUG 01fa0c5 Merge pull request #24 from jburel/build
2025-10-02 13:35:40,190 [ scc.git] DEBUG Calling 'git submodule status'
2025-10-02 13:35:40,228 [ scc.config] DEBUG Found remote.origin.url
2025-10-02 13:35:40,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2025-10-02 13:35:41,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-10-02 13:35:41,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-10-02 13:35:41,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-10-02 13:35:42,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-10-02 13:35:42,368 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-02 13:35:42,404 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-02 13:35:42,404 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2025-10-02 13:35:42,404 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-10-02 13:35:42,406 [ scc.git] DEBUG Check current status
2025-10-02 13:35:42,406 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-10-02 13:35:42,408 [ scc.git] DEBUG a3dd99b Merge pull request #87 from lubianat/master
2025-10-02 13:35:42,409 [ scc.git] DEBUG Calling 'git submodule status'
2025-10-02 13:35:42,446 [ scc.config] DEBUG Found remote.origin.url
2025-10-02 13:35:42,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2025-10-02 13:35:43,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-10-02 13:35:43,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-10-02 13:35:44,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-10-02 13:35:44,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-10-02 13:35:44,648 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-02 13:35:44,685 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-02 13:35:44,685 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2025-10-02 13:35:44,685 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-10-02 13:35:44,687 [ scc.git] DEBUG Check current status
2025-10-02 13:35:44,687 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-10-02 13:35:44,690 [ scc.git] DEBUG 780876c5 Merge pull request #443 from sbesson/gateway_tests_fake
2025-10-02 13:35:44,690 [ scc.git] DEBUG Calling 'git submodule status'
2025-10-02 13:35:44,726 [ scc.config] DEBUG Found remote.origin.url
2025-10-02 13:35:45,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2025-10-02 13:35:45,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-10-02 13:35:46,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-10-02 13:35:46,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-10-02 13:35:46,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-10-02 13:35:46,965 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-02 13:35:47,001 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-02 13:35:47,002 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2025-10-02 13:35:47,002 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-10-02 13:35:47,004 [ scc.git] DEBUG Check current status
2025-10-02 13:35:47,004 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-10-02 13:35:47,006 [ scc.git] DEBUG 03b9116 Merge pull request #228 from ome/dependabot/github_actions/dot-github/workflows/pypa/gh-action-pypi-publish-1.13.0
2025-10-02 13:35:47,007 [ scc.git] DEBUG Calling 'git submodule status'
2025-10-02 13:35:47,044 [ scc.config] DEBUG Found remote.origin.url
2025-10-02 13:35:47,044 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2025-10-02 13:35:47,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2025-10-02 13:35:47,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-10-02 13:35:48,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-10-02 13:35:48,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-10-02 13:35:49,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-10-02 13:35:49,316 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-02 13:35:49,353 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-02 13:35:49,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2025-10-02 13:35:49,354 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-10-02 13:35:49,356 [ scc.git] DEBUG Check current status
2025-10-02 13:35:49,356 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-10-02 13:35:49,358 [ scc.git] DEBUG 2a7c4d2e3 Bump version: 5.29.2 → 5.29.3.dev0
2025-10-02 13:35:49,358 [ scc.git] DEBUG Calling 'git submodule status'
2025-10-02 13:35:49,395 [ scc.config] DEBUG Found remote.origin.url
2025-10-02 13:35:49,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2025-10-02 13:35:50,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-10-02 13:35:50,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-10-02 13:35:51,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-10-02 13:35:51,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-10-02 13:35:51,653 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-02 13:35:51,690 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-02 13:35:51,690 [ scc.git] DEBUG Resetting...
2025-10-02 13:35:51,690 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2025-10-02 13:35:51,693 [ scc.git] DEBUG HEAD is now at c56d4f1 merge master -Dorg -Snone
2025-10-02 13:35:51,693 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2025-10-02 13:35:51,741 [ scc.git] DEBUG Check current status
2025-10-02 13:35:51,741 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-10-02 13:35:51,742 [ scc.git] DEBUG c56d4f1 merge master -Dorg -Snone
2025-10-02 13:35:51,743 [ scc.git] DEBUG Calling 'git submodule status'
2025-10-02 13:35:51,778 [ scc.git] DEBUG 01fa0c567e5391e5f920bd17d6e9eab210c9df67 omero-dropbox (v5.7.0-7-g01fa0c5)
2025-10-02 13:35:51,781 [ scc.git] DEBUG a3dd99b825ad44c9beadc38a8ae8ba94a155f62c omero-marshal (v0.9.0-18-ga3dd99b)
2025-10-02 13:35:51,789 [ scc.git] DEBUG 780876c5f6b48c327ef1685b377bac2c3cc46797 omero-py (v5.21.1-15-g780876c5)
2025-10-02 13:35:51,792 [ scc.git] DEBUG 03b9116196e1a799dd18a666559613d912be01a5 omero-scripts (v5.9.1-3-g03b9116)
2025-10-02 13:35:51,796 [ scc.git] DEBUG 2a7c4d2e3a98d90b3345039bf70dcc0d96b36135 omero-web (v5.29.2-1-g2a7c4d2e3)
2025-10-02 13:35:51,797 [ scc.merge] INFO Merging Pull Request(s) based on master
2025-10-02 13:35:51,797 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2025-10-02 13:35:51,797 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2025-10-02 13:35:51,797 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2025-10-02 13:35:51,797 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2025-10-02 13:35:51,797 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2025-10-02 13:35:51,797 [ scc.repo] DEBUG ## PRs found:
2025-10-02 13:35:52,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2025-10-02 13:35:52,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/334 HTTP/1.1" 200 None
2025-10-02 13:35:52,760 [ scc.repo] DEBUG # ... Include label: dependencies
2025-10-02 13:35:53,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/e5077065e3781e634471b4828f120f18c16dad1c HTTP/1.1" 200 None
2025-10-02 13:35:53,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/e5077065e3781e634471b4828f120f18c16dad1c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-02 13:35:54,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/e5077065e3781e634471b4828f120f18c16dad1c HTTP/1.1" 200 None
2025-10-02 13:35:54,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/statuses/e5077065e3781e634471b4828f120f18c16dad1c?per_page=1 HTTP/1.1" 200 2
2025-10-02 13:35:54,787 [ scc.repo] DEBUG - PR 334 dependabot[bot] 'Bump omero-marshal from `6d44f66` to `a3dd99b`'
2025-10-02 13:35:54,787 [ scc.repo] DEBUG ## Branches found:
2025-10-02 13:35:54,787 [ scc.git] DEBUG Get sha1 of %s
2025-10-02 13:35:54,787 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:35:54,789 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-02 13:35:54,791 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-02 13:35:54,792 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-02 13:35:54,794 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-02 13:35:54,796 [ scc.git] DEBUG Already up to date.
2025-10-02 13:35:54,796 [ scc.git] DEBUG Calling 'git fetch origin pull/334/head'
2025-10-02 13:35:55,090 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2025-10-02 13:35:55,090 [ scc.git] DEBUG * branch refs/pull/334/head -> FETCH_HEAD
2025-10-02 13:35:55,096 [ scc.git] DEBUG ## Unique users: []
2025-10-02 13:35:55,096 [ scc.git] DEBUG Get sha1 of %s
2025-10-02 13:35:55,096 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:35:55,098 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e5077065e3781e634471b4828f120f18c16dad1c'
2025-10-02 13:35:55,100 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:35:55,102 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 334 (Bump omero-marshal from `6d44f66` to `a3dd99b`) e5077065e3781e634471b4828f120f18c16dad1c'
2025-10-02 13:35:55,104 [ scc.git] DEBUG Already up to date.
2025-10-02 13:35:55,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:35:55,252 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-02 13:35:55,289 [ scc.git] DEBUG Get sha1 of %s
2025-10-02 13:35:55,289 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:35:55,291 [ scc.repo] DEBUG ## PRs found:
2025-10-02 13:35:55,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2025-10-02 13:35:56,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/26 HTTP/1.1" 200 None
2025-10-02 13:35:56,330 [ scc.repo] DEBUG # ... Include label: dependencies
2025-10-02 13:35:56,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/38aa63d7d4014725060e4ecaa159922370485c5a HTTP/1.1" 200 None
2025-10-02 13:35:57,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/38aa63d7d4014725060e4ecaa159922370485c5a/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-02 13:35:57,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/38aa63d7d4014725060e4ecaa159922370485c5a/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-02 13:35:58,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/38aa63d7d4014725060e4ecaa159922370485c5a HTTP/1.1" 200 None
2025-10-02 13:35:58,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/38aa63d7d4014725060e4ecaa159922370485c5a?per_page=1 HTTP/1.1" 200 2
2025-10-02 13:35:58,864 [ scc.repo] DEBUG - PR 26 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-02 13:35:59,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2025-10-02 13:35:59,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2025-10-02 13:36:00,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2025-10-02 13:36:00,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-02 13:36:01,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2025-10-02 13:36:01,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2025-10-02 13:36:01,847 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2025-10-02 13:36:01,847 [ scc.repo] DEBUG ## Branches found:
2025-10-02 13:36:01,847 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2025-10-02 13:36:01,847 [ scc.git] DEBUG Get sha1 of %s
2025-10-02 13:36:01,847 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:36:01,849 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-02 13:36:01,851 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-02 13:36:01,852 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-02 13:36:01,854 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-02 13:36:01,857 [ scc.git] DEBUG Already up to date.
2025-10-02 13:36:01,857 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2025-10-02 13:36:02,164 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2025-10-02 13:36:02,164 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2025-10-02 13:36:02,169 [ scc.git] DEBUG Calling 'git fetch origin pull/26/head'
2025-10-02 13:36:02,462 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2025-10-02 13:36:02,462 [ scc.git] DEBUG * branch refs/pull/26/head -> FETCH_HEAD
2025-10-02 13:36:02,466 [ scc.git] DEBUG ## Unique users: []
2025-10-02 13:36:02,466 [ scc.git] DEBUG Get sha1 of %s
2025-10-02 13:36:02,467 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:36:02,469 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2025-10-02 13:36:02,472 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:36:02,473 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2025-10-02 13:36:02,484 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2025-10-02 13:36:02,485 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2025-10-02 13:36:02,485 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2025-10-02 13:36:02,485 [ scc.git] DEBUG Auto-merging src/fsLists.py
2025-10-02 13:36:02,485 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2025-10-02 13:36:02,485 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2025-10-02 13:36:02,485 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2025-10-02 13:36:02,485 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2025-10-02 13:36:02,485 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2025-10-02 13:36:02,485 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-02 13:36:02,489 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2025-10-02 13:36:02,489 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2025-10-02 13:36:02,489 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2025-10-02 13:36:02,489 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2025-10-02 13:36:02,489 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2025-10-02 13:36:02,489 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2025-10-02 13:36:02,489 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2025-10-02 13:36:02,489 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2025-10-02 13:36:02,489 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2025-10-02 13:36:02,490 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2025-10-02 13:36:02,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:36:02,639 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...38aa63d7d4014725060e4ecaa159922370485c5a'
2025-10-02 13:36:02,642 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:36:02,644 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 26 (Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows) 38aa63d7d4014725060e4ecaa159922370485c5a'
2025-10-02 13:36:02,651 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-02 13:36:02,654 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-10-02 13:36:02,654 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-10-02 13:36:03,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:36:03,062 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-02 13:36:03,097 [ scc.git] DEBUG Get sha1 of %s
2025-10-02 13:36:03,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:36:03,099 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-02 13:36:03,133 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-02 13:36:03,136 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff915a668d0> has no local changes
2025-10-02 13:36:03,136 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-dropbox
Already up to date.
Merged PRs:
- PR 16 joshmoore 'Review all instances of whitelist/blacklist'
- PR 26 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Generated by OMERO-python-superbuild-push#536 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/536/)'
2025-10-02 13:36:03,142 [ scc.git] DEBUG [detached HEAD 4fe1eab] merge master -Dorg -Ssuccess-only
2025-10-02 13:36:03,142 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-02 13:36:03,142 [ scc.repo] DEBUG ## PRs found:
2025-10-02 13:36:03,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2025-10-02 13:36:04,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/84 HTTP/1.1" 200 None
2025-10-02 13:36:04,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/84/comments HTTP/1.1" 200 None
2025-10-02 13:36:05,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2025-10-02 13:36:05,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2025-10-02 13:36:06,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2025-10-02 13:36:06,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-02 13:36:07,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2025-10-02 13:36:07,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2025-10-02 13:36:07,517 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2025-10-02 13:36:08,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2025-10-02 13:36:08,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2025-10-02 13:36:08,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2025-10-02 13:36:09,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2025-10-02 13:36:09,396 [ scc.repo] DEBUG ## Branches found:
2025-10-02 13:36:09,396 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2025-10-02 13:36:09,397 [ scc.git] DEBUG Get sha1 of %s
2025-10-02 13:36:09,397 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:36:09,399 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-02 13:36:09,401 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-02 13:36:09,401 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-02 13:36:09,404 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-02 13:36:09,406 [ scc.git] DEBUG Already up to date.
2025-10-02 13:36:09,406 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2025-10-02 13:36:09,706 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2025-10-02 13:36:09,706 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2025-10-02 13:36:09,710 [ scc.git] DEBUG ## Unique users: []
2025-10-02 13:36:09,710 [ scc.git] DEBUG Get sha1 of %s
2025-10-02 13:36:09,710 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:36:09,713 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2025-10-02 13:36:09,716 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:36:09,718 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2025-10-02 13:36:09,727 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2025-10-02 13:36:09,728 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-02 13:36:09,730 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2025-10-02 13:36:09,730 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2025-10-02 13:36:09,730 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2025-10-02 13:36:09,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:36:09,875 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-02 13:36:09,910 [ scc.git] DEBUG Get sha1 of %s
2025-10-02 13:36:09,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:36:09,912 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-02 13:36:09,948 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-02 13:36:09,951 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff915c2e0d0> has no local changes
2025-10-02 13:36:09,951 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-marshal
Excluded PRs:
- PR 84 joshmoore 'New JSON-LD context-based version' (stage: draft)
- PR 34 chris-allan 'Initial support for Event' (exclude comment)
- PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 will-moore 'Roi encoder allows Shape None'
Generated by OMERO-python-superbuild-push#536 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/536/)'
2025-10-02 13:36:09,957 [ scc.git] DEBUG [detached HEAD 1438223] merge master -Dorg -Ssuccess-only
2025-10-02 13:36:09,957 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-02 13:36:09,957 [ scc.repo] DEBUG ## PRs found:
2025-10-02 13:36:10,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2025-10-02 13:36:11,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/483 HTTP/1.1" 200 None
2025-10-02 13:36:11,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/7948091c18efb9eba4fbd8957c0f1e96db8e5fd2 HTTP/1.1" 200 None
2025-10-02 13:36:12,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/7948091c18efb9eba4fbd8957c0f1e96db8e5fd2/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-02 13:36:12,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/7948091c18efb9eba4fbd8957c0f1e96db8e5fd2/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-02 13:36:13,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/7948091c18efb9eba4fbd8957c0f1e96db8e5fd2 HTTP/1.1" 200 None
2025-10-02 13:36:13,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/7948091c18efb9eba4fbd8957c0f1e96db8e5fd2?per_page=1 HTTP/1.1" 200 None
2025-10-02 13:36:14,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/7948091c18efb9eba4fbd8957c0f1e96db8e5fd2 HTTP/1.1" 200 None
2025-10-02 13:36:14,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/7948091c18efb9eba4fbd8957c0f1e96db8e5fd2/status HTTP/1.1" 200 None
2025-10-02 13:36:14,610 [ scc.repo] DEBUG - PR 483 sbesson 'omero.gateway: deprecate BlitzObjectWrapper.getExternalInfo()'
2025-10-02 13:36:15,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/482 HTTP/1.1" 200 None
2025-10-02 13:36:15,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/69841a510b3f09b50c1a3966c5b99a84e965637b HTTP/1.1" 200 None
2025-10-02 13:36:16,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/69841a510b3f09b50c1a3966c5b99a84e965637b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-02 13:36:16,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/69841a510b3f09b50c1a3966c5b99a84e965637b/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-02 13:36:17,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/69841a510b3f09b50c1a3966c5b99a84e965637b HTTP/1.1" 200 None
2025-10-02 13:36:17,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/69841a510b3f09b50c1a3966c5b99a84e965637b?per_page=1 HTTP/1.1" 200 None
2025-10-02 13:36:18,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/69841a510b3f09b50c1a3966c5b99a84e965637b HTTP/1.1" 200 None
2025-10-02 13:36:18,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/69841a510b3f09b50c1a3966c5b99a84e965637b/status HTTP/1.1" 200 None
2025-10-02 13:36:18,477 [ scc.repo] DEBUG - PR 482 sbesson 'omero.gateway: fix DetailsWrapper.getExternalInfo regression'
2025-10-02 13:36:19,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/478 HTTP/1.1" 200 None
2025-10-02 13:36:19,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/478/comments HTTP/1.1" 200 None
2025-10-02 13:36:19,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/9355ba49bedb4707025593d1092550fa82550d68 HTTP/1.1" 200 None
2025-10-02 13:36:20,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/9355ba49bedb4707025593d1092550fa82550d68/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-02 13:36:20,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/9355ba49bedb4707025593d1092550fa82550d68/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-02 13:36:21,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/9355ba49bedb4707025593d1092550fa82550d68 HTTP/1.1" 200 None
2025-10-02 13:36:21,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/9355ba49bedb4707025593d1092550fa82550d68?per_page=1 HTTP/1.1" 200 None
2025-10-02 13:36:22,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/9355ba49bedb4707025593d1092550fa82550d68 HTTP/1.1" 200 None
2025-10-02 13:36:22,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/9355ba49bedb4707025593d1092550fa82550d68/status HTTP/1.1" 200 None
2025-10-02 13:36:22,832 [ scc.repo] DEBUG - PR 478 chris-allan 'Remove Python 2 compat from gateway utilities and scripts tests'
2025-10-02 13:36:23,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/470 HTTP/1.1" 200 None
2025-10-02 13:36:24,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/470/comments HTTP/1.1" 200 None
2025-10-02 13:36:24,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/459 HTTP/1.1" 200 None
2025-10-02 13:36:25,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/450 HTTP/1.1" 200 None
2025-10-02 13:36:25,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/450/comments HTTP/1.1" 200 None
2025-10-02 13:36:25,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2025-10-02 13:36:26,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2025-10-02 13:36:26,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2025-10-02 13:36:27,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-02 13:36:28,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2025-10-02 13:36:28,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 2
2025-10-02 13:36:28,648 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2025-10-02 13:36:29,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2025-10-02 13:36:29,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2025-10-02 13:36:30,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2025-10-02 13:36:30,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-02 13:36:31,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-02 13:36:31,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2025-10-02 13:36:32,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391/comments HTTP/1.1" 200 None
2025-10-02 13:36:32,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2025-10-02 13:36:33,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-02 13:36:33,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2025-10-02 13:36:34,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 2
2025-10-02 13:36:34,177 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2025-10-02 13:36:34,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2025-10-02 13:36:35,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2025-10-02 13:36:35,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2025-10-02 13:36:36,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-02 13:36:36,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2025-10-02 13:36:37,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 2
2025-10-02 13:36:37,126 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2025-10-02 13:36:37,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2025-10-02 13:36:38,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2025-10-02 13:36:38,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2025-10-02 13:36:39,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2025-10-02 13:36:39,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2025-10-02 13:36:40,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-02 13:36:40,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2025-10-02 13:36:41,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2025-10-02 13:36:41,020 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2025-10-02 13:36:41,021 [ scc.repo] DEBUG ## Branches found:
2025-10-02 13:36:41,021 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2025-10-02 13:36:41,021 [ scc.git] DEBUG Get sha1 of %s
2025-10-02 13:36:41,021 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:36:41,024 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-02 13:36:41,026 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-02 13:36:41,026 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-02 13:36:41,029 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-02 13:36:41,031 [ scc.git] DEBUG Already up to date.
2025-10-02 13:36:41,031 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2025-10-02 13:36:41,350 [ scc.git] DEBUG From https://github.com/ome/omero-py
2025-10-02 13:36:41,351 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2025-10-02 13:36:41,355 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2025-10-02 13:36:41,650 [ scc.git] DEBUG From https://github.com/ome/omero-py
2025-10-02 13:36:41,650 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2025-10-02 13:36:41,654 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2025-10-02 13:36:42,070 [ scc.git] DEBUG From https://github.com/ome/omero-py
2025-10-02 13:36:42,070 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2025-10-02 13:36:42,074 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2025-10-02 13:36:42,410 [ scc.git] DEBUG From https://github.com/ome/omero-py
2025-10-02 13:36:42,410 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2025-10-02 13:36:42,414 [ scc.git] DEBUG Calling 'git fetch origin pull/478/head'
2025-10-02 13:36:42,713 [ scc.git] DEBUG From https://github.com/ome/omero-py
2025-10-02 13:36:42,713 [ scc.git] DEBUG * branch refs/pull/478/head -> FETCH_HEAD
2025-10-02 13:36:42,718 [ scc.git] DEBUG Calling 'git fetch origin pull/482/head'
2025-10-02 13:36:43,114 [ scc.git] DEBUG From https://github.com/ome/omero-py
2025-10-02 13:36:43,114 [ scc.git] DEBUG * branch refs/pull/482/head -> FETCH_HEAD
2025-10-02 13:36:43,118 [ scc.git] DEBUG Calling 'git fetch origin pull/483/head'
2025-10-02 13:36:43,891 [ scc.git] DEBUG From https://github.com/ome/omero-py
2025-10-02 13:36:43,891 [ scc.git] DEBUG * branch refs/pull/483/head -> FETCH_HEAD
2025-10-02 13:36:43,893 [ scc.git] DEBUG ## Unique users: []
2025-10-02 13:36:43,893 [ scc.git] DEBUG Get sha1 of %s
2025-10-02 13:36:43,893 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:36:43,895 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2025-10-02 13:36:43,907 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:36:43,909 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2025-10-02 13:36:43,929 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2025-10-02 13:36:43,929 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2025-10-02 13:36:43,930 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-02 13:36:43,934 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2025-10-02 13:36:43,934 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2025-10-02 13:36:43,934 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2025-10-02 13:36:44,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:36:44,081 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2025-10-02 13:36:44,092 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:36:44,094 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2025-10-02 13:36:44,111 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-02 13:36:44,113 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2025-10-02 13:36:44,113 [ scc.git] DEBUG connect.py | 11 +++++++++++
2025-10-02 13:36:44,113 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2025-10-02 13:36:44,113 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2025-10-02 13:36:44,114 [ scc.git] DEBUG create mode 100644 connect.py
2025-10-02 13:36:44,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:36:44,499 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2025-10-02 13:36:44,511 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:36:44,513 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2025-10-02 13:36:44,532 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2025-10-02 13:36:44,534 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-02 13:36:44,537 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2025-10-02 13:36:44,537 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2025-10-02 13:36:44,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:36:44,923 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2025-10-02 13:36:44,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:36:44,936 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2025-10-02 13:36:44,967 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2025-10-02 13:36:44,967 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-02 13:36:44,974 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2025-10-02 13:36:44,974 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2025-10-02 13:36:45,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:36:45,316 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9355ba49bedb4707025593d1092550fa82550d68'
2025-10-02 13:36:45,327 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:36:45,329 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 478 (Remove Python 2 compat from gateway utilities and scripts tests) 9355ba49bedb4707025593d1092550fa82550d68'
2025-10-02 13:36:45,349 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-02 13:36:45,352 [ scc.git] DEBUG src/omero/gateway/utils.py | 9 +--------
2025-10-02 13:36:45,352 [ scc.git] DEBUG test/unit/scriptstest/test_parse.py | 6 ------
2025-10-02 13:36:45,352 [ scc.git] DEBUG 2 files changed, 1 insertion(+), 14 deletions(-)
2025-10-02 13:36:45,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:36:45,711 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...69841a510b3f09b50c1a3966c5b99a84e965637b'
2025-10-02 13:36:45,722 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:36:45,724 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 482 (omero.gateway: fix DetailsWrapper.getExternalInfo regression) 69841a510b3f09b50c1a3966c5b99a84e965637b'
2025-10-02 13:36:45,754 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2025-10-02 13:36:45,755 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-02 13:36:45,762 [ scc.git] DEBUG src/omero/gateway/__init__.py | 10 ++++++++++
2025-10-02 13:36:45,762 [ scc.git] DEBUG test/unit/test_gateway.py | 29 +++++++++++++++++++++++++++--
2025-10-02 13:36:45,762 [ scc.git] DEBUG 2 files changed, 37 insertions(+), 2 deletions(-)
2025-10-02 13:36:46,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:36:46,106 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7948091c18efb9eba4fbd8957c0f1e96db8e5fd2'
2025-10-02 13:36:46,118 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:36:46,120 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 483 (omero.gateway: deprecate BlitzObjectWrapper.getExternalInfo()) 7948091c18efb9eba4fbd8957c0f1e96db8e5fd2'
2025-10-02 13:36:46,157 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2025-10-02 13:36:46,158 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-02 13:36:46,165 [ scc.git] DEBUG src/omero/gateway/__init__.py | 5 +++++
2025-10-02 13:36:46,165 [ scc.git] DEBUG 1 file changed, 5 insertions(+)
2025-10-02 13:36:46,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:36:46,518 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-02 13:36:46,554 [ scc.git] DEBUG Get sha1 of %s
2025-10-02 13:36:46,554 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:36:46,556 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-02 13:36:46,591 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-02 13:36:46,596 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff915ad1a50> has no local changes
2025-10-02 13:36:46,596 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-py
Excluded PRs:
- PR 470 multimeric 'Faux import' (user: multimeric)
- PR 459 Tom-TBT 'Wrapper improvements for ROIs' (stage: draft)
- PR 450 multimeric 'Add model stubs' (user: multimeric)
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 299 joshmoore 'Add parents and children to omero obj' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 332 jburel 'Build conda'
- PR 391 joshmoore 'Add jstack command'
- PR 408 jburel 'remove deprecated method'
- PR 478 chris-allan 'Remove Python 2 compat from gateway utilities and scripts tests'
- PR 482 sbesson 'omero.gateway: fix DetailsWrapper.getExternalInfo regression'
- PR 483 sbesson 'omero.gateway: deprecate BlitzObjectWrapper.getExternalInfo()'
Generated by OMERO-python-superbuild-push#536 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/536/)'
2025-10-02 13:36:46,604 [ scc.git] DEBUG [detached HEAD eb09ad5a] merge master -Dorg -Ssuccess-only
2025-10-02 13:36:46,604 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-02 13:36:46,604 [ scc.git] INFO Overriding base-branch from master to develop
2025-10-02 13:36:46,604 [ scc.repo] DEBUG ## PRs found:
2025-10-02 13:36:47,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-10-02 13:36:47,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-10-02 13:36:48,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-10-02 13:36:48,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-10-02 13:36:49,145 [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-10-02 13:36:49,667 [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-10-02 13:36:50,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-10-02 13:36:50,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/d8b2bbd6f5066de883a41ba5338662d60472b0d8?per_page=1 HTTP/1.1" 200 2
2025-10-02 13:36:50,555 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-10-02 13:36:51,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-10-02 13:36:51,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-10-02 13:36:52,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-10-02 13:36:52,547 [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-10-02 13:36:53,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-10-02 13:36:53,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2025-10-02 13:36:53,443 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-10-02 13:36:53,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-10-02 13:36:54,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-10-02 13:36:54,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-10-02 13:36:55,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-10-02 13:36:55,491 [ scc.repo] DEBUG ## Branches found:
2025-10-02 13:36:55,491 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2025-10-02 13:36:55,491 [ scc.git] DEBUG Get sha1 of %s
2025-10-02 13:36:55,491 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:36:55,494 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-10-02 13:36:55,496 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-02 13:36:55,496 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-10-02 13:36:55,499 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-10-02 13:36:55,501 [ scc.git] DEBUG Already up to date.
2025-10-02 13:36:55,501 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-10-02 13:36:55,811 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2025-10-02 13:36:55,811 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-10-02 13:36:55,815 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-10-02 13:36:56,103 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2025-10-02 13:36:56,103 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-10-02 13:36:56,107 [ scc.git] DEBUG ## Unique users: []
2025-10-02 13:36:56,107 [ scc.git] DEBUG Get sha1 of %s
2025-10-02 13:36:56,107 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:36:56,110 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-10-02 13:36:56,115 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:36:56,117 [ 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-10-02 13:36:56,126 [ 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-10-02 13:36:56,126 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-10-02 13:36:56,127 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-10-02 13:36:56,129 [ scc.git] DEBUG Calling 'git reset --hard 03b9116196e1a799dd18a666559613d912be01a5'
2025-10-02 13:36:56,132 [ scc.git] DEBUG HEAD is now at 03b9116 Merge pull request #228 from ome/dependabot/github_actions/dot-github/workflows/pypa/gh-action-pypi-publish-1.13.0
2025-10-02 13:36:56,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:36:56,277 [ scc.git] DEBUG Calling 'git merge-base 03b9116196e1a799dd18a666559613d912be01a5 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-10-02 13:36:56,282 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..03b9116196e1a799dd18a666559613d912be01a5'
2025-10-02 13:36:56,285 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#536](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/536/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/536/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-10-02 13:36:56,287 [ scc.config] DEBUG Found github.token
2025-10-02 13:36:56,287 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-10-02 13:36:56,287 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-10-02 13:36:56,291 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:36:56,293 [ 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-10-02 13:36:56,301 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-02 13:36:56,304 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-10-02 13:36:56,304 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-10-02 13:36:56,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:36:56,684 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-02 13:36:56,720 [ scc.git] DEBUG Get sha1 of %s
2025-10-02 13:36:56,720 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:36:56,722 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-02 13:36:56,757 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-02 13:36:56,760 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff915a81950> has no local changes
2025-10-02 13:36:56,760 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-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)
Already up to date.
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-python-superbuild-push#536 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/536/)'
2025-10-02 13:36:56,766 [ scc.git] DEBUG [detached HEAD 6f7e515] merge master -Dorg -Ssuccess-only
2025-10-02 13:36:56,766 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-02 13:36:56,766 [ scc.repo] DEBUG ## PRs found:
2025-10-02 13:36:57,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2025-10-02 13:36:57,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/635 HTTP/1.1" 200 None
2025-10-02 13:36:58,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/635/comments HTTP/1.1" 200 None
2025-10-02 13:36:58,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7446a144da7db207d65373456bf9347cc0a3dadb HTTP/1.1" 200 None
2025-10-02 13:36:59,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7446a144da7db207d65373456bf9347cc0a3dadb/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-02 13:36:59,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7446a144da7db207d65373456bf9347cc0a3dadb/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-02 13:37:00,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7446a144da7db207d65373456bf9347cc0a3dadb HTTP/1.1" 200 None
2025-10-02 13:37:00,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/7446a144da7db207d65373456bf9347cc0a3dadb?per_page=1 HTTP/1.1" 200 None
2025-10-02 13:37:01,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7446a144da7db207d65373456bf9347cc0a3dadb HTTP/1.1" 200 None
2025-10-02 13:37:01,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7446a144da7db207d65373456bf9347cc0a3dadb/status HTTP/1.1" 200 None
2025-10-02 13:37:01,814 [ scc.repo] DEBUG - PR 635 will-moore 'Marshal annotations roi shape'
2025-10-02 13:37:02,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/629 HTTP/1.1" 200 None
2025-10-02 13:37:02,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/628 HTTP/1.1" 200 None
2025-10-02 13:37:03,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/b8c7989c9900270d7cf27523f2649bbb903c7a60 HTTP/1.1" 200 None
2025-10-02 13:37:03,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/b8c7989c9900270d7cf27523f2649bbb903c7a60/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-02 13:37:04,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/b8c7989c9900270d7cf27523f2649bbb903c7a60/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-02 13:37:04,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/b8c7989c9900270d7cf27523f2649bbb903c7a60 HTTP/1.1" 200 None
2025-10-02 13:37:05,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/b8c7989c9900270d7cf27523f2649bbb903c7a60?per_page=1 HTTP/1.1" 200 None
2025-10-02 13:37:05,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/b8c7989c9900270d7cf27523f2649bbb903c7a60 HTTP/1.1" 200 None
2025-10-02 13:37:06,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/b8c7989c9900270d7cf27523f2649bbb903c7a60/status HTTP/1.1" 200 None
2025-10-02 13:37:06,329 [ scc.repo] DEBUG - PR 628 jburel 'Add protocol required since Django4'
2025-10-02 13:37:06,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/619 HTTP/1.1" 200 None
2025-10-02 13:37:07,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6dbfcebfee72e20f36a434fdc8850930d89acdac HTTP/1.1" 200 None
2025-10-02 13:37:07,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6dbfcebfee72e20f36a434fdc8850930d89acdac/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-02 13:37:08,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6dbfcebfee72e20f36a434fdc8850930d89acdac/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-02 13:37:09,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6dbfcebfee72e20f36a434fdc8850930d89acdac HTTP/1.1" 200 None
2025-10-02 13:37:09,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/6dbfcebfee72e20f36a434fdc8850930d89acdac?per_page=1 HTTP/1.1" 200 None
2025-10-02 13:37:10,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6dbfcebfee72e20f36a434fdc8850930d89acdac HTTP/1.1" 200 None
2025-10-02 13:37:10,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6dbfcebfee72e20f36a434fdc8850930d89acdac/status HTTP/1.1" 200 None
2025-10-02 13:37:10,546 [ scc.repo] DEBUG - PR 619 DavidStirling 'Permit subpackages as app plugins'
2025-10-02 13:37:11,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/613 HTTP/1.1" 200 None
2025-10-02 13:37:11,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/613/comments HTTP/1.1" 200 None
2025-10-02 13:37:12,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/189a10758bce63c40d0fe73d490cc489623a6ceb HTTP/1.1" 200 None
2025-10-02 13:37:12,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/189a10758bce63c40d0fe73d490cc489623a6ceb/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-02 13:37:13,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/189a10758bce63c40d0fe73d490cc489623a6ceb/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-02 13:37:13,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/189a10758bce63c40d0fe73d490cc489623a6ceb HTTP/1.1" 200 None
2025-10-02 13:37:14,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/189a10758bce63c40d0fe73d490cc489623a6ceb?per_page=1 HTTP/1.1" 200 None
2025-10-02 13:37:14,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/189a10758bce63c40d0fe73d490cc489623a6ceb HTTP/1.1" 200 None
2025-10-02 13:37:15,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/189a10758bce63c40d0fe73d490cc489623a6ceb/status HTTP/1.1" 200 None
2025-10-02 13:37:15,037 [ scc.repo] DEBUG - PR 613 will-moore 'externalInfo display'
2025-10-02 13:37:15,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/612 HTTP/1.1" 200 None
2025-10-02 13:37:15,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/612/comments HTTP/1.1" 200 None
2025-10-02 13:37:16,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06446bf912b361c22e46c5a0678b3146b91e7e26 HTTP/1.1" 200 None
2025-10-02 13:37:17,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06446bf912b361c22e46c5a0678b3146b91e7e26/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-02 13:37:17,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06446bf912b361c22e46c5a0678b3146b91e7e26/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-02 13:37:18,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06446bf912b361c22e46c5a0678b3146b91e7e26 HTTP/1.1" 200 None
2025-10-02 13:37:18,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/06446bf912b361c22e46c5a0678b3146b91e7e26?per_page=1 HTTP/1.1" 200 None
2025-10-02 13:37:19,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06446bf912b361c22e46c5a0678b3146b91e7e26 HTTP/1.1" 200 None
2025-10-02 13:37:19,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06446bf912b361c22e46c5a0678b3146b91e7e26/status HTTP/1.1" 200 None
2025-10-02 13:37:19,472 [ scc.repo] DEBUG - PR 612 will-moore 'Allow top_links to wrap if too many for space'
2025-10-02 13:37:20,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/604 HTTP/1.1" 200 None
2025-10-02 13:37:20,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/604/comments HTTP/1.1" 200 None
2025-10-02 13:37:21,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/15e1289cb1c1533c8606b9c9f745d1f24575bb7d HTTP/1.1" 200 None
2025-10-02 13:37:21,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/15e1289cb1c1533c8606b9c9f745d1f24575bb7d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-02 13:37:22,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/15e1289cb1c1533c8606b9c9f745d1f24575bb7d/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-02 13:37:22,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/15e1289cb1c1533c8606b9c9f745d1f24575bb7d HTTP/1.1" 200 None
2025-10-02 13:37:23,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/15e1289cb1c1533c8606b9c9f745d1f24575bb7d?per_page=1 HTTP/1.1" 200 None
2025-10-02 13:37:23,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/15e1289cb1c1533c8606b9c9f745d1f24575bb7d HTTP/1.1" 200 None
2025-10-02 13:37:24,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/15e1289cb1c1533c8606b9c9f745d1f24575bb7d/status HTTP/1.1" 200 None
2025-10-02 13:37:24,019 [ scc.repo] DEBUG - PR 604 will-moore 'Right panel perf'
2025-10-02 13:37:24,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/602 HTTP/1.1" 200 None
2025-10-02 13:37:25,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9119372e9fef8cab0e212f02685c8715a3307539 HTTP/1.1" 200 None
2025-10-02 13:37:25,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9119372e9fef8cab0e212f02685c8715a3307539/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-02 13:37:26,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9119372e9fef8cab0e212f02685c8715a3307539/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-02 13:37:26,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9119372e9fef8cab0e212f02685c8715a3307539 HTTP/1.1" 200 None
2025-10-02 13:37:27,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/9119372e9fef8cab0e212f02685c8715a3307539?per_page=1 HTTP/1.1" 200 None
2025-10-02 13:37:27,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9119372e9fef8cab0e212f02685c8715a3307539 HTTP/1.1" 200 None
2025-10-02 13:37:27,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9119372e9fef8cab0e212f02685c8715a3307539/status HTTP/1.1" 200 None
2025-10-02 13:37:27,998 [ scc.repo] DEBUG - PR 602 Tom-TBT 'Inherit all annotations'
2025-10-02 13:37:28,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/596 HTTP/1.1" 200 None
2025-10-02 13:37:28,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/596/comments HTTP/1.1" 200 None
2025-10-02 13:37:29,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2025-10-02 13:37:30,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-02 13:37:30,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-02 13:37:31,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2025-10-02 13:37:31,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/3aae48f586d7b412538a45b34ddc471a26a286e8?per_page=1 HTTP/1.1" 200 None
2025-10-02 13:37:31,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2025-10-02 13:37:32,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8/status HTTP/1.1" 200 None
2025-10-02 13:37:32,360 [ scc.repo] DEBUG - PR 596 sukunis 'Linkify can parse anchor tag'
2025-10-02 13:37:32,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/595 HTTP/1.1" 200 None
2025-10-02 13:37:33,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/595/comments HTTP/1.1" 200 None
2025-10-02 13:37:33,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2025-10-02 13:37:34,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-02 13:37:34,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-02 13:37:35,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2025-10-02 13:37:35,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/30278b64bb39134a3f1101b600d4a82256e6eaeb?per_page=1 HTTP/1.1" 200 None
2025-10-02 13:37:36,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2025-10-02 13:37:36,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb/status HTTP/1.1" 200 None
2025-10-02 13:37:36,686 [ scc.repo] DEBUG - PR 595 sukunis 'linkify supports urls that include {}[] characters'
2025-10-02 13:37:37,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2025-10-02 13:37:37,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2025-10-02 13:37:38,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2025-10-02 13:37:38,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2025-10-02 13:37:39,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2025-10-02 13:37:39,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-02 13:37:40,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2025-10-02 13:37:40,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 2
2025-10-02 13:37:40,529 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2025-10-02 13:37:41,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2025-10-02 13:37:41,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2025-10-02 13:37:42,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2025-10-02 13:37:42,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-02 13:37:43,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2025-10-02 13:37:43,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 2
2025-10-02 13:37:43,456 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2025-10-02 13:37:43,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2025-10-02 13:37:44,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2025-10-02 13:37:44,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2025-10-02 13:37:45,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-02 13:37:45,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2025-10-02 13:37:46,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/06b0073db19eeccb9698860f75639084ad1b1200?per_page=1 HTTP/1.1" 200 2
2025-10-02 13:37:46,320 [ scc.repo] DEBUG - PR 168 stick 'Changes to nginx @maintenance handler'
2025-10-02 13:37:46,320 [ scc.repo] DEBUG ## Branches found:
2025-10-02 13:37:46,320 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2025-10-02 13:37:46,320 [ scc.git] DEBUG Get sha1 of %s
2025-10-02 13:37:46,321 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:37:46,323 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-02 13:37:46,325 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-02 13:37:46,325 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-02 13:37:46,328 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-02 13:37:46,331 [ scc.git] DEBUG Already up to date.
2025-10-02 13:37:46,331 [ scc.git] DEBUG Calling 'git fetch origin pull/168/head'
2025-10-02 13:37:46,646 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-10-02 13:37:46,646 [ scc.git] DEBUG * branch refs/pull/168/head -> FETCH_HEAD
2025-10-02 13:37:46,650 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2025-10-02 13:37:46,944 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-10-02 13:37:46,944 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2025-10-02 13:37:46,948 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2025-10-02 13:37:47,238 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-10-02 13:37:47,238 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2025-10-02 13:37:47,243 [ scc.git] DEBUG Calling 'git fetch origin pull/595/head'
2025-10-02 13:37:47,534 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-10-02 13:37:47,534 [ scc.git] DEBUG * branch refs/pull/595/head -> FETCH_HEAD
2025-10-02 13:37:47,538 [ scc.git] DEBUG Calling 'git fetch origin pull/596/head'
2025-10-02 13:37:47,834 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-10-02 13:37:47,834 [ scc.git] DEBUG * branch refs/pull/596/head -> FETCH_HEAD
2025-10-02 13:37:47,838 [ scc.git] DEBUG Calling 'git fetch origin pull/602/head'
2025-10-02 13:37:48,128 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-10-02 13:37:48,128 [ scc.git] DEBUG * branch refs/pull/602/head -> FETCH_HEAD
2025-10-02 13:37:48,132 [ scc.git] DEBUG Calling 'git fetch origin pull/604/head'
2025-10-02 13:37:48,424 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-10-02 13:37:48,424 [ scc.git] DEBUG * branch refs/pull/604/head -> FETCH_HEAD
2025-10-02 13:37:48,428 [ scc.git] DEBUG Calling 'git fetch origin pull/612/head'
2025-10-02 13:37:48,720 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-10-02 13:37:48,720 [ scc.git] DEBUG * branch refs/pull/612/head -> FETCH_HEAD
2025-10-02 13:37:48,724 [ scc.git] DEBUG Calling 'git fetch origin pull/613/head'
2025-10-02 13:37:49,007 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-10-02 13:37:49,007 [ scc.git] DEBUG * branch refs/pull/613/head -> FETCH_HEAD
2025-10-02 13:37:49,012 [ scc.git] DEBUG Calling 'git fetch origin pull/619/head'
2025-10-02 13:37:49,302 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-10-02 13:37:49,302 [ scc.git] DEBUG * branch refs/pull/619/head -> FETCH_HEAD
2025-10-02 13:37:49,306 [ scc.git] DEBUG Calling 'git fetch origin pull/628/head'
2025-10-02 13:37:49,590 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-10-02 13:37:49,590 [ scc.git] DEBUG * branch refs/pull/628/head -> FETCH_HEAD
2025-10-02 13:37:49,594 [ scc.git] DEBUG Calling 'git fetch origin pull/635/head'
2025-10-02 13:37:49,883 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-10-02 13:37:49,884 [ scc.git] DEBUG * branch refs/pull/635/head -> FETCH_HEAD
2025-10-02 13:37:49,888 [ scc.git] DEBUG ## Unique users: []
2025-10-02 13:37:49,888 [ scc.git] DEBUG Get sha1 of %s
2025-10-02 13:37:49,888 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:37:49,890 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...06b0073db19eeccb9698860f75639084ad1b1200'
2025-10-02 13:37:49,897 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:37:49,899 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 168 (Changes to nginx @maintenance handler) 06b0073db19eeccb9698860f75639084ad1b1200'
2025-10-02 13:37:49,915 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-02 13:37:49,919 [ scc.git] DEBUG omeroweb/templates/nginx-development.conf.template | 2 +-
2025-10-02 13:37:49,919 [ scc.git] DEBUG omeroweb/templates/nginx-location.conf.template | 3 ++-
2025-10-02 13:37:49,919 [ scc.git] DEBUG omeroweb/templates/nginx.conf.template | 2 +-
2025-10-02 13:37:49,919 [ scc.git] DEBUG test/unit/reference_templates/nginx-development-withoptions.conf | 2 +-
2025-10-02 13:37:49,919 [ scc.git] DEBUG test/unit/reference_templates/nginx-development.conf | 2 +-
2025-10-02 13:37:49,919 [ scc.git] DEBUG test/unit/reference_templates/nginx-location-withoptions.conf | 3 ++-
2025-10-02 13:37:49,919 [ scc.git] DEBUG test/unit/reference_templates/nginx-location.conf | 3 ++-
2025-10-02 13:37:49,919 [ scc.git] DEBUG test/unit/reference_templates/nginx-withoptions.conf | 2 +-
2025-10-02 13:37:49,919 [ scc.git] DEBUG test/unit/reference_templates/nginx.conf | 2 +-
2025-10-02 13:37:49,920 [ scc.git] DEBUG test/unit/test_web.py | 1 +
2025-10-02 13:37:49,920 [ scc.git] DEBUG 10 files changed, 13 insertions(+), 9 deletions(-)
2025-10-02 13:37:50,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:37:50,064 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2025-10-02 13:37:50,071 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:37:50,073 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 527 (Add some initial CSP settings to test) 5565fa5d8fdefd1a406a9951f80779817ea35767'
2025-10-02 13:37:50,089 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2025-10-02 13:37:50,089 [ scc.git] DEBUG Auto-merging setup.py
2025-10-02 13:37:50,091 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-02 13:37:50,094 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2025-10-02 13:37:50,094 [ scc.git] DEBUG setup.py | 1 +
2025-10-02 13:37:50,094 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2025-10-02 13:37:50,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:37:50,472 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2025-10-02 13:37:50,479 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:37:50,481 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 534 (get strings from omero.cmd.ERR and omero.CmdError correctly) d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2025-10-02 13:37:50,500 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2025-10-02 13:37:50,500 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2025-10-02 13:37:50,501 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-02 13:37:50,505 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2025-10-02 13:37:50,505 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2025-10-02 13:37:50,505 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2025-10-02 13:37:50,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:37:50,865 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...30278b64bb39134a3f1101b600d4a82256e6eaeb'
2025-10-02 13:37:50,871 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:37:50,874 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 595 (linkify supports urls that include {}[] characters) 30278b64bb39134a3f1101b600d4a82256e6eaeb'
2025-10-02 13:37:50,892 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-02 13:37:50,895 [ scc.git] DEBUG omeroweb/webclient/static/webclient/javascript/ome.webclient.actions.js | 2 +-
2025-10-02 13:37:50,895 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-10-02 13:37:51,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:37:51,256 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3aae48f586d7b412538a45b34ddc471a26a286e8'
2025-10-02 13:37:51,264 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:37:51,266 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 596 (Linkify can parse anchor tag) 3aae48f586d7b412538a45b34ddc471a26a286e8'
2025-10-02 13:37:51,282 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-02 13:37:51,286 [ scc.git] DEBUG .../webclient/javascript/ome.webclient.actions.js | 26 ++++++++++++++++++++--
2025-10-02 13:37:51,286 [ scc.git] DEBUG 1 file changed, 24 insertions(+), 2 deletions(-)
2025-10-02 13:37:51,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:37:51,663 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9119372e9fef8cab0e212f02685c8715a3307539'
2025-10-02 13:37:51,671 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:37:51,672 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 602 (Inherit all annotations) 9119372e9fef8cab0e212f02685c8715a3307539'
2025-10-02 13:37:51,691 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-02 13:37:51,695 [ scc.git] DEBUG omeroweb/webclient/static/webclient/css/dusty.css | 1 -
2025-10-02 13:37:51,695 [ scc.git] DEBUG .../javascript/ome.right_panel_comments_pane.js | 134 +++++++++++++++++++--
2025-10-02 13:37:51,695 [ scc.git] DEBUG .../javascript/ome.right_panel_fileanns_pane.js | 80 +++++++++++-
2025-10-02 13:37:51,695 [ scc.git] DEBUG .../javascript/ome.right_panel_mapanns_pane.js | 6 +-
2025-10-02 13:37:51,696 [ scc.git] DEBUG .../javascript/ome.right_panel_ratings_pane.js | 33 ++++-
2025-10-02 13:37:51,696 [ scc.git] DEBUG .../javascript/ome.right_panel_tags_pane.js | 92 ++++++++++++--
2025-10-02 13:37:51,696 [ scc.git] DEBUG .../webclient/annotations/comments_underscore.html | 58 +++++++--
2025-10-02 13:37:51,696 [ scc.git] DEBUG .../webclient/annotations/fileanns_underscore.html | 81 ++++++++-----
2025-10-02 13:37:51,696 [ scc.git] DEBUG .../webclient/annotations/mapanns_underscore.html | 4 +
2025-10-02 13:37:51,696 [ scc.git] DEBUG .../webclient/annotations/ratings_underscore.html | 4 +-
2025-10-02 13:37:51,696 [ scc.git] DEBUG .../webclient/annotations/tags_underscore.html | 30 +++--
2025-10-02 13:37:51,696 [ scc.git] DEBUG 11 files changed, 447 insertions(+), 76 deletions(-)
2025-10-02 13:37:52,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:37:52,057 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15e1289cb1c1533c8606b9c9f745d1f24575bb7d'
2025-10-02 13:37:52,065 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:37:52,067 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 604 (Right panel perf) 15e1289cb1c1533c8606b9c9f745d1f24575bb7d'
2025-10-02 13:37:52,090 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py
2025-10-02 13:37:52,091 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-02 13:37:52,097 [ scc.git] DEBUG omeroweb/webclient/controller/container.py | 66 ++++++++++------------
2025-10-02 13:37:52,097 [ scc.git] DEBUG .../webclient/annotations/annotations_share.html | 12 +---
2025-10-02 13:37:52,097 [ scc.git] DEBUG omeroweb/webclient/views.py | 51 -----------------
2025-10-02 13:37:52,097 [ scc.git] DEBUG 3 files changed, 31 insertions(+), 98 deletions(-)
2025-10-02 13:37:52,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:37:52,458 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...06446bf912b361c22e46c5a0678b3146b91e7e26'
2025-10-02 13:37:52,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:37:52,467 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 612 (Allow top_links to wrap if too many for space) 06446bf912b361c22e46c5a0678b3146b91e7e26'
2025-10-02 13:37:52,486 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-02 13:37:52,490 [ scc.git] DEBUG .../webgateway/static/webgateway/css/ome.body.css | 2 ++
2025-10-02 13:37:52,490 [ scc.git] DEBUG .../webgateway/static/webgateway/css/ome.header.css | 21 +++++++++++----------
2025-10-02 13:37:52,490 [ scc.git] DEBUG 2 files changed, 13 insertions(+), 10 deletions(-)
2025-10-02 13:37:52,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:37:52,850 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...189a10758bce63c40d0fe73d490cc489623a6ceb'
2025-10-02 13:37:52,858 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:37:52,860 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 613 (externalInfo display) 189a10758bce63c40d0fe73d490cc489623a6ceb'
2025-10-02 13:37:52,880 [ scc.git] DEBUG Auto-merging omeroweb/webclient/static/webclient/css/dusty.css
2025-10-02 13:37:52,881 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-02 13:37:52,885 [ scc.git] DEBUG omeroweb/webclient/static/webclient/css/dusty.css | 2 +-
2025-10-02 13:37:52,885 [ scc.git] DEBUG .../webclient/annotations/includes/toolbar.html | 43 +++++++++++++++++++++-
2025-10-02 13:37:52,886 [ scc.git] DEBUG .../webclient/annotations/metadata_general.html | 31 +++++++++++-----
2025-10-02 13:37:52,886 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 2 +
2025-10-02 13:37:52,886 [ scc.git] DEBUG 4 files changed, 66 insertions(+), 12 deletions(-)
2025-10-02 13:37:53,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:37:53,253 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6dbfcebfee72e20f36a434fdc8850930d89acdac'
2025-10-02 13:37:53,260 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:37:53,262 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 619 (Permit subpackages as app plugins) 6dbfcebfee72e20f36a434fdc8850930d89acdac'
2025-10-02 13:37:53,280 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2025-10-02 13:37:53,281 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-02 13:37:53,285 [ scc.git] DEBUG omeroweb/settings.py | 9 ++++-----
2025-10-02 13:37:53,285 [ scc.git] DEBUG 1 file changed, 4 insertions(+), 5 deletions(-)
2025-10-02 13:37:53,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:37:53,658 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b8c7989c9900270d7cf27523f2649bbb903c7a60'
2025-10-02 13:37:53,665 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:37:53,667 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 628 (Add protocol required since Django4) b8c7989c9900270d7cf27523f2649bbb903c7a60'
2025-10-02 13:37:53,685 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2025-10-02 13:37:53,687 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-02 13:37:53,690 [ scc.git] DEBUG omeroweb/settings.py | 4 ++--
2025-10-02 13:37:53,690 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 2 deletions(-)
2025-10-02 13:37:54,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:37:54,066 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7446a144da7db207d65373456bf9347cc0a3dadb'
2025-10-02 13:37:54,073 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:37:54,075 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 635 (Marshal annotations roi shape) 7446a144da7db207d65373456bf9347cc0a3dadb'
2025-10-02 13:37:54,097 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py
2025-10-02 13:37:54,098 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-02 13:37:54,104 [ scc.git] DEBUG omeroweb/webclient/tree.py | 6 ++++++
2025-10-02 13:37:54,104 [ scc.git] DEBUG omeroweb/webclient/views.py | 6 ++++++
2025-10-02 13:37:54,104 [ scc.git] DEBUG 2 files changed, 12 insertions(+)
2025-10-02 13:37:54,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:37:54,482 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-02 13:37:54,519 [ scc.git] DEBUG Get sha1 of %s
2025-10-02 13:37:54,519 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-02 13:37:54,521 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-02 13:37:54,556 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-02 13:37:54,563 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff915af2f90> has no local changes
2025-10-02 13:37:54,564 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 629 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 535 will-moore 'Initial working browser history' (stage: draft)
Already up to date.
Merged PRs:
- PR 168 stick 'Changes to nginx @maintenance handler'
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 595 sukunis 'linkify supports urls that include {}[] characters'
- PR 596 sukunis 'Linkify can parse anchor tag'
- PR 602 Tom-TBT 'Inherit all annotations'
- PR 604 will-moore 'Right panel perf'
- PR 612 will-moore 'Allow top_links to wrap if too many for space'
- PR 613 will-moore 'externalInfo display'
- PR 619 DavidStirling 'Permit subpackages as app plugins'
- PR 628 jburel 'Add protocol required since Django4'
- PR 635 will-moore 'Marshal annotations roi shape'
Generated by OMERO-python-superbuild-push#536 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/536/)'
2025-10-02 13:37:54,573 [ scc.git] DEBUG [detached HEAD 3caa0c1a4] merge master -Dorg -Ssuccess-only
2025-10-02 13:37:54,573 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-02 13:37:54,573 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-02 13:37:54,616 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2025-10-02 13:37:54,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:37:54,881 [ scc.config] DEBUG Found submodule.omero-marshal.url
2025-10-02 13:37:55,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:37:55,263 [ scc.config] DEBUG Found submodule.omero-py.url
2025-10-02 13:37:55,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:37:55,657 [ scc.config] DEBUG Found submodule.omero-scripts.url
2025-10-02 13:37:56,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:37:56,079 [ scc.config] DEBUG Found submodule.omero-web.url
2025-10-02 13:37:56,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-02 13:37:56,467 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-02 13:37:56,493 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff915a52650> has local changes
2025-10-02 13:37:56,493 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-python-superbuild
Already up to date.
Merged PRs:
- PR 334 dependabot[bot] 'Bump omero-marshal from `6d44f66` to `a3dd99b`'
Repository: ome/omero-dropbox
Already up to date.
Merged PRs:
- PR 16 joshmoore 'Review all instances of whitelist/blacklist'
- PR 26 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
Repository: ome/omero-marshal
Excluded PRs:
- PR 84 joshmoore 'New JSON-LD context-based version' (stage: draft)
- PR 34 chris-allan 'Initial support for Event' (exclude comment)
- PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 will-moore 'Roi encoder allows Shape None'
Repository: ome/omero-py
Excluded PRs:
- PR 470 multimeric 'Faux import' (user: multimeric)
- PR 459 Tom-TBT 'Wrapper improvements for ROIs' (stage: draft)
- PR 450 multimeric 'Add model stubs' (user: multimeric)
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 299 joshmoore 'Add parents and children to omero obj' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 332 jburel 'Build conda'
- PR 391 joshmoore 'Add jstack command'
- PR 408 jburel 'remove deprecated method'
- PR 478 chris-allan 'Remove Python 2 compat from gateway utilities and scripts tests'
- PR 482 sbesson 'omero.gateway: fix DetailsWrapper.getExternalInfo regression'
- PR 483 sbesson 'omero.gateway: deprecate BlitzObjectWrapper.getExternalInfo()'
Repository: ome/omero-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)
Already up to date.
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'
Repository: ome/omero-web
Excluded PRs:
- PR 629 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 535 will-moore 'Initial working browser history' (stage: draft)
Already up to date.
Merged PRs:
- PR 168 stick 'Changes to nginx @maintenance handler'
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 595 sukunis 'linkify supports urls that include {}[] characters'
- PR 596 sukunis 'Linkify can parse anchor tag'
- PR 602 Tom-TBT 'Inherit all annotations'
- PR 604 will-moore 'Right panel perf'
- PR 612 will-moore 'Allow top_links to wrap if too many for space'
- PR 613 will-moore 'externalInfo display'
- PR 619 DavidStirling 'Permit subpackages as app plugins'
- PR 628 jburel 'Add protocol required since Django4'
- PR 635 will-moore 'Marshal annotations roi shape'
Generated by OMERO-python-superbuild-push#536 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/536/)'
2025-10-02 13:37:56,499 [ scc.git] DEBUG [detached HEAD 1277dc5] merge master -Dorg -Ssuccess-only
2025-10-02 13:37:56,499 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2025-10-02 13:37:56,500 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2025-10-02 13:37:56,500 [ scc.merge] INFO Already up to date.
2025-10-02 13:37:56,500 [ scc.merge] INFO
2025-10-02 13:37:56,500 [ scc.merge] INFO Merged PRs:
2025-10-02 13:37:56,500 [ scc.merge] INFO - PR 334 dependabot[bot] 'Bump omero-marshal from `6d44f66` to `a3dd99b`'
2025-10-02 13:37:56,500 [ scc.merge] INFO
2025-10-02 13:37:56,500 [ scc.merge] INFO Repository: ome/omero-dropbox
2025-10-02 13:37:56,500 [ scc.merge] INFO Already up to date.
2025-10-02 13:37:56,500 [ scc.merge] INFO
2025-10-02 13:37:56,500 [ scc.merge] INFO Merged PRs:
2025-10-02 13:37:56,500 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2025-10-02 13:37:56,500 [ scc.merge] INFO - PR 26 dependabot[bot] 'Bump pypa/gh-action-pypi-publish from 1.8.14 to 1.13.0 in /.github/workflows'
2025-10-02 13:37:56,500 [ scc.merge] INFO
2025-10-02 13:37:56,500 [ scc.merge] INFO Repository: ome/omero-marshal
2025-10-02 13:37:56,500 [ scc.merge] INFO Excluded PRs:
2025-10-02 13:37:56,500 [ scc.merge] INFO - PR 84 joshmoore 'New JSON-LD context-based version' (stage: draft)
2025-10-02 13:37:56,500 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2025-10-02 13:37:56,500 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2025-10-02 13:37:56,500 [ scc.merge] INFO Already up to date.
2025-10-02 13:37:56,500 [ scc.merge] INFO
2025-10-02 13:37:56,500 [ scc.merge] INFO Merged PRs:
2025-10-02 13:37:56,500 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2025-10-02 13:37:56,500 [ scc.merge] INFO
2025-10-02 13:37:56,500 [ scc.merge] INFO Repository: ome/omero-py
2025-10-02 13:37:56,500 [ scc.merge] INFO Excluded PRs:
2025-10-02 13:37:56,500 [ scc.merge] INFO - PR 470 multimeric 'Faux import' (user: multimeric)
2025-10-02 13:37:56,500 [ scc.merge] INFO - PR 459 Tom-TBT 'Wrapper improvements for ROIs' (stage: draft)
2025-10-02 13:37:56,500 [ scc.merge] INFO - PR 450 multimeric 'Add model stubs' (user: multimeric)
2025-10-02 13:37:56,500 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2025-10-02 13:37:56,500 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj' (exclude comment)
2025-10-02 13:37:56,500 [ scc.merge] INFO Already up to date.
2025-10-02 13:37:56,500 [ scc.merge] INFO
2025-10-02 13:37:56,500 [ scc.merge] INFO Merged PRs:
2025-10-02 13:37:56,500 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2025-10-02 13:37:56,500 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2025-10-02 13:37:56,500 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2025-10-02 13:37:56,500 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2025-10-02 13:37:56,500 [ scc.merge] INFO - PR 478 chris-allan 'Remove Python 2 compat from gateway utilities and scripts tests'
2025-10-02 13:37:56,500 [ scc.merge] INFO - PR 482 sbesson 'omero.gateway: fix DetailsWrapper.getExternalInfo regression'
2025-10-02 13:37:56,501 [ scc.merge] INFO - PR 483 sbesson 'omero.gateway: deprecate BlitzObjectWrapper.getExternalInfo()'
2025-10-02 13:37:56,501 [ scc.merge] INFO
2025-10-02 13:37:56,501 [ scc.merge] INFO Repository: ome/omero-scripts
2025-10-02 13:37:56,501 [ scc.merge] INFO Excluded PRs:
2025-10-02 13:37:56,501 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-10-02 13:37:56,501 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-10-02 13:37:56,501 [ scc.merge] INFO Already up to date.
2025-10-02 13:37:56,501 [ scc.merge] INFO
2025-10-02 13:37:56,501 [ scc.merge] INFO Merged PRs:
2025-10-02 13:37:56,501 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-10-02 13:37:56,501 [ scc.merge] INFO
2025-10-02 13:37:56,501 [ scc.merge] INFO Conflicting PRs (not included):
2025-10-02 13:37:56,501 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-10-02 13:37:56,501 [ scc.merge] INFO
2025-10-02 13:37:56,501 [ scc.merge] INFO Repository: ome/omero-web
2025-10-02 13:37:56,501 [ scc.merge] INFO Excluded PRs:
2025-10-02 13:37:56,501 [ scc.merge] INFO - PR 629 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-10-02 13:37:56,501 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2025-10-02 13:37:56,501 [ scc.merge] INFO Already up to date.
2025-10-02 13:37:56,501 [ scc.merge] INFO
2025-10-02 13:37:56,501 [ scc.merge] INFO Merged PRs:
2025-10-02 13:37:56,501 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler'
2025-10-02 13:37:56,501 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2025-10-02 13:37:56,501 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2025-10-02 13:37:56,501 [ scc.merge] INFO - PR 595 sukunis 'linkify supports urls that include {}[] characters'
2025-10-02 13:37:56,501 [ scc.merge] INFO - PR 596 sukunis 'Linkify can parse anchor tag'
2025-10-02 13:37:56,501 [ scc.merge] INFO - PR 602 Tom-TBT 'Inherit all annotations'
2025-10-02 13:37:56,501 [ scc.merge] INFO - PR 604 will-moore 'Right panel perf'
2025-10-02 13:37:56,501 [ scc.merge] INFO - PR 612 will-moore 'Allow top_links to wrap if too many for space'
2025-10-02 13:37:56,501 [ scc.merge] INFO - PR 613 will-moore 'externalInfo display'
2025-10-02 13:37:56,501 [ scc.merge] INFO - PR 619 DavidStirling 'Permit subpackages as app plugins'
2025-10-02 13:37:56,501 [ scc.merge] INFO - PR 628 jburel 'Add protocol required since Django4'
2025-10-02 13:37:56,501 [ scc.merge] INFO - PR 635 will-moore 'Marshal annotations roi shape'
2025-10-02 13:37:56,501 [ scc.merge] INFO
2025-10-02 13:37:56,501 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-10-02 13:37:56,501 [ scc.git] DEBUG Calling 'git remote'
2025-10-02 13:37:56,503 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2025-10-02 13:37:56,503 [ scc.git] DEBUG Calling 'git remote'
2025-10-02 13:37:56,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-02 13:37:56,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2025-10-02 13:37:56,505 [ scc.git] DEBUG Calling 'git remote'
2025-10-02 13:37:56,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-02 13:37:56,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2025-10-02 13:37:56,507 [ scc.git] DEBUG Calling 'git remote'
2025-10-02 13:37:56,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-02 13:37:56,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2025-10-02 13:37:56,509 [ scc.git] DEBUG Calling 'git remote'
2025-10-02 13:37:56,511 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-02 13:37:56,511 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2025-10-02 13:37:56,511 [ scc.git] DEBUG Calling 'git remote'
2025-10-02 13:37:56,513 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
Update component versions
error in omero_marshal setup command: 'tests_require' must be a string or list of strings containing valid project/version requirement specifiers; Parse error at "'://githu'": Expected string_end
error in omero_marshal setup command: 'tests_require' must be a string or list of strings containing valid project/version requirement specifiers; Parse error at "'://githu'": Expected string_end
Downloading https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-build/lastSuccessfulBuild/artifact/omero-blitz/build/distributions/omero-blitz-5.8.1-python.zip ...
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 150, in <module>
download_blitz_target()
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 83, in download_blitz_target
resp = urlopen(loc)
^^^^^^^^^^^^
File "/usr/lib64/python3.11/urllib/request.py", line 216, in urlopen
return opener.open(url, data, timeout)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib64/python3.11/urllib/request.py", line 525, in open
response = meth(req, response)
^^^^^^^^^^^^^^^^^^^
File "/usr/lib64/python3.11/urllib/request.py", line 634, in http_response
response = self.parent.error(
^^^^^^^^^^^^^^^^^^
File "/usr/lib64/python3.11/urllib/request.py", line 563, in error
return self._call_chain(*args)
^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib64/python3.11/urllib/request.py", line 496, in _call_chain
result = func(*args)
^^^^^^^^^^^
File "/usr/lib64/python3.11/urllib/request.py", line 643, in http_error_default
raise HTTPError(req.full_url, code, msg, hdrs, fp)
urllib.error.HTTPError: HTTP Error 404: Not Found
Downloading https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-build/lastSuccessfulBuild/artifact/omero-blitz/build/distributions/omero-blitz-5.8.1-python.zip ...
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 150, in <module>
download_blitz_target()
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 83, in download_blitz_target
resp = urlopen(loc)
^^^^^^^^^^^^
File "/usr/lib64/python3.11/urllib/request.py", line 216, in urlopen
return opener.open(url, data, timeout)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib64/python3.11/urllib/request.py", line 525, in open
response = meth(req, response)
^^^^^^^^^^^^^^^^^^^
File "/usr/lib64/python3.11/urllib/request.py", line 634, in http_response
response = self.parent.error(
^^^^^^^^^^^^^^^^^^
File "/usr/lib64/python3.11/urllib/request.py", line 563, in error
return self._call_chain(*args)
^^^^^^^^^^^^^^^^^^^^^^^
File "/usr/lib64/python3.11/urllib/request.py", line 496, in _call_chain
result = func(*args)
^^^^^^^^^^^
File "/usr/lib64/python3.11/urllib/request.py", line 643, in http_error_default
raise HTTPError(req.full_url, code, msg, hdrs, fp)
urllib.error.HTTPError: HTTP Error 404: Not Found
grep: build.gradle: No such file or directory
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:
grep: build.gradle: No such file or directory
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:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'omero-dropbox'
Entering 'omero-marshal'
Entering 'omero-py'
Entering 'omero-scripts'
Entering 'omero-web'
Entering 'omero-dropbox'
HEAD detached from 01fa0c5
nothing to commit, working tree clean
Entering 'omero-marshal'
HEAD detached from a3dd99b
nothing to commit, working tree clean
Entering 'omero-py'
HEAD detached from 780876c5
nothing to commit, working tree clean
Entering 'omero-scripts'
HEAD detached from 03b9116
nothing to commit, working tree clean
Entering 'omero-web'
HEAD detached from 2a7c4d2e3
nothing to commit, working tree clean
HEAD detached from b68c3cf
nothing to commit, working tree clean
2025-10-02 13:38:25,470 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/9161e9ff/images/svgs/logo.svg){kind=logo}
