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-05 00:19:25,522 [ scc.config] DEBUG Found github.token
2025-10-05 00:19:25,523 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-10-05 00:19:25,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:19:26,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:19:26,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2025-10-05 00:19:26,496 [ scc.gh] DEBUG 4378 remaining from 5000 (Reset at 00:10
2025-10-05 00:19:26,496 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-10-05 00:19:26,498 [ scc.git] DEBUG Check current status
2025-10-05 00:19:26,499 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-10-05 00:19:26,501 [ scc.git] DEBUG b68c3cf Merge pull request #332 from ome/dependabot/submodules/omero-py-780876c
2025-10-05 00:19:26,501 [ scc.git] DEBUG Calling 'git submodule status'
2025-10-05 00:19:26,538 [ scc.git] DEBUG 01fa0c567e5391e5f920bd17d6e9eab210c9df67 omero-dropbox (v5.7.0-7-g01fa0c5)
2025-10-05 00:19:26,541 [ scc.git] DEBUG 6d44f663b2c9680b027c29da4e98430e03403bb1 omero-marshal (v0.9.0-13-g6d44f66)
2025-10-05 00:19:26,548 [ scc.git] DEBUG 780876c5f6b48c327ef1685b377bac2c3cc46797 omero-py (v5.21.1-15-g780876c5)
2025-10-05 00:19:26,551 [ scc.git] DEBUG 03b9116196e1a799dd18a666559613d912be01a5 omero-scripts (v5.9.1-3-g03b9116)
2025-10-05 00:19:26,555 [ scc.git] DEBUG 2a7c4d2e3a98d90b3345039bf70dcc0d96b36135 omero-web (v5.29.2-1-g2a7c4d2e3)
2025-10-05 00:19:26,557 [ scc.config] DEBUG Found remote.origin.url
2025-10-05 00:19:26,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2025-10-05 00:19:27,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-10-05 00:19:27,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-10-05 00:19:28,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-10-05 00:19:28,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-10-05 00:19:28,672 [ scc.git] DEBUG Resetting...
2025-10-05 00:19:28,672 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2025-10-05 00:19:28,676 [ scc.git] DEBUG HEAD is now at b68c3cf Merge pull request #332 from ome/dependabot/submodules/omero-py-780876c
2025-10-05 00:19:28,676 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2025-10-05 00:19:28,726 [ scc.git] DEBUG Check current status
2025-10-05 00:19:28,726 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-10-05 00:19:28,728 [ scc.git] DEBUG b68c3cf Merge pull request #332 from ome/dependabot/submodules/omero-py-780876c
2025-10-05 00:19:28,728 [ scc.git] DEBUG Calling 'git submodule status'
2025-10-05 00:19:28,764 [ scc.git] DEBUG 01fa0c567e5391e5f920bd17d6e9eab210c9df67 omero-dropbox (v5.7.0-7-g01fa0c5)
2025-10-05 00:19:28,767 [ scc.git] DEBUG 6d44f663b2c9680b027c29da4e98430e03403bb1 omero-marshal (v0.9.0-13-g6d44f66)
2025-10-05 00:19:28,774 [ scc.git] DEBUG 780876c5f6b48c327ef1685b377bac2c3cc46797 omero-py (v5.21.1-15-g780876c5)
2025-10-05 00:19:28,778 [ scc.git] DEBUG 03b9116196e1a799dd18a666559613d912be01a5 omero-scripts (v5.9.1-3-g03b9116)
2025-10-05 00:19:28,781 [ scc.git] DEBUG 2a7c4d2e3a98d90b3345039bf70dcc0d96b36135 omero-web (v5.29.2-1-g2a7c4d2e3)
2025-10-05 00:19:28,782 [ scc.merge] INFO Merging Pull Request(s) based on master
2025-10-05 00:19:28,782 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2025-10-05 00:19:28,782 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2025-10-05 00:19:28,782 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2025-10-05 00:19:28,782 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2025-10-05 00:19:28,782 [ scc.repo] DEBUG ## PRs found:
2025-10-05 00:19:29,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2025-10-05 00:19:29,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/334 HTTP/1.1" 200 None
2025-10-05 00:19:29,621 [ scc.repo] DEBUG # ... Include label: dependencies
2025-10-05 00:19:29,621 [ scc.repo] DEBUG - PR 334 dependabot[bot] 'Bump omero-marshal from `6d44f66` to `a3dd99b`'
2025-10-05 00:19:29,621 [ scc.repo] DEBUG ## Branches found:
2025-10-05 00:19:29,621 [ scc.git] DEBUG Get sha1 of %s
2025-10-05 00:19:29,621 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:19:29,623 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-05 00:19:29,625 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-05 00:19:29,625 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-05 00:19:29,628 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-05 00:19:29,630 [ scc.git] DEBUG Already up to date.
2025-10-05 00:19:29,630 [ scc.git] DEBUG Calling 'git fetch origin pull/334/head'
2025-10-05 00:19:29,921 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2025-10-05 00:19:29,921 [ scc.git] DEBUG * branch refs/pull/334/head -> FETCH_HEAD
2025-10-05 00:19:29,927 [ scc.git] DEBUG ## Unique users: []
2025-10-05 00:19:29,927 [ scc.git] DEBUG Get sha1 of %s
2025-10-05 00:19:29,927 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:19:29,929 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e5077065e3781e634471b4828f120f18c16dad1c'
2025-10-05 00:19:29,931 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:19:29,933 [ 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-05 00:19:29,940 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-05 00:19:29,943 [ scc.git] DEBUG omero-marshal | 2 +-
2025-10-05 00:19:29,943 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-10-05 00:19:30,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:19:30,077 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-05 00:19:30,123 [ scc.git] DEBUG Submodule path 'omero-marshal': checked out 'a3dd99b825ad44c9beadc38a8ae8ba94a155f62c'
2025-10-05 00:19:30,123 [ scc.git] DEBUG Get sha1 of %s
2025-10-05 00:19:30,123 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:19:30,125 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-05 00:19:30,153 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd7bb81dd50> has no local changes
2025-10-05 00:19:30,154 [ 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#539 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/539/)'
2025-10-05 00:19:30,174 [ scc.git] DEBUG [detached HEAD 14e19b9] merge master -Dorg -Snone
2025-10-05 00:19:30,174 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2025-10-05 00:19:30,174 [ scc.merge] INFO Already up to date.
2025-10-05 00:19:30,174 [ scc.merge] INFO
2025-10-05 00:19:30,174 [ scc.merge] INFO Merged PRs:
2025-10-05 00:19:30,175 [ scc.merge] INFO - PR 334 dependabot[bot] 'Bump omero-marshal from `6d44f66` to `a3dd99b`'
2025-10-05 00:19:30,175 [ scc.merge] INFO
2025-10-05 00:19:30,175 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-10-05 00:19:30,175 [ 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'
Submodule path 'omero-py': checked out '1aad8fffdcd26623c0053eaf3d4b3c7d3b7f3105'
Merge all submodules using repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2025-10-05 00:19:32,069 [ scc.config] DEBUG Found github.token
2025-10-05 00:19:32,070 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2025-10-05 00:19:32,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:19:32,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:19:33,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2025-10-05 00:19:33,032 [ scc.gh] DEBUG 4368 remaining from 5000 (Reset at 00:10
2025-10-05 00:19:33,032 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-10-05 00:19:33,035 [ scc.git] DEBUG Check current status
2025-10-05 00:19:33,035 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-10-05 00:19:33,037 [ scc.git] DEBUG 14e19b9 merge master -Dorg -Snone
2025-10-05 00:19:33,037 [ scc.git] DEBUG Calling 'git submodule status'
2025-10-05 00:19:33,075 [ scc.git] DEBUG 01fa0c567e5391e5f920bd17d6e9eab210c9df67 omero-dropbox (v5.7.0-7-g01fa0c5)
2025-10-05 00:19:33,078 [ scc.git] DEBUG a3dd99b825ad44c9beadc38a8ae8ba94a155f62c omero-marshal (v0.9.0-18-ga3dd99b)
2025-10-05 00:19:33,086 [ scc.git] DEBUG +1aad8fffdcd26623c0053eaf3d4b3c7d3b7f3105 omero-py (v5.21.1-22-g1aad8fff)
2025-10-05 00:19:33,090 [ scc.git] DEBUG 03b9116196e1a799dd18a666559613d912be01a5 omero-scripts (v5.9.1-3-g03b9116)
2025-10-05 00:19:33,093 [ scc.git] DEBUG 2a7c4d2e3a98d90b3345039bf70dcc0d96b36135 omero-web (v5.29.2-1-g2a7c4d2e3)
2025-10-05 00:19:33,096 [ scc.config] DEBUG Found remote.origin.url
2025-10-05 00:19:33,096 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2025-10-05 00:19:33,097 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2025-10-05 00:19:33,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2025-10-05 00:19:34,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-10-05 00:19:34,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-10-05 00:19:34,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-10-05 00:19:35,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-10-05 00:19:35,261 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-05 00:19:35,308 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2025-10-05 00:19:35,308 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-10-05 00:19:35,310 [ scc.git] DEBUG Check current status
2025-10-05 00:19:35,310 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-10-05 00:19:35,312 [ scc.git] DEBUG 01fa0c5 Merge pull request #24 from jburel/build
2025-10-05 00:19:35,312 [ scc.git] DEBUG Calling 'git submodule status'
2025-10-05 00:19:35,348 [ scc.config] DEBUG Found remote.origin.url
2025-10-05 00:19:35,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2025-10-05 00:19:36,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-10-05 00:19:36,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-10-05 00:19:37,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-10-05 00:19:37,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-10-05 00:19:37,431 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-05 00:19:37,466 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-05 00:19:37,467 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2025-10-05 00:19:37,467 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-10-05 00:19:37,469 [ scc.git] DEBUG Check current status
2025-10-05 00:19:37,469 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-10-05 00:19:37,471 [ scc.git] DEBUG a3dd99b Merge pull request #87 from lubianat/master
2025-10-05 00:19:37,471 [ scc.git] DEBUG Calling 'git submodule status'
2025-10-05 00:19:37,507 [ scc.config] DEBUG Found remote.origin.url
2025-10-05 00:19:37,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2025-10-05 00:19:38,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-10-05 00:19:38,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-10-05 00:19:39,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-10-05 00:19:39,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-10-05 00:19:39,630 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-05 00:19:39,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-05 00:19:39,666 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2025-10-05 00:19:39,666 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-10-05 00:19:39,668 [ scc.git] DEBUG Check current status
2025-10-05 00:19:39,668 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-10-05 00:19:39,670 [ scc.git] DEBUG 1aad8fff Merge pull request #482 from sbesson/gateway_getExternalInfo_regression
2025-10-05 00:19:39,670 [ scc.git] DEBUG Calling 'git submodule status'
2025-10-05 00:19:39,706 [ scc.config] DEBUG Found remote.origin.url
2025-10-05 00:19:40,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2025-10-05 00:19:40,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-10-05 00:19:41,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-10-05 00:19:41,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-10-05 00:19:42,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-10-05 00:19:42,050 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-05 00:19:42,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-05 00:19:42,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2025-10-05 00:19:42,086 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-10-05 00:19:42,088 [ scc.git] DEBUG Check current status
2025-10-05 00:19:42,088 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-10-05 00:19:42,091 [ 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-05 00:19:42,091 [ scc.git] DEBUG Calling 'git submodule status'
2025-10-05 00:19:42,127 [ scc.config] DEBUG Found remote.origin.url
2025-10-05 00:19:42,127 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2025-10-05 00:19:42,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2025-10-05 00:19:43,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-10-05 00:19:43,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-10-05 00:19:43,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-10-05 00:19:44,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-10-05 00:19:44,325 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-05 00:19:44,361 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-05 00:19:44,361 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2025-10-05 00:19:44,361 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2025-10-05 00:19:44,363 [ scc.git] DEBUG Check current status
2025-10-05 00:19:44,363 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-10-05 00:19:44,366 [ scc.git] DEBUG 2a7c4d2e3 Bump version: 5.29.2 → 5.29.3.dev0
2025-10-05 00:19:44,366 [ scc.git] DEBUG Calling 'git submodule status'
2025-10-05 00:19:44,403 [ scc.config] DEBUG Found remote.origin.url
2025-10-05 00:19:44,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2025-10-05 00:19:45,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2025-10-05 00:19:45,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2025-10-05 00:19:46,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2025-10-05 00:19:46,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2025-10-05 00:19:46,500 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-05 00:19:46,536 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-05 00:19:46,536 [ scc.git] DEBUG Resetting...
2025-10-05 00:19:46,536 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2025-10-05 00:19:46,540 [ scc.git] DEBUG HEAD is now at 14e19b9 merge master -Dorg -Snone
2025-10-05 00:19:46,540 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2025-10-05 00:19:46,595 [ scc.git] DEBUG Submodule path 'omero-py': checked out '780876c5f6b48c327ef1685b377bac2c3cc46797'
2025-10-05 00:19:46,603 [ scc.git] DEBUG Check current status
2025-10-05 00:19:46,603 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2025-10-05 00:19:46,605 [ scc.git] DEBUG 14e19b9 merge master -Dorg -Snone
2025-10-05 00:19:46,605 [ scc.git] DEBUG Calling 'git submodule status'
2025-10-05 00:19:46,641 [ scc.git] DEBUG 01fa0c567e5391e5f920bd17d6e9eab210c9df67 omero-dropbox (v5.7.0-7-g01fa0c5)
2025-10-05 00:19:46,644 [ scc.git] DEBUG a3dd99b825ad44c9beadc38a8ae8ba94a155f62c omero-marshal (v0.9.0-18-ga3dd99b)
2025-10-05 00:19:46,652 [ scc.git] DEBUG 780876c5f6b48c327ef1685b377bac2c3cc46797 omero-py (v5.21.1-15-g780876c5)
2025-10-05 00:19:46,656 [ scc.git] DEBUG 03b9116196e1a799dd18a666559613d912be01a5 omero-scripts (v5.9.1-3-g03b9116)
2025-10-05 00:19:46,659 [ scc.git] DEBUG 2a7c4d2e3a98d90b3345039bf70dcc0d96b36135 omero-web (v5.29.2-1-g2a7c4d2e3)
2025-10-05 00:19:46,660 [ scc.merge] INFO Merging Pull Request(s) based on master
2025-10-05 00:19:46,660 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2025-10-05 00:19:46,660 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2025-10-05 00:19:46,660 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2025-10-05 00:19:46,660 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2025-10-05 00:19:46,660 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2025-10-05 00:19:46,660 [ scc.repo] DEBUG ## PRs found:
2025-10-05 00:19:47,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2025-10-05 00:19:47,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/334 HTTP/1.1" 200 None
2025-10-05 00:19:47,528 [ scc.repo] DEBUG # ... Include label: dependencies
2025-10-05 00:19:48,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/e5077065e3781e634471b4828f120f18c16dad1c HTTP/1.1" 200 None
2025-10-05 00:19:48,546 [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-05 00:19:49,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/e5077065e3781e634471b4828f120f18c16dad1c HTTP/1.1" 200 None
2025-10-05 00:19:49,507 [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-05 00:19:49,508 [ scc.repo] DEBUG - PR 334 dependabot[bot] 'Bump omero-marshal from `6d44f66` to `a3dd99b`'
2025-10-05 00:19:49,508 [ scc.repo] DEBUG ## Branches found:
2025-10-05 00:19:49,508 [ scc.git] DEBUG Get sha1 of %s
2025-10-05 00:19:49,508 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:19:49,510 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-05 00:19:49,512 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-05 00:19:49,512 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-05 00:19:49,514 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-05 00:19:49,517 [ scc.git] DEBUG Already up to date.
2025-10-05 00:19:49,517 [ scc.git] DEBUG Calling 'git fetch origin pull/334/head'
2025-10-05 00:19:49,808 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2025-10-05 00:19:49,808 [ scc.git] DEBUG * branch refs/pull/334/head -> FETCH_HEAD
2025-10-05 00:19:49,814 [ scc.git] DEBUG ## Unique users: []
2025-10-05 00:19:49,814 [ scc.git] DEBUG Get sha1 of %s
2025-10-05 00:19:49,814 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:19:49,816 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e5077065e3781e634471b4828f120f18c16dad1c'
2025-10-05 00:19:49,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:19:49,820 [ 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-05 00:19:49,822 [ scc.git] DEBUG Already up to date.
2025-10-05 00:19:49,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:19:49,958 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-05 00:19:49,995 [ scc.git] DEBUG Get sha1 of %s
2025-10-05 00:19:49,995 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:19:49,997 [ scc.repo] DEBUG ## PRs found:
2025-10-05 00:19:50,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2025-10-05 00:19:50,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/26 HTTP/1.1" 200 None
2025-10-05 00:19:50,924 [ scc.repo] DEBUG # ... Include label: dependencies
2025-10-05 00:19:51,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/38aa63d7d4014725060e4ecaa159922370485c5a HTTP/1.1" 200 None
2025-10-05 00:19:51,951 [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-05 00:19:52,472 [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-05 00:19:52,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/38aa63d7d4014725060e4ecaa159922370485c5a HTTP/1.1" 200 None
2025-10-05 00:19:53,327 [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-05 00:19:53,327 [ 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-05 00:19:53,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2025-10-05 00:19:54,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2025-10-05 00:19:54,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2025-10-05 00:19:55,215 [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-05 00:19:55,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2025-10-05 00:19:56,119 [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-05 00:19:56,119 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2025-10-05 00:19:56,119 [ scc.repo] DEBUG ## Branches found:
2025-10-05 00:19:56,119 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2025-10-05 00:19:56,119 [ scc.git] DEBUG Get sha1 of %s
2025-10-05 00:19:56,119 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:19:56,122 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-05 00:19:56,124 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-05 00:19:56,124 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-05 00:19:56,126 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-05 00:19:56,129 [ scc.git] DEBUG Already up to date.
2025-10-05 00:19:56,129 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2025-10-05 00:19:56,433 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2025-10-05 00:19:56,433 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2025-10-05 00:19:56,438 [ scc.git] DEBUG Calling 'git fetch origin pull/26/head'
2025-10-05 00:19:56,713 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2025-10-05 00:19:56,713 [ scc.git] DEBUG * branch refs/pull/26/head -> FETCH_HEAD
2025-10-05 00:19:56,718 [ scc.git] DEBUG ## Unique users: []
2025-10-05 00:19:56,718 [ scc.git] DEBUG Get sha1 of %s
2025-10-05 00:19:56,718 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:19:56,720 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2025-10-05 00:19:56,723 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:19:56,725 [ 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-05 00:19:56,736 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2025-10-05 00:19:56,736 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2025-10-05 00:19:56,737 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2025-10-05 00:19:56,737 [ scc.git] DEBUG Auto-merging src/fsLists.py
2025-10-05 00:19:56,737 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2025-10-05 00:19:56,737 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2025-10-05 00:19:56,737 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2025-10-05 00:19:56,737 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2025-10-05 00:19:56,737 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2025-10-05 00:19:56,737 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-05 00:19:56,741 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2025-10-05 00:19:56,741 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2025-10-05 00:19:56,741 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2025-10-05 00:19:56,741 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2025-10-05 00:19:56,741 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2025-10-05 00:19:56,741 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2025-10-05 00:19:56,741 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2025-10-05 00:19:56,741 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2025-10-05 00:19:56,741 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2025-10-05 00:19:56,741 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2025-10-05 00:19:56,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:19:56,887 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...38aa63d7d4014725060e4ecaa159922370485c5a'
2025-10-05 00:19:56,889 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:19:56,892 [ 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-05 00:19:56,899 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-05 00:19:56,901 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 2 +-
2025-10-05 00:19:56,902 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-10-05 00:19:57,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:19:57,287 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-05 00:19:57,322 [ scc.git] DEBUG Get sha1 of %s
2025-10-05 00:19:57,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:19:57,324 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-05 00:19:57,358 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-05 00:19:57,361 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc094260690> has no local changes
2025-10-05 00:19:57,361 [ 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#539 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/539/)'
2025-10-05 00:19:57,366 [ scc.git] DEBUG [detached HEAD 1b5f6fd] merge master -Dorg -Ssuccess-only
2025-10-05 00:19:57,366 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-05 00:19:57,366 [ scc.repo] DEBUG ## PRs found:
2025-10-05 00:19:57,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2025-10-05 00:19:58,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/88 HTTP/1.1" 200 None
2025-10-05 00:19:58,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/88/comments HTTP/1.1" 200 None
2025-10-05 00:19:59,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/cb9e1476df8e5b37dd5959a787cca1e5204c4b15 HTTP/1.1" 200 None
2025-10-05 00:19:59,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/cb9e1476df8e5b37dd5959a787cca1e5204c4b15/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2025-10-05 00:20:00,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/cb9e1476df8e5b37dd5959a787cca1e5204c4b15/check-suites?app_id=15368 HTTP/1.1" 200 None
2025-10-05 00:20:00,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/cb9e1476df8e5b37dd5959a787cca1e5204c4b15 HTTP/1.1" 200 None
2025-10-05 00:20:01,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/cb9e1476df8e5b37dd5959a787cca1e5204c4b15?per_page=1 HTTP/1.1" 200 2
2025-10-05 00:20:01,063 [ scc.repo] DEBUG - PR 88 sbesson 'Fix format of requirement specifiers for Ice wheel packages'
2025-10-05 00:20:01,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/84 HTTP/1.1" 200 None
2025-10-05 00:20:02,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/84/comments HTTP/1.1" 200 None
2025-10-05 00:20:02,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2025-10-05 00:20:02,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2025-10-05 00:20:03,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2025-10-05 00:20:03,923 [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-05 00:20:04,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2025-10-05 00:20:04,857 [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-05 00:20:04,857 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2025-10-05 00:20:05,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2025-10-05 00:20:05,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2025-10-05 00:20:06,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2025-10-05 00:20:06,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2025-10-05 00:20:06,802 [ scc.repo] DEBUG ## Branches found:
2025-10-05 00:20:06,802 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2025-10-05 00:20:06,802 [ scc.git] DEBUG Get sha1 of %s
2025-10-05 00:20:06,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:20:06,805 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-05 00:20:06,807 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-05 00:20:06,807 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-05 00:20:06,810 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-05 00:20:06,812 [ scc.git] DEBUG Already up to date.
2025-10-05 00:20:06,812 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2025-10-05 00:20:07,099 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2025-10-05 00:20:07,099 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2025-10-05 00:20:07,103 [ scc.git] DEBUG Calling 'git fetch origin pull/88/head'
2025-10-05 00:20:07,526 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2025-10-05 00:20:07,526 [ scc.git] DEBUG * branch refs/pull/88/head -> FETCH_HEAD
2025-10-05 00:20:07,528 [ scc.git] DEBUG ## Unique users: []
2025-10-05 00:20:07,528 [ scc.git] DEBUG Get sha1 of %s
2025-10-05 00:20:07,528 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:20:07,530 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2025-10-05 00:20:07,534 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:20:07,536 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2025-10-05 00:20:07,544 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2025-10-05 00:20:07,545 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-05 00:20:07,547 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2025-10-05 00:20:07,547 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2025-10-05 00:20:07,548 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2025-10-05 00:20:07,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:20:07,705 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cb9e1476df8e5b37dd5959a787cca1e5204c4b15'
2025-10-05 00:20:07,708 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:20:07,710 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 88 (Fix format of requirement specifiers for Ice wheel packages) cb9e1476df8e5b37dd5959a787cca1e5204c4b15'
2025-10-05 00:20:07,718 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-05 00:20:07,720 [ scc.git] DEBUG requirements-dev.txt | 4 ----
2025-10-05 00:20:07,720 [ scc.git] DEBUG 1 file changed, 4 deletions(-)
2025-10-05 00:20:08,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:20:08,102 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-05 00:20:08,138 [ scc.git] DEBUG Get sha1 of %s
2025-10-05 00:20:08,138 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:20:08,140 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-05 00:20:08,176 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-05 00:20:08,180 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc094db08d0> has no local changes
2025-10-05 00:20:08,180 [ 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'
- PR 88 sbesson 'Fix format of requirement specifiers for Ice wheel packages'
Generated by OMERO-python-superbuild-push#539 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/539/)'
2025-10-05 00:20:08,185 [ scc.git] DEBUG [detached HEAD c6b1835] merge master -Dorg -Ssuccess-only
2025-10-05 00:20:08,185 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-05 00:20:08,185 [ scc.repo] DEBUG ## PRs found:
2025-10-05 00:20:08,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2025-10-05 00:20:09,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/483 HTTP/1.1" 200 None
2025-10-05 00:20:09,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/7948091c18efb9eba4fbd8957c0f1e96db8e5fd2 HTTP/1.1" 200 None
2025-10-05 00:20:10,152 [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-05 00:20:10,618 [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-05 00:20:11,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/7948091c18efb9eba4fbd8957c0f1e96db8e5fd2 HTTP/1.1" 200 None
2025-10-05 00:20:11,529 [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-05 00:20:11,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/7948091c18efb9eba4fbd8957c0f1e96db8e5fd2 HTTP/1.1" 200 None
2025-10-05 00:20:12,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/7948091c18efb9eba4fbd8957c0f1e96db8e5fd2/status HTTP/1.1" 200 None
2025-10-05 00:20:12,396 [ scc.repo] DEBUG - PR 483 sbesson 'omero.gateway: deprecate BlitzObjectWrapper.getExternalInfo()'
2025-10-05 00:20:12,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/470 HTTP/1.1" 200 None
2025-10-05 00:20:13,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/470/comments HTTP/1.1" 200 None
2025-10-05 00:20:13,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/459 HTTP/1.1" 200 None
2025-10-05 00:20:14,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/450 HTTP/1.1" 200 None
2025-10-05 00:20:14,847 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/450/comments HTTP/1.1" 200 None
2025-10-05 00:20:15,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2025-10-05 00:20:15,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2025-10-05 00:20:16,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2025-10-05 00:20:16,702 [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-05 00:20:17,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2025-10-05 00:20:17,630 [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-05 00:20:17,630 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2025-10-05 00:20:18,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2025-10-05 00:20:18,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2025-10-05 00:20:19,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2025-10-05 00:20:19,951 [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-05 00:20:20,414 [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-05 00:20:20,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2025-10-05 00:20:21,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391/comments HTTP/1.1" 200 None
2025-10-05 00:20:21,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2025-10-05 00:20:22,345 [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-05 00:20:22,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2025-10-05 00:20:23,255 [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-05 00:20:23,256 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2025-10-05 00:20:23,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2025-10-05 00:20:24,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2025-10-05 00:20:24,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2025-10-05 00:20:25,151 [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-05 00:20:25,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2025-10-05 00:20:26,117 [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-05 00:20:26,117 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2025-10-05 00:20:26,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2025-10-05 00:20:27,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2025-10-05 00:20:27,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2025-10-05 00:20:28,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2025-10-05 00:20:28,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2025-10-05 00:20:28,965 [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-05 00:20:29,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2025-10-05 00:20:29,860 [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-05 00:20:29,861 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2025-10-05 00:20:29,861 [ scc.repo] DEBUG ## Branches found:
2025-10-05 00:20:29,861 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2025-10-05 00:20:29,862 [ scc.git] DEBUG Get sha1 of %s
2025-10-05 00:20:29,862 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:20:29,864 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-05 00:20:29,866 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-05 00:20:29,866 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-05 00:20:29,869 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-05 00:20:29,886 [ scc.git] DEBUG Updating 780876c5..1aad8fff
2025-10-05 00:20:30,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls/482 HTTP/1.1" 200 None
2025-10-05 00:20:31,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls/478 HTTP/1.1" 200 None
2025-10-05 00:20:31,128 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2025-10-05 00:20:31,440 [ scc.git] DEBUG From https://github.com/ome/omero-py
2025-10-05 00:20:31,440 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2025-10-05 00:20:31,444 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2025-10-05 00:20:31,735 [ scc.git] DEBUG From https://github.com/ome/omero-py
2025-10-05 00:20:31,735 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2025-10-05 00:20:31,739 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2025-10-05 00:20:32,020 [ scc.git] DEBUG From https://github.com/ome/omero-py
2025-10-05 00:20:32,020 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2025-10-05 00:20:32,025 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2025-10-05 00:20:32,312 [ scc.git] DEBUG From https://github.com/ome/omero-py
2025-10-05 00:20:32,312 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2025-10-05 00:20:32,316 [ scc.git] DEBUG Calling 'git fetch origin pull/483/head'
2025-10-05 00:20:32,594 [ scc.git] DEBUG From https://github.com/ome/omero-py
2025-10-05 00:20:32,594 [ scc.git] DEBUG * branch refs/pull/483/head -> FETCH_HEAD
2025-10-05 00:20:32,598 [ scc.git] DEBUG ## Unique users: []
2025-10-05 00:20:32,599 [ scc.git] DEBUG Get sha1 of %s
2025-10-05 00:20:32,599 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:20:32,601 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2025-10-05 00:20:32,612 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:20:32,614 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2025-10-05 00:20:32,636 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2025-10-05 00:20:32,636 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2025-10-05 00:20:32,637 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-05 00:20:32,641 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2025-10-05 00:20:32,641 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2025-10-05 00:20:32,641 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2025-10-05 00:20:32,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:20:32,791 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2025-10-05 00:20:32,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:20:32,804 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2025-10-05 00:20:32,822 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-05 00:20:32,824 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2025-10-05 00:20:32,824 [ scc.git] DEBUG connect.py | 11 +++++++++++
2025-10-05 00:20:32,824 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2025-10-05 00:20:32,824 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2025-10-05 00:20:32,824 [ scc.git] DEBUG create mode 100644 connect.py
2025-10-05 00:20:33,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:20:33,209 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2025-10-05 00:20:33,220 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:20:33,222 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2025-10-05 00:20:33,242 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2025-10-05 00:20:33,243 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-05 00:20:33,246 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2025-10-05 00:20:33,246 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2025-10-05 00:20:33,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:20:33,607 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2025-10-05 00:20:33,618 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:20:33,620 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2025-10-05 00:20:33,651 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2025-10-05 00:20:33,652 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-05 00:20:33,658 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2025-10-05 00:20:33,658 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2025-10-05 00:20:33,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:20:33,988 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7948091c18efb9eba4fbd8957c0f1e96db8e5fd2'
2025-10-05 00:20:33,999 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:20:34,001 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 483 (omero.gateway: deprecate BlitzObjectWrapper.getExternalInfo()) 7948091c18efb9eba4fbd8957c0f1e96db8e5fd2'
2025-10-05 00:20:34,032 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2025-10-05 00:20:34,033 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-05 00:20:34,039 [ scc.git] DEBUG src/omero/gateway/__init__.py | 5 +++++
2025-10-05 00:20:34,039 [ scc.git] DEBUG 1 file changed, 5 insertions(+)
2025-10-05 00:20:34,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:20:34,376 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-05 00:20:34,413 [ scc.git] DEBUG Get sha1 of %s
2025-10-05 00:20:34,413 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:20:34,415 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-05 00:20:34,450 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-05 00:20:34,455 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc0942d1c10> has no local changes
2025-10-05 00:20:34,455 [ 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)
Updating 780876c5..1aad8fff
Previously merged:
- PR 482 sbesson 'omero.gateway: fix DetailsWrapper.getExternalInfo regression'
- PR 478 chris-allan 'Remove Python 2 compat from gateway utilities and scripts tests'
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 483 sbesson 'omero.gateway: deprecate BlitzObjectWrapper.getExternalInfo()'
Generated by OMERO-python-superbuild-push#539 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/539/)'
2025-10-05 00:20:34,463 [ scc.git] DEBUG [detached HEAD 858ec014] merge master -Dorg -Ssuccess-only
2025-10-05 00:20:34,463 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-05 00:20:34,463 [ scc.git] INFO Overriding base-branch from master to develop
2025-10-05 00:20:34,463 [ scc.repo] DEBUG ## PRs found:
2025-10-05 00:20:35,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2025-10-05 00:20:35,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223 HTTP/1.1" 200 None
2025-10-05 00:20:35,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/223/comments HTTP/1.1" 200 None
2025-10-05 00:20:36,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-10-05 00:20:36,947 [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-05 00:20:37,417 [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-05 00:20:37,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/d8b2bbd6f5066de883a41ba5338662d60472b0d8 HTTP/1.1" 200 None
2025-10-05 00:20:38,279 [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-05 00:20:38,279 [ scc.repo] DEBUG - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-10-05 00:20:38,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2025-10-05 00:20:39,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2025-10-05 00:20:39,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-10-05 00:20:40,155 [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-05 00:20:40,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2025-10-05 00:20:41,099 [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-05 00:20:41,099 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-10-05 00:20:41,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2025-10-05 00:20:42,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2025-10-05 00:20:42,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2025-10-05 00:20:43,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2025-10-05 00:20:43,064 [ scc.repo] DEBUG ## Branches found:
2025-10-05 00:20:43,064 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2025-10-05 00:20:43,064 [ scc.git] DEBUG Get sha1 of %s
2025-10-05 00:20:43,064 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:20:43,067 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2025-10-05 00:20:43,069 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-05 00:20:43,069 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2025-10-05 00:20:43,071 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2025-10-05 00:20:43,074 [ scc.git] DEBUG Already up to date.
2025-10-05 00:20:43,074 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2025-10-05 00:20:43,367 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2025-10-05 00:20:43,367 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2025-10-05 00:20:43,371 [ scc.git] DEBUG Calling 'git fetch origin pull/223/head'
2025-10-05 00:20:43,645 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2025-10-05 00:20:43,645 [ scc.git] DEBUG * branch refs/pull/223/head -> FETCH_HEAD
2025-10-05 00:20:43,649 [ scc.git] DEBUG ## Unique users: []
2025-10-05 00:20:43,649 [ scc.git] DEBUG Get sha1 of %s
2025-10-05 00:20:43,650 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:20:43,652 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-10-05 00:20:43,657 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:20:43,659 [ 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-05 00:20:43,668 [ 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-05 00:20:43,669 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2025-10-05 00:20:43,669 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2025-10-05 00:20:43,671 [ scc.git] DEBUG Calling 'git reset --hard 03b9116196e1a799dd18a666559613d912be01a5'
2025-10-05 00:20:43,675 [ 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-05 00:20:43,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:20:43,802 [ scc.git] DEBUG Calling 'git merge-base 03b9116196e1a799dd18a666559613d912be01a5 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2025-10-05 00:20:43,807 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..03b9116196e1a799dd18a666559613d912be01a5'
2025-10-05 00:20:43,811 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#539](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/539/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/539/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2025-10-05 00:20:43,813 [ scc.config] DEBUG Found github.token
2025-10-05 00:20:43,813 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2025-10-05 00:20:43,813 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d8b2bbd6f5066de883a41ba5338662d60472b0d8'
2025-10-05 00:20:43,817 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:20:43,819 [ 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-05 00:20:43,827 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-05 00:20:43,830 [ scc.git] DEBUG omero/export_scripts/Batch_ROI_Export.py | 9 ++++++++-
2025-10-05 00:20:43,830 [ scc.git] DEBUG 1 file changed, 8 insertions(+), 1 deletion(-)
2025-10-05 00:20:44,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:20:44,197 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-05 00:20:44,234 [ scc.git] DEBUG Get sha1 of %s
2025-10-05 00:20:44,234 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:20:44,236 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-05 00:20:44,271 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-05 00:20:44,274 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc09429c190> has no local changes
2025-10-05 00:20:44,274 [ 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#539 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/539/)'
2025-10-05 00:20:44,280 [ scc.git] DEBUG [detached HEAD c590b47] merge master -Dorg -Ssuccess-only
2025-10-05 00:20:44,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-05 00:20:44,280 [ scc.repo] DEBUG ## PRs found:
2025-10-05 00:20:44,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2025-10-05 00:20:45,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/635 HTTP/1.1" 200 None
2025-10-05 00:20:45,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/635/comments HTTP/1.1" 200 None
2025-10-05 00:20:46,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7446a144da7db207d65373456bf9347cc0a3dadb HTTP/1.1" 200 None
2025-10-05 00:20:46,908 [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-05 00:20:47,367 [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-05 00:20:47,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7446a144da7db207d65373456bf9347cc0a3dadb HTTP/1.1" 200 None
2025-10-05 00:20:48,288 [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-05 00:20:48,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7446a144da7db207d65373456bf9347cc0a3dadb HTTP/1.1" 200 None
2025-10-05 00:20:49,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/7446a144da7db207d65373456bf9347cc0a3dadb/status HTTP/1.1" 200 None
2025-10-05 00:20:49,242 [ scc.repo] DEBUG - PR 635 will-moore 'Marshal annotations roi shape'
2025-10-05 00:20:49,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/629 HTTP/1.1" 200 None
2025-10-05 00:20:50,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/628 HTTP/1.1" 200 None
2025-10-05 00:20:50,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/b8c7989c9900270d7cf27523f2649bbb903c7a60 HTTP/1.1" 200 None
2025-10-05 00:20:51,117 [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-05 00:20:51,609 [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-05 00:20:52,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/b8c7989c9900270d7cf27523f2649bbb903c7a60 HTTP/1.1" 200 None
2025-10-05 00:20:52,530 [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-05 00:20:52,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/b8c7989c9900270d7cf27523f2649bbb903c7a60 HTTP/1.1" 200 None
2025-10-05 00:20:53,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/b8c7989c9900270d7cf27523f2649bbb903c7a60/status HTTP/1.1" 200 None
2025-10-05 00:20:53,411 [ scc.repo] DEBUG - PR 628 jburel 'Add protocol required since Django4'
2025-10-05 00:20:53,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/619 HTTP/1.1" 200 None
2025-10-05 00:20:54,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6dbfcebfee72e20f36a434fdc8850930d89acdac HTTP/1.1" 200 None
2025-10-05 00:20:54,890 [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-05 00:20:55,393 [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-05 00:20:55,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6dbfcebfee72e20f36a434fdc8850930d89acdac HTTP/1.1" 200 None
2025-10-05 00:20:56,386 [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-05 00:20:56,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6dbfcebfee72e20f36a434fdc8850930d89acdac HTTP/1.1" 200 None
2025-10-05 00:20:57,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/6dbfcebfee72e20f36a434fdc8850930d89acdac/status HTTP/1.1" 200 None
2025-10-05 00:20:57,273 [ scc.repo] DEBUG - PR 619 DavidStirling 'Permit subpackages as app plugins'
2025-10-05 00:20:57,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/613 HTTP/1.1" 200 None
2025-10-05 00:20:58,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/613/comments HTTP/1.1" 200 None
2025-10-05 00:20:58,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/189a10758bce63c40d0fe73d490cc489623a6ceb HTTP/1.1" 200 None
2025-10-05 00:20:59,190 [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-05 00:20:59,798 [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-05 00:21:00,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/189a10758bce63c40d0fe73d490cc489623a6ceb HTTP/1.1" 200 None
2025-10-05 00:21:00,760 [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-05 00:21:01,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/189a10758bce63c40d0fe73d490cc489623a6ceb HTTP/1.1" 200 None
2025-10-05 00:21:01,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/189a10758bce63c40d0fe73d490cc489623a6ceb/status HTTP/1.1" 200 None
2025-10-05 00:21:01,700 [ scc.repo] DEBUG - PR 613 will-moore 'externalInfo display'
2025-10-05 00:21:02,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/612 HTTP/1.1" 200 None
2025-10-05 00:21:02,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/612/comments HTTP/1.1" 200 None
2025-10-05 00:21:03,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06446bf912b361c22e46c5a0678b3146b91e7e26 HTTP/1.1" 200 None
2025-10-05 00:21:03,624 [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-05 00:21:04,150 [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-05 00:21:04,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06446bf912b361c22e46c5a0678b3146b91e7e26 HTTP/1.1" 200 None
2025-10-05 00:21:05,020 [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-05 00:21:05,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06446bf912b361c22e46c5a0678b3146b91e7e26 HTTP/1.1" 200 None
2025-10-05 00:21:05,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06446bf912b361c22e46c5a0678b3146b91e7e26/status HTTP/1.1" 200 None
2025-10-05 00:21:05,843 [ scc.repo] DEBUG - PR 612 will-moore 'Allow top_links to wrap if too many for space'
2025-10-05 00:21:06,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/604 HTTP/1.1" 200 None
2025-10-05 00:21:06,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/604/comments HTTP/1.1" 200 None
2025-10-05 00:21:07,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/15e1289cb1c1533c8606b9c9f745d1f24575bb7d HTTP/1.1" 200 None
2025-10-05 00:21:07,745 [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-05 00:21:08,231 [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-05 00:21:08,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/15e1289cb1c1533c8606b9c9f745d1f24575bb7d HTTP/1.1" 200 None
2025-10-05 00:21:09,178 [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-05 00:21:09,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/15e1289cb1c1533c8606b9c9f745d1f24575bb7d HTTP/1.1" 200 None
2025-10-05 00:21:10,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/15e1289cb1c1533c8606b9c9f745d1f24575bb7d/status HTTP/1.1" 200 None
2025-10-05 00:21:10,053 [ scc.repo] DEBUG - PR 604 will-moore 'Right panel perf'
2025-10-05 00:21:10,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/602 HTTP/1.1" 200 None
2025-10-05 00:21:11,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9119372e9fef8cab0e212f02685c8715a3307539 HTTP/1.1" 200 None
2025-10-05 00:21:11,610 [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-05 00:21:12,091 [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-05 00:21:12,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9119372e9fef8cab0e212f02685c8715a3307539 HTTP/1.1" 200 None
2025-10-05 00:21:13,015 [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-05 00:21:13,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9119372e9fef8cab0e212f02685c8715a3307539 HTTP/1.1" 200 None
2025-10-05 00:21:13,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9119372e9fef8cab0e212f02685c8715a3307539/status HTTP/1.1" 200 None
2025-10-05 00:21:13,945 [ scc.repo] DEBUG - PR 602 Tom-TBT 'Inherit all annotations'
2025-10-05 00:21:14,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/596 HTTP/1.1" 200 None
2025-10-05 00:21:14,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/596/comments HTTP/1.1" 200 None
2025-10-05 00:21:15,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2025-10-05 00:21:15,842 [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-05 00:21:16,310 [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-05 00:21:16,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2025-10-05 00:21:17,176 [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-05 00:21:17,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8 HTTP/1.1" 200 None
2025-10-05 00:21:18,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3aae48f586d7b412538a45b34ddc471a26a286e8/status HTTP/1.1" 200 None
2025-10-05 00:21:18,038 [ scc.repo] DEBUG - PR 596 sukunis 'Linkify can parse anchor tag'
2025-10-05 00:21:18,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/595 HTTP/1.1" 200 None
2025-10-05 00:21:18,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/595/comments HTTP/1.1" 200 None
2025-10-05 00:21:19,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2025-10-05 00:21:19,933 [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-05 00:21:20,453 [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-05 00:21:20,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2025-10-05 00:21:21,436 [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-05 00:21:21,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb HTTP/1.1" 200 None
2025-10-05 00:21:22,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/30278b64bb39134a3f1101b600d4a82256e6eaeb/status HTTP/1.1" 200 None
2025-10-05 00:21:22,370 [ scc.repo] DEBUG - PR 595 sukunis 'linkify supports urls that include {}[] characters'
2025-10-05 00:21:22,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2025-10-05 00:21:23,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2025-10-05 00:21:23,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2025-10-05 00:21:24,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2025-10-05 00:21:24,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2025-10-05 00:21:25,305 [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-05 00:21:25,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2025-10-05 00:21:26,170 [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-05 00:21:26,171 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2025-10-05 00:21:26,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2025-10-05 00:21:27,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2025-10-05 00:21:27,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2025-10-05 00:21:28,068 [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-05 00:21:28,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2025-10-05 00:21:28,901 [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-05 00:21:28,901 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2025-10-05 00:21:29,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2025-10-05 00:21:29,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2025-10-05 00:21:30,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2025-10-05 00:21:30,755 [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-05 00:21:31,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2025-10-05 00:21:31,585 [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-05 00:21:31,585 [ scc.repo] DEBUG - PR 168 stick 'Changes to nginx @maintenance handler'
2025-10-05 00:21:31,585 [ scc.repo] DEBUG ## Branches found:
2025-10-05 00:21:31,586 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2025-10-05 00:21:31,586 [ scc.git] DEBUG Get sha1 of %s
2025-10-05 00:21:31,586 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:21:31,588 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2025-10-05 00:21:31,590 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2025-10-05 00:21:31,590 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2025-10-05 00:21:31,593 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2025-10-05 00:21:31,596 [ scc.git] DEBUG Already up to date.
2025-10-05 00:21:31,596 [ scc.git] DEBUG Calling 'git fetch origin pull/168/head'
2025-10-05 00:21:31,903 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-10-05 00:21:31,903 [ scc.git] DEBUG * branch refs/pull/168/head -> FETCH_HEAD
2025-10-05 00:21:31,907 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2025-10-05 00:21:32,212 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-10-05 00:21:32,212 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2025-10-05 00:21:32,216 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2025-10-05 00:21:32,497 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-10-05 00:21:32,497 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2025-10-05 00:21:32,501 [ scc.git] DEBUG Calling 'git fetch origin pull/595/head'
2025-10-05 00:21:32,780 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-10-05 00:21:32,780 [ scc.git] DEBUG * branch refs/pull/595/head -> FETCH_HEAD
2025-10-05 00:21:32,785 [ scc.git] DEBUG Calling 'git fetch origin pull/596/head'
2025-10-05 00:21:33,068 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-10-05 00:21:33,068 [ scc.git] DEBUG * branch refs/pull/596/head -> FETCH_HEAD
2025-10-05 00:21:33,072 [ scc.git] DEBUG Calling 'git fetch origin pull/602/head'
2025-10-05 00:21:33,351 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-10-05 00:21:33,352 [ scc.git] DEBUG * branch refs/pull/602/head -> FETCH_HEAD
2025-10-05 00:21:33,356 [ scc.git] DEBUG Calling 'git fetch origin pull/604/head'
2025-10-05 00:21:33,628 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-10-05 00:21:33,628 [ scc.git] DEBUG * branch refs/pull/604/head -> FETCH_HEAD
2025-10-05 00:21:33,632 [ scc.git] DEBUG Calling 'git fetch origin pull/612/head'
2025-10-05 00:21:33,917 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-10-05 00:21:33,917 [ scc.git] DEBUG * branch refs/pull/612/head -> FETCH_HEAD
2025-10-05 00:21:33,921 [ scc.git] DEBUG Calling 'git fetch origin pull/613/head'
2025-10-05 00:21:34,208 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-10-05 00:21:34,208 [ scc.git] DEBUG * branch refs/pull/613/head -> FETCH_HEAD
2025-10-05 00:21:34,212 [ scc.git] DEBUG Calling 'git fetch origin pull/619/head'
2025-10-05 00:21:34,491 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-10-05 00:21:34,491 [ scc.git] DEBUG * branch refs/pull/619/head -> FETCH_HEAD
2025-10-05 00:21:34,495 [ scc.git] DEBUG Calling 'git fetch origin pull/628/head'
2025-10-05 00:21:34,782 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-10-05 00:21:34,782 [ scc.git] DEBUG * branch refs/pull/628/head -> FETCH_HEAD
2025-10-05 00:21:34,786 [ scc.git] DEBUG Calling 'git fetch origin pull/635/head'
2025-10-05 00:21:35,081 [ scc.git] DEBUG From https://github.com/ome/omero-web
2025-10-05 00:21:35,081 [ scc.git] DEBUG * branch refs/pull/635/head -> FETCH_HEAD
2025-10-05 00:21:35,086 [ scc.git] DEBUG ## Unique users: []
2025-10-05 00:21:35,086 [ scc.git] DEBUG Get sha1 of %s
2025-10-05 00:21:35,086 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:21:35,089 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...06b0073db19eeccb9698860f75639084ad1b1200'
2025-10-05 00:21:35,096 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:21:35,098 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 168 (Changes to nginx @maintenance handler) 06b0073db19eeccb9698860f75639084ad1b1200'
2025-10-05 00:21:35,113 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-05 00:21:35,117 [ scc.git] DEBUG omeroweb/templates/nginx-development.conf.template | 2 +-
2025-10-05 00:21:35,117 [ scc.git] DEBUG omeroweb/templates/nginx-location.conf.template | 3 ++-
2025-10-05 00:21:35,117 [ scc.git] DEBUG omeroweb/templates/nginx.conf.template | 2 +-
2025-10-05 00:21:35,117 [ scc.git] DEBUG test/unit/reference_templates/nginx-development-withoptions.conf | 2 +-
2025-10-05 00:21:35,117 [ scc.git] DEBUG test/unit/reference_templates/nginx-development.conf | 2 +-
2025-10-05 00:21:35,117 [ scc.git] DEBUG test/unit/reference_templates/nginx-location-withoptions.conf | 3 ++-
2025-10-05 00:21:35,117 [ scc.git] DEBUG test/unit/reference_templates/nginx-location.conf | 3 ++-
2025-10-05 00:21:35,118 [ scc.git] DEBUG test/unit/reference_templates/nginx-withoptions.conf | 2 +-
2025-10-05 00:21:35,118 [ scc.git] DEBUG test/unit/reference_templates/nginx.conf | 2 +-
2025-10-05 00:21:35,118 [ scc.git] DEBUG test/unit/test_web.py | 1 +
2025-10-05 00:21:35,119 [ scc.git] DEBUG 10 files changed, 13 insertions(+), 9 deletions(-)
2025-10-05 00:21:35,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:21:35,262 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2025-10-05 00:21:35,268 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:21:35,270 [ 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-05 00:21:35,287 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2025-10-05 00:21:35,287 [ scc.git] DEBUG Auto-merging setup.py
2025-10-05 00:21:35,288 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-05 00:21:35,292 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2025-10-05 00:21:35,292 [ scc.git] DEBUG setup.py | 1 +
2025-10-05 00:21:35,292 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2025-10-05 00:21:35,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:21:35,657 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2025-10-05 00:21:35,664 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:21:35,666 [ 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-05 00:21:35,685 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2025-10-05 00:21:35,685 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2025-10-05 00:21:35,686 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-05 00:21:35,689 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2025-10-05 00:21:35,689 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2025-10-05 00:21:35,689 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2025-10-05 00:21:36,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:21:36,044 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...30278b64bb39134a3f1101b600d4a82256e6eaeb'
2025-10-05 00:21:36,051 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:21:36,053 [ 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-05 00:21:36,070 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-05 00:21:36,073 [ scc.git] DEBUG omeroweb/webclient/static/webclient/javascript/ome.webclient.actions.js | 2 +-
2025-10-05 00:21:36,073 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2025-10-05 00:21:36,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:21:36,457 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3aae48f586d7b412538a45b34ddc471a26a286e8'
2025-10-05 00:21:36,464 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:21:36,466 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 596 (Linkify can parse anchor tag) 3aae48f586d7b412538a45b34ddc471a26a286e8'
2025-10-05 00:21:36,481 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-05 00:21:36,485 [ scc.git] DEBUG .../webclient/javascript/ome.webclient.actions.js | 26 ++++++++++++++++++++--
2025-10-05 00:21:36,485 [ scc.git] DEBUG 1 file changed, 24 insertions(+), 2 deletions(-)
2025-10-05 00:21:36,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:21:36,847 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9119372e9fef8cab0e212f02685c8715a3307539'
2025-10-05 00:21:36,854 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:21:36,856 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 602 (Inherit all annotations) 9119372e9fef8cab0e212f02685c8715a3307539'
2025-10-05 00:21:36,873 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-05 00:21:36,877 [ scc.git] DEBUG omeroweb/webclient/static/webclient/css/dusty.css | 1 -
2025-10-05 00:21:36,878 [ scc.git] DEBUG .../javascript/ome.right_panel_comments_pane.js | 134 +++++++++++++++++++--
2025-10-05 00:21:36,878 [ scc.git] DEBUG .../javascript/ome.right_panel_fileanns_pane.js | 80 +++++++++++-
2025-10-05 00:21:36,878 [ scc.git] DEBUG .../javascript/ome.right_panel_mapanns_pane.js | 6 +-
2025-10-05 00:21:36,878 [ scc.git] DEBUG .../javascript/ome.right_panel_ratings_pane.js | 33 ++++-
2025-10-05 00:21:36,878 [ scc.git] DEBUG .../javascript/ome.right_panel_tags_pane.js | 92 ++++++++++++--
2025-10-05 00:21:36,878 [ scc.git] DEBUG .../webclient/annotations/comments_underscore.html | 58 +++++++--
2025-10-05 00:21:36,878 [ scc.git] DEBUG .../webclient/annotations/fileanns_underscore.html | 81 ++++++++-----
2025-10-05 00:21:36,878 [ scc.git] DEBUG .../webclient/annotations/mapanns_underscore.html | 4 +
2025-10-05 00:21:36,878 [ scc.git] DEBUG .../webclient/annotations/ratings_underscore.html | 4 +-
2025-10-05 00:21:36,878 [ scc.git] DEBUG .../webclient/annotations/tags_underscore.html | 30 +++--
2025-10-05 00:21:36,878 [ scc.git] DEBUG 11 files changed, 447 insertions(+), 76 deletions(-)
2025-10-05 00:21:37,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:21:37,240 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...15e1289cb1c1533c8606b9c9f745d1f24575bb7d'
2025-10-05 00:21:37,248 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:21:37,250 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 604 (Right panel perf) 15e1289cb1c1533c8606b9c9f745d1f24575bb7d'
2025-10-05 00:21:37,274 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py
2025-10-05 00:21:37,275 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-05 00:21:37,281 [ scc.git] DEBUG omeroweb/webclient/controller/container.py | 66 ++++++++++------------
2025-10-05 00:21:37,281 [ scc.git] DEBUG .../webclient/annotations/annotations_share.html | 12 +---
2025-10-05 00:21:37,281 [ scc.git] DEBUG omeroweb/webclient/views.py | 51 -----------------
2025-10-05 00:21:37,281 [ scc.git] DEBUG 3 files changed, 31 insertions(+), 98 deletions(-)
2025-10-05 00:21:37,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:21:37,627 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...06446bf912b361c22e46c5a0678b3146b91e7e26'
2025-10-05 00:21:37,634 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:21:37,636 [ 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-05 00:21:37,654 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-05 00:21:37,658 [ scc.git] DEBUG .../webgateway/static/webgateway/css/ome.body.css | 2 ++
2025-10-05 00:21:37,658 [ scc.git] DEBUG .../webgateway/static/webgateway/css/ome.header.css | 21 +++++++++++----------
2025-10-05 00:21:37,658 [ scc.git] DEBUG 2 files changed, 13 insertions(+), 10 deletions(-)
2025-10-05 00:21:38,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:21:38,029 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...189a10758bce63c40d0fe73d490cc489623a6ceb'
2025-10-05 00:21:38,036 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:21:38,039 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 613 (externalInfo display) 189a10758bce63c40d0fe73d490cc489623a6ceb'
2025-10-05 00:21:38,057 [ scc.git] DEBUG Auto-merging omeroweb/webclient/static/webclient/css/dusty.css
2025-10-05 00:21:38,058 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-05 00:21:38,062 [ scc.git] DEBUG omeroweb/webclient/static/webclient/css/dusty.css | 2 +-
2025-10-05 00:21:38,062 [ scc.git] DEBUG .../webclient/annotations/includes/toolbar.html | 43 +++++++++++++++++++++-
2025-10-05 00:21:38,062 [ scc.git] DEBUG .../webclient/annotations/metadata_general.html | 31 +++++++++++-----
2025-10-05 00:21:38,062 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 2 +
2025-10-05 00:21:38,062 [ scc.git] DEBUG 4 files changed, 66 insertions(+), 12 deletions(-)
2025-10-05 00:21:38,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:21:38,420 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6dbfcebfee72e20f36a434fdc8850930d89acdac'
2025-10-05 00:21:38,427 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:21:38,429 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 619 (Permit subpackages as app plugins) 6dbfcebfee72e20f36a434fdc8850930d89acdac'
2025-10-05 00:21:38,446 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2025-10-05 00:21:38,447 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-05 00:21:38,451 [ scc.git] DEBUG omeroweb/settings.py | 9 ++++-----
2025-10-05 00:21:38,451 [ scc.git] DEBUG 1 file changed, 4 insertions(+), 5 deletions(-)
2025-10-05 00:21:38,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:21:38,812 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b8c7989c9900270d7cf27523f2649bbb903c7a60'
2025-10-05 00:21:38,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:21:38,821 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 628 (Add protocol required since Django4) b8c7989c9900270d7cf27523f2649bbb903c7a60'
2025-10-05 00:21:38,839 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2025-10-05 00:21:38,840 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-05 00:21:38,844 [ scc.git] DEBUG omeroweb/settings.py | 4 ++--
2025-10-05 00:21:38,844 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 2 deletions(-)
2025-10-05 00:21:39,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:21:39,201 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...7446a144da7db207d65373456bf9347cc0a3dadb'
2025-10-05 00:21:39,208 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:21:39,210 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 635 (Marshal annotations roi shape) 7446a144da7db207d65373456bf9347cc0a3dadb'
2025-10-05 00:21:39,233 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py
2025-10-05 00:21:39,234 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2025-10-05 00:21:39,239 [ scc.git] DEBUG omeroweb/webclient/tree.py | 6 ++++++
2025-10-05 00:21:39,239 [ scc.git] DEBUG omeroweb/webclient/views.py | 6 ++++++
2025-10-05 00:21:39,239 [ scc.git] DEBUG 2 files changed, 12 insertions(+)
2025-10-05 00:21:39,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:21:39,611 [ scc.git] DEBUG Calling 'git submodule update'
2025-10-05 00:21:39,647 [ scc.git] DEBUG Get sha1 of %s
2025-10-05 00:21:39,648 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2025-10-05 00:21:39,650 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-05 00:21:39,686 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-05 00:21:39,693 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc094311850> has no local changes
2025-10-05 00:21:39,693 [ 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#539 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/539/)'
2025-10-05 00:21:39,703 [ scc.git] DEBUG [detached HEAD a32d91c29] merge master -Dorg -Ssuccess-only
2025-10-05 00:21:39,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-05 00:21:39,703 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2025-10-05 00:21:39,746 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2025-10-05 00:21:40,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:21:40,015 [ scc.config] DEBUG Found submodule.omero-marshal.url
2025-10-05 00:21:40,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:21:40,405 [ scc.config] DEBUG Found submodule.omero-py.url
2025-10-05 00:21:40,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:21:40,796 [ scc.config] DEBUG Found submodule.omero-scripts.url
2025-10-05 00:21:41,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:21:41,194 [ scc.config] DEBUG Found submodule.omero-web.url
2025-10-05 00:21:41,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2025-10-05 00:21:41,597 [ scc.git] DEBUG Calling 'git status --porcelain'
2025-10-05 00:21:41,623 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc0942bc5d0> has local changes
2025-10-05 00:21:41,623 [ 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'
- PR 88 sbesson 'Fix format of requirement specifiers for Ice wheel packages'
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)
Updating 780876c5..1aad8fff
Previously merged:
- PR 482 sbesson 'omero.gateway: fix DetailsWrapper.getExternalInfo regression'
- PR 478 chris-allan 'Remove Python 2 compat from gateway utilities and scripts tests'
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 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#539 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/539/)'
2025-10-05 00:21:41,630 [ scc.git] DEBUG [detached HEAD ec48af0] merge master -Dorg -Ssuccess-only
2025-10-05 00:21:41,630 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2025-10-05 00:21:41,630 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2025-10-05 00:21:41,630 [ scc.merge] INFO Already up to date.
2025-10-05 00:21:41,630 [ scc.merge] INFO
2025-10-05 00:21:41,630 [ scc.merge] INFO Merged PRs:
2025-10-05 00:21:41,630 [ scc.merge] INFO - PR 334 dependabot[bot] 'Bump omero-marshal from `6d44f66` to `a3dd99b`'
2025-10-05 00:21:41,630 [ scc.merge] INFO
2025-10-05 00:21:41,630 [ scc.merge] INFO Repository: ome/omero-dropbox
2025-10-05 00:21:41,630 [ scc.merge] INFO Already up to date.
2025-10-05 00:21:41,630 [ scc.merge] INFO
2025-10-05 00:21:41,630 [ scc.merge] INFO Merged PRs:
2025-10-05 00:21:41,630 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2025-10-05 00:21:41,630 [ 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-05 00:21:41,630 [ scc.merge] INFO
2025-10-05 00:21:41,630 [ scc.merge] INFO Repository: ome/omero-marshal
2025-10-05 00:21:41,630 [ scc.merge] INFO Excluded PRs:
2025-10-05 00:21:41,630 [ scc.merge] INFO - PR 84 joshmoore 'New JSON-LD context-based version' (stage: draft)
2025-10-05 00:21:41,630 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2025-10-05 00:21:41,630 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2025-10-05 00:21:41,630 [ scc.merge] INFO Already up to date.
2025-10-05 00:21:41,630 [ scc.merge] INFO
2025-10-05 00:21:41,630 [ scc.merge] INFO Merged PRs:
2025-10-05 00:21:41,630 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2025-10-05 00:21:41,630 [ scc.merge] INFO - PR 88 sbesson 'Fix format of requirement specifiers for Ice wheel packages'
2025-10-05 00:21:41,630 [ scc.merge] INFO
2025-10-05 00:21:41,630 [ scc.merge] INFO Repository: ome/omero-py
2025-10-05 00:21:41,630 [ scc.merge] INFO Excluded PRs:
2025-10-05 00:21:41,630 [ scc.merge] INFO - PR 470 multimeric 'Faux import' (user: multimeric)
2025-10-05 00:21:41,630 [ scc.merge] INFO - PR 459 Tom-TBT 'Wrapper improvements for ROIs' (stage: draft)
2025-10-05 00:21:41,630 [ scc.merge] INFO - PR 450 multimeric 'Add model stubs' (user: multimeric)
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj' (exclude comment)
2025-10-05 00:21:41,631 [ scc.merge] INFO Updating 780876c5..1aad8fff
2025-10-05 00:21:41,631 [ scc.merge] INFO Previously merged:
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 482 sbesson 'omero.gateway: fix DetailsWrapper.getExternalInfo regression'
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 478 chris-allan 'Remove Python 2 compat from gateway utilities and scripts tests'
2025-10-05 00:21:41,631 [ scc.merge] INFO
2025-10-05 00:21:41,631 [ scc.merge] INFO Merged PRs:
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 483 sbesson 'omero.gateway: deprecate BlitzObjectWrapper.getExternalInfo()'
2025-10-05 00:21:41,631 [ scc.merge] INFO
2025-10-05 00:21:41,631 [ scc.merge] INFO Repository: ome/omero-scripts
2025-10-05 00:21:41,631 [ scc.merge] INFO Excluded PRs:
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2025-10-05 00:21:41,631 [ scc.merge] INFO Already up to date.
2025-10-05 00:21:41,631 [ scc.merge] INFO
2025-10-05 00:21:41,631 [ scc.merge] INFO Merged PRs:
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 223 will-moore 'don't attempt ROI stats on big images'
2025-10-05 00:21:41,631 [ scc.merge] INFO
2025-10-05 00:21:41,631 [ scc.merge] INFO Conflicting PRs (not included):
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2025-10-05 00:21:41,631 [ scc.merge] INFO
2025-10-05 00:21:41,631 [ scc.merge] INFO Repository: ome/omero-web
2025-10-05 00:21:41,631 [ scc.merge] INFO Excluded PRs:
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 629 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2025-10-05 00:21:41,631 [ scc.merge] INFO Already up to date.
2025-10-05 00:21:41,631 [ scc.merge] INFO
2025-10-05 00:21:41,631 [ scc.merge] INFO Merged PRs:
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler'
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 595 sukunis 'linkify supports urls that include {}[] characters'
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 596 sukunis 'Linkify can parse anchor tag'
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 602 Tom-TBT 'Inherit all annotations'
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 604 will-moore 'Right panel perf'
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 612 will-moore 'Allow top_links to wrap if too many for space'
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 613 will-moore 'externalInfo display'
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 619 DavidStirling 'Permit subpackages as app plugins'
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 628 jburel 'Add protocol required since Django4'
2025-10-05 00:21:41,631 [ scc.merge] INFO - PR 635 will-moore 'Marshal annotations roi shape'
2025-10-05 00:21:41,631 [ scc.merge] INFO
2025-10-05 00:21:41,631 [ scc.merge] DEBUG Cleaning remote branches created for merging
2025-10-05 00:21:41,632 [ scc.git] DEBUG Calling 'git remote'
2025-10-05 00:21:41,634 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2025-10-05 00:21:41,634 [ scc.git] DEBUG Calling 'git remote'
2025-10-05 00:21:41,636 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-05 00:21:41,636 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2025-10-05 00:21:41,636 [ scc.git] DEBUG Calling 'git remote'
2025-10-05 00:21:41,638 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-05 00:21:41,638 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2025-10-05 00:21:41,638 [ scc.git] DEBUG Calling 'git remote'
2025-10-05 00:21:41,640 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-05 00:21:41,640 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2025-10-05 00:21:41,640 [ scc.git] DEBUG Calling 'git remote'
2025-10-05 00:21:41,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2025-10-05 00:21:41,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2025-10-05 00:21:41,642 [ scc.git] DEBUG Calling 'git remote'
2025-10-05 00:21:41,644 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
Update component versions
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:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
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-05 00:22:09,485 [ 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}
