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 '' ']'
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ '[' '!' 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
++ '[' -n /bin/bash -o -n '' ']'
++ 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)
2024-09-04 00:32:19,320 [ scc.config] DEBUG Found github.token
2024-09-04 00:32:19,322 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-09-04 00:32:19,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:32:19,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:32:20,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-09-04 00:32:20,264 [ scc.gh] DEBUG 4347 remaining from 5000 (Reset at 00:09
2024-09-04 00:32:20,265 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-04 00:32:20,268 [ scc.git] DEBUG Check current status
2024-09-04 00:32:20,268 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-04 00:32:20,271 [ scc.git] DEBUG 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-09-04 00:32:20,271 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-04 00:32:20,306 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-04 00:32:20,309 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-04 00:32:20,312 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-04 00:32:20,316 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-04 00:32:20,916 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-09-04 00:32:20,920 [ scc.config] DEBUG Found remote.origin.url
2024-09-04 00:32:21,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-09-04 00:32:21,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-04 00:32:22,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-04 00:32:22,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-04 00:32:22,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-04 00:32:22,996 [ scc.git] DEBUG Resetting...
2024-09-04 00:32:22,996 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-09-04 00:32:23,001 [ scc.git] DEBUG HEAD is now at 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-09-04 00:32:23,001 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-09-04 00:32:23,046 [ scc.git] DEBUG Check current status
2024-09-04 00:32:23,046 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-04 00:32:23,049 [ scc.git] DEBUG 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-09-04 00:32:23,049 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-04 00:32:23,083 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-04 00:32:23,086 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-04 00:32:23,089 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-04 00:32:23,092 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-04 00:32:23,097 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-09-04 00:32:23,097 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-09-04 00:32:23,097 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-09-04 00:32:23,098 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-09-04 00:32:23,098 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-09-04 00:32:23,098 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-09-04 00:32:23,098 [ scc.repo] DEBUG ## PRs found:
2024-09-04 00:32:23,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-09-04 00:32:23,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/291 HTTP/1.1" 200 None
2024-09-04 00:32:23,933 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-04 00:32:23,933 [ scc.repo] DEBUG - PR 291 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `2b30141`'
2024-09-04 00:32:23,933 [ scc.repo] DEBUG ## Branches found:
2024-09-04 00:32:23,933 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:32:23,933 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:32:23,936 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-04 00:32:23,939 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-04 00:32:23,939 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-04 00:32:23,942 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-04 00:32:23,945 [ scc.git] DEBUG Already up to date.
2024-09-04 00:32:23,945 [ scc.git] DEBUG Calling 'git fetch origin pull/291/head'
2024-09-04 00:32:24,237 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-09-04 00:32:24,238 [ scc.git] DEBUG * branch refs/pull/291/head -> FETCH_HEAD
2024-09-04 00:32:24,242 [ scc.git] DEBUG ## Unique users: []
2024-09-04 00:32:24,242 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:32:24,242 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:32:24,245 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...05f25c9f27af6269fa4ea407e603b23b408b34e4'
2024-09-04 00:32:24,256 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:32:24,259 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 291 (Bump omero-web from `ba8c7e2` to `2b30141`) 05f25c9f27af6269fa4ea407e603b23b408b34e4'
2024-09-04 00:32:24,267 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:32:24,269 [ scc.git] DEBUG omero-web | 2 +-
2024-09-04 00:32:24,269 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-09-04 00:32:24,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:32:24,406 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:32:24,493 [ scc.git] DEBUG Submodule path 'omero-web': checked out '2b30141f008dbb3ef72cc06a3600f4a64f324c70'
2024-09-04 00:32:24,494 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:32:24,494 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:32:24,497 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:32:24,592 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fd65299ee20> has no local changes
2024-09-04 00:32:24,592 [ 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 291 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `2b30141`'
Generated by OMERO-python-superbuild-push#163 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/163/)'
2024-09-04 00:32:24,616 [ scc.git] DEBUG [detached HEAD 071db64] merge master -Dorg -Snone
2024-09-04 00:32:24,616 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-09-04 00:32:24,616 [ scc.merge] INFO Already up to date.
2024-09-04 00:32:24,616 [ scc.merge] INFO
2024-09-04 00:32:24,616 [ scc.merge] INFO Merged PRs:
2024-09-04 00:32:24,616 [ scc.merge] INFO - PR 291 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `2b30141`'
2024-09-04 00:32:24,616 [ scc.merge] INFO
2024-09-04 00:32:24,616 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-04 00:32:24,616 [ scc.git] DEBUG Calling 'git remote'
Synchronizing submodule url for 'omero-dropbox'
Synchronizing submodule url for 'omero-marshal'
Synchronizing submodule url for 'omero-py'
Synchronizing submodule url for 'omero-scripts'
Synchronizing submodule url for 'omero-web'
Merge all submodules using repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-09-04 00:32:26,804 [ scc.config] DEBUG Found github.token
2024-09-04 00:32:26,807 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-09-04 00:32:26,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:32:27,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:32:27,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-09-04 00:32:27,770 [ scc.gh] DEBUG 4337 remaining from 5000 (Reset at 00:09
2024-09-04 00:32:27,771 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-04 00:32:27,774 [ scc.git] DEBUG Check current status
2024-09-04 00:32:27,774 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-04 00:32:27,777 [ scc.git] DEBUG 071db64 merge master -Dorg -Snone
2024-09-04 00:32:27,777 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-04 00:32:27,812 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-04 00:32:27,814 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-04 00:32:27,817 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-04 00:32:27,821 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-04 00:32:27,824 [ scc.git] DEBUG 2b30141f008dbb3ef72cc06a3600f4a64f324c70 omero-web (v5.27.1-1-g2b30141f0)
2024-09-04 00:32:27,827 [ scc.config] DEBUG Found remote.origin.url
2024-09-04 00:32:27,828 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-09-04 00:32:27,829 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-09-04 00:32:28,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-09-04 00:32:28,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-04 00:32:29,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-04 00:32:29,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-04 00:32:29,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-04 00:32:29,925 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:32:29,967 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-09-04 00:32:29,967 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-04 00:32:29,970 [ scc.git] DEBUG Check current status
2024-09-04 00:32:29,970 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-04 00:32:29,974 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-09-04 00:32:29,974 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-04 00:32:30,010 [ scc.config] DEBUG Found remote.origin.url
2024-09-04 00:32:30,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-09-04 00:32:30,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-04 00:32:31,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-04 00:32:31,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-04 00:32:32,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-04 00:32:32,083 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:32:32,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-04 00:32:32,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-09-04 00:32:32,118 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-04 00:32:32,122 [ scc.git] DEBUG Check current status
2024-09-04 00:32:32,122 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-04 00:32:32,125 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-09-04 00:32:32,125 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-04 00:32:32,160 [ scc.config] DEBUG Found remote.origin.url
2024-09-04 00:32:32,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-09-04 00:32:33,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-04 00:32:33,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-04 00:32:33,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-04 00:32:34,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-04 00:32:34,276 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:32:34,310 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-04 00:32:34,312 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-09-04 00:32:34,312 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-04 00:32:34,315 [ scc.git] DEBUG Check current status
2024-09-04 00:32:34,315 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-04 00:32:34,318 [ scc.git] DEBUG 749a68ac Bump version: 5.19.4 → 5.19.5.dev0
2024-09-04 00:32:34,319 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-04 00:32:34,354 [ scc.config] DEBUG Found remote.origin.url
2024-09-04 00:32:34,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-09-04 00:32:35,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-04 00:32:35,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-04 00:32:36,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-04 00:32:36,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-04 00:32:36,428 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:32:36,462 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-04 00:32:36,463 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-09-04 00:32:36,463 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-04 00:32:36,466 [ scc.git] DEBUG Check current status
2024-09-04 00:32:36,467 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-04 00:32:36,470 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-09-04 00:32:36,470 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-04 00:32:36,506 [ scc.config] DEBUG Found remote.origin.url
2024-09-04 00:32:36,506 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-09-04 00:32:36,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-09-04 00:32:37,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-04 00:32:37,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-04 00:32:38,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-04 00:32:38,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-04 00:32:38,586 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:32:38,620 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-04 00:32:38,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-09-04 00:32:38,621 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-04 00:32:38,624 [ scc.git] DEBUG Check current status
2024-09-04 00:32:38,624 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-04 00:32:38,628 [ scc.git] DEBUG 2b30141f0 Bump version: 5.27.1 → 5.27.2.dev0
2024-09-04 00:32:38,628 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-04 00:32:38,664 [ scc.config] DEBUG Found remote.origin.url
2024-09-04 00:32:39,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-09-04 00:32:39,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-04 00:32:39,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-04 00:32:40,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-04 00:32:40,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-04 00:32:40,697 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:32:40,732 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-04 00:32:40,732 [ scc.git] DEBUG Resetting...
2024-09-04 00:32:40,732 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-09-04 00:32:40,737 [ scc.git] DEBUG HEAD is now at 071db64 merge master -Dorg -Snone
2024-09-04 00:32:40,737 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-09-04 00:32:40,782 [ scc.git] DEBUG Check current status
2024-09-04 00:32:40,782 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-04 00:32:40,785 [ scc.git] DEBUG 071db64 merge master -Dorg -Snone
2024-09-04 00:32:40,785 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-04 00:32:40,820 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-04 00:32:40,823 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-04 00:32:40,826 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-04 00:32:40,830 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-04 00:32:40,833 [ scc.git] DEBUG 2b30141f008dbb3ef72cc06a3600f4a64f324c70 omero-web (v5.27.1-1-g2b30141f0)
2024-09-04 00:32:40,833 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-09-04 00:32:40,834 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-09-04 00:32:40,834 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-09-04 00:32:40,834 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-09-04 00:32:40,834 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-09-04 00:32:40,834 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-09-04 00:32:40,834 [ scc.repo] DEBUG ## PRs found:
2024-09-04 00:32:41,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-09-04 00:32:41,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/291 HTTP/1.1" 200 None
2024-09-04 00:32:41,616 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-04 00:32:42,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/05f25c9f27af6269fa4ea407e603b23b408b34e4 HTTP/1.1" 200 None
2024-09-04 00:32:42,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/05f25c9f27af6269fa4ea407e603b23b408b34e4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-04 00:32:43,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/05f25c9f27af6269fa4ea407e603b23b408b34e4 HTTP/1.1" 200 None
2024-09-04 00:32:43,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/statuses/05f25c9f27af6269fa4ea407e603b23b408b34e4?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:32:43,686 [ scc.repo] DEBUG - PR 291 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `2b30141`'
2024-09-04 00:32:43,686 [ scc.repo] DEBUG ## Branches found:
2024-09-04 00:32:43,686 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:32:43,686 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:32:43,691 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-04 00:32:43,694 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-04 00:32:43,694 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-04 00:32:43,698 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-04 00:32:43,701 [ scc.git] DEBUG Already up to date.
2024-09-04 00:32:43,702 [ scc.git] DEBUG Calling 'git fetch origin pull/291/head'
2024-09-04 00:32:44,010 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-09-04 00:32:44,010 [ scc.git] DEBUG * branch refs/pull/291/head -> FETCH_HEAD
2024-09-04 00:32:44,016 [ scc.git] DEBUG ## Unique users: []
2024-09-04 00:32:44,016 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:32:44,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:32:44,022 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...05f25c9f27af6269fa4ea407e603b23b408b34e4'
2024-09-04 00:32:44,026 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:32:44,029 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 291 (Bump omero-web from `ba8c7e2` to `2b30141`) 05f25c9f27af6269fa4ea407e603b23b408b34e4'
2024-09-04 00:32:44,032 [ scc.git] DEBUG Already up to date.
2024-09-04 00:32:44,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:32:44,161 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:32:44,197 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:32:44,197 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:32:44,200 [ scc.repo] DEBUG ## PRs found:
2024-09-04 00:32:44,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-09-04 00:32:45,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-09-04 00:32:45,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-09-04 00:32:46,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-09-04 00:32:46,503 [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
2024-09-04 00:32:47,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-09-04 00:32:47,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:32:47,420 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-09-04 00:32:47,420 [ scc.repo] DEBUG ## Branches found:
2024-09-04 00:32:47,420 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-09-04 00:32:47,420 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:32:47,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:32:47,423 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-04 00:32:47,427 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-04 00:32:47,427 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-04 00:32:47,430 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-04 00:32:47,434 [ scc.git] DEBUG Already up to date.
2024-09-04 00:32:47,434 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-09-04 00:32:47,746 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-09-04 00:32:47,746 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-09-04 00:32:47,749 [ scc.git] DEBUG ## Unique users: []
2024-09-04 00:32:47,750 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:32:47,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:32:47,753 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-09-04 00:32:47,757 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:32:47,760 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-09-04 00:32:47,850 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-09-04 00:32:47,850 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-09-04 00:32:47,850 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-09-04 00:32:47,850 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-09-04 00:32:47,850 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-09-04 00:32:47,850 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-09-04 00:32:47,850 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-09-04 00:32:47,850 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-09-04 00:32:47,850 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-09-04 00:32:47,850 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:32:47,854 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-09-04 00:32:47,854 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-09-04 00:32:47,854 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-09-04 00:32:47,854 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-09-04 00:32:47,854 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-09-04 00:32:47,855 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-09-04 00:32:47,855 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-09-04 00:32:47,855 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-09-04 00:32:47,855 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-09-04 00:32:47,855 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-09-04 00:32:48,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:32:48,016 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:32:48,049 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:32:48,049 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:32:48,053 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:32:48,085 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:32:48,090 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b6fdb7c70> has no local changes
2024-09-04 00:32:48,090 [ 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'
Generated by OMERO-python-superbuild-push#163 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/163/)'
2024-09-04 00:32:48,096 [ scc.git] DEBUG [detached HEAD f084329] merge master -Dorg -Ssuccess-only
2024-09-04 00:32:48,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-04 00:32:48,097 [ scc.repo] DEBUG ## PRs found:
2024-09-04 00:32:48,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-09-04 00:32:49,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-09-04 00:32:49,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-09-04 00:32:50,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-09-04 00:32:50,474 [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
2024-09-04 00:32:50,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-09-04 00:32:51,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:32:51,306 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-09-04 00:32:51,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-09-04 00:32:52,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-09-04 00:32:52,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-09-04 00:32:53,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-09-04 00:32:53,061 [ scc.repo] DEBUG ## Branches found:
2024-09-04 00:32:53,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-09-04 00:32:53,062 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:32:53,062 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:32:53,065 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-04 00:32:53,068 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-04 00:32:53,068 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-04 00:32:53,072 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-04 00:32:53,075 [ scc.git] DEBUG Already up to date.
2024-09-04 00:32:53,076 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-09-04 00:32:53,525 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-09-04 00:32:53,526 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-09-04 00:32:53,530 [ scc.git] DEBUG ## Unique users: []
2024-09-04 00:32:53,530 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:32:53,530 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:32:53,533 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-09-04 00:32:53,537 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:32:53,541 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-09-04 00:32:53,550 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-09-04 00:32:53,550 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:32:53,553 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-09-04 00:32:53,553 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-09-04 00:32:53,553 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-09-04 00:32:53,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:32:53,695 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:32:53,728 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:32:53,728 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:32:53,731 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:32:53,764 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:32:53,768 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b6ecd5730> has no local changes
2024-09-04 00:32:53,768 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-marshal
Excluded PRs:
- PR 34 chris-allan 'Initial support for Event' (exclude comment)
- PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 will-moore 'Roi encoder allows Shape None'
Generated by OMERO-python-superbuild-push#163 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/163/)'
2024-09-04 00:32:53,775 [ scc.git] DEBUG [detached HEAD 3173afb] merge master -Dorg -Ssuccess-only
2024-09-04 00:32:53,775 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-04 00:32:53,775 [ scc.repo] DEBUG ## PRs found:
2024-09-04 00:32:54,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-09-04 00:32:54,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427 HTTP/1.1" 200 None
2024-09-04 00:32:55,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/424 HTTP/1.1" 200 None
2024-09-04 00:32:55,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/424/comments HTTP/1.1" 200 None
2024-09-04 00:32:56,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None
2024-09-04 00:32:56,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-04 00:32:57,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-04 00:32:57,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None
2024-09-04 00:32:58,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec?per_page=1 HTTP/1.1" 200 None
2024-09-04 00:32:58,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None
2024-09-04 00:32:59,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec/status HTTP/1.1" 200 None
2024-09-04 00:32:59,053 [ scc.repo] DEBUG - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
2024-09-04 00:32:59,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-09-04 00:32:59,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-09-04 00:33:00,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-09-04 00:33:00,939 [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
2024-09-04 00:33:01,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-04 00:33:01,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-09-04 00:33:02,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None
2024-09-04 00:33:02,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-09-04 00:33:03,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-09-04 00:33:03,132 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-09-04 00:33:03,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-09-04 00:33:04,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-09-04 00:33:04,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-09-04 00:33:04,985 [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
2024-09-04 00:33:05,528 [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
2024-09-04 00:33:05,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-09-04 00:33:06,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-09-04 00:33:06,899 [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
2024-09-04 00:33:07,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-04 00:33:07,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-09-04 00:33:08,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-09-04 00:33:08,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-09-04 00:33:09,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-09-04 00:33:09,089 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-09-04 00:33:09,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-09-04 00:33:09,521 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-09-04 00:33:09,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-09-04 00:33:10,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-09-04 00:33:10,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-09-04 00:33:11,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-04 00:33:11,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-09-04 00:33:12,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:33:12,233 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-09-04 00:33:12,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-09-04 00:33:13,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-09-04 00:33:13,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-09-04 00:33:14,124 [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
2024-09-04 00:33:14,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-04 00:33:14,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-09-04 00:33:15,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-09-04 00:33:15,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-09-04 00:33:16,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-09-04 00:33:16,215 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-09-04 00:33:16,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-09-04 00:33:17,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-09-04 00:33:17,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-09-04 00:33:18,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-09-04 00:33:18,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-09-04 00:33:18,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-04 00:33:19,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-09-04 00:33:19,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:33:19,835 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-09-04 00:33:20,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-09-04 00:33:20,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-09-04 00:33:21,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-04 00:33:21,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-09-04 00:33:21,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:33:21,977 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-09-04 00:33:22,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-09-04 00:33:22,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-09-04 00:33:23,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-09-04 00:33:23,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-04 00:33:24,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-09-04 00:33:24,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:33:24,845 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-09-04 00:33:25,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-09-04 00:33:25,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-09-04 00:33:26,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-09-04 00:33:26,630 [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
2024-09-04 00:33:27,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-09-04 00:33:27,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:33:27,537 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-09-04 00:33:27,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-09-04 00:33:28,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-09-04 00:33:28,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-09-04 00:33:29,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-09-04 00:33:29,361 [ scc.repo] DEBUG ## Branches found:
2024-09-04 00:33:29,361 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-09-04 00:33:29,362 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:33:29,362 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:33:29,366 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-04 00:33:29,370 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-04 00:33:29,370 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-04 00:33:29,374 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-04 00:33:29,378 [ scc.git] DEBUG Already up to date.
2024-09-04 00:33:29,378 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-09-04 00:33:30,223 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-04 00:33:30,224 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-09-04 00:33:30,227 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-09-04 00:33:30,573 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-04 00:33:30,573 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-09-04 00:33:30,576 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-09-04 00:33:30,851 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-04 00:33:30,851 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-09-04 00:33:30,855 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-09-04 00:33:31,151 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-04 00:33:31,152 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-09-04 00:33:31,155 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-09-04 00:33:31,516 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-04 00:33:31,516 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-09-04 00:33:31,520 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-09-04 00:33:31,799 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-04 00:33:31,799 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-09-04 00:33:31,802 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-09-04 00:33:32,085 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-04 00:33:32,085 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-09-04 00:33:32,089 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-09-04 00:33:32,456 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-04 00:33:32,456 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-09-04 00:33:32,460 [ scc.git] DEBUG Calling 'git fetch origin pull/424/head'
2024-09-04 00:33:32,927 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-04 00:33:32,927 [ scc.git] DEBUG * branch refs/pull/424/head -> FETCH_HEAD
2024-09-04 00:33:32,930 [ scc.git] DEBUG ## Unique users: []
2024-09-04 00:33:32,930 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:33:32,930 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:33:32,934 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-09-04 00:33:32,944 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:33:32,947 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-09-04 00:33:33,035 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-09-04 00:33:33,035 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-09-04 00:33:33,036 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:33:33,040 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-09-04 00:33:33,040 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-09-04 00:33:33,040 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-09-04 00:33:33,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:33:33,172 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-09-04 00:33:33,182 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:33:33,186 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-09-04 00:33:33,315 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-09-04 00:33:33,315 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-09-04 00:33:33,316 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:33:33,322 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-09-04 00:33:33,322 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-09-04 00:33:33,322 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-09-04 00:33:33,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:33:33,553 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-09-04 00:33:33,564 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:33:33,568 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 266 (errors: use raise_error from cli plugins) df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-09-04 00:33:33,598 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-09-04 00:33:33,599 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:33:33,601 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-09-04 00:33:33,601 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-09-04 00:33:33,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:33:33,938 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-09-04 00:33:33,948 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:33:33,952 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 299 (Add parents and children to omero obj) 09ae8033d77faf0346255eb9644207e02c98709a'
2024-09-04 00:33:34,107 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-09-04 00:33:34,107 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-09-04 00:33:34,108 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:33:34,111 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-09-04 00:33:34,111 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-09-04 00:33:34,111 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-09-04 00:33:34,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:33:34,330 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-09-04 00:33:34,341 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:33:34,345 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-09-04 00:33:34,450 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:33:34,453 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-09-04 00:33:34,453 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-09-04 00:33:34,453 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-09-04 00:33:34,453 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-09-04 00:33:34,453 [ scc.git] DEBUG create mode 100644 connect.py
2024-09-04 00:33:34,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:33:34,717 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-09-04 00:33:34,728 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:33:34,731 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 337 (bulk.yml depth is passed to xargs) 0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-09-04 00:33:34,785 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-09-04 00:33:34,786 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:33:34,789 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-09-04 00:33:34,789 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-09-04 00:33:35,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:33:35,098 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-09-04 00:33:35,108 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:33:35,111 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-09-04 00:33:35,231 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-09-04 00:33:35,231 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:33:35,235 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-09-04 00:33:35,235 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-09-04 00:33:35,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:33:35,495 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-09-04 00:33:35,506 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:33:35,509 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-09-04 00:33:35,612 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-09-04 00:33:35,613 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:33:35,619 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-09-04 00:33:35,619 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-09-04 00:33:35,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:33:35,878 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec'
2024-09-04 00:33:35,888 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:33:35,892 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 424 (Prevent hang on exit while omero.client keepalive is active) 0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec'
2024-09-04 00:33:35,911 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:33:35,914 [ scc.git] DEBUG src/omero/util/__init__.py | 8 +-------
2024-09-04 00:33:35,914 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 7 deletions(-)
2024-09-04 00:33:36,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:33:36,270 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:33:36,305 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:33:36,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:33:36,309 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:33:36,342 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:33:36,350 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b6ecd55b0> has no local changes
2024-09-04 00:33:36,351 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-py
Excluded PRs:
- PR 427 Rdornier 'Add fileset folder creation' (user: Rdornier)
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 408 jburel 'remove deprecated method'
- PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
Generated by OMERO-python-superbuild-push#163 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/163/)'
2024-09-04 00:33:36,358 [ scc.git] DEBUG [detached HEAD 3da532c7] merge master -Dorg -Ssuccess-only
2024-09-04 00:33:36,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-04 00:33:36,358 [ scc.git] INFO Overriding base-branch from master to develop
2024-09-04 00:33:36,358 [ scc.repo] DEBUG ## PRs found:
2024-09-04 00:33:36,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-09-04 00:33:37,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-09-04 00:33:37,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-09-04 00:33:38,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-09-04 00:33:38,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-09-04 00:33:39,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-09-04 00:33:39,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-09-04 00:33:40,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-04 00:33:40,738 [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
2024-09-04 00:33:41,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-04 00:33:41,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-09-04 00:33:41,538 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-04 00:33:41,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-09-04 00:33:42,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-09-04 00:33:42,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-09-04 00:33:43,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-09-04 00:33:43,422 [ scc.repo] DEBUG ## Branches found:
2024-09-04 00:33:43,422 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-09-04 00:33:43,422 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:33:43,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:33:43,426 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-09-04 00:33:43,429 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-04 00:33:43,430 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-09-04 00:33:43,434 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-09-04 00:33:43,438 [ scc.git] DEBUG Already up to date.
2024-09-04 00:33:43,438 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-09-04 00:33:43,881 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-09-04 00:33:43,881 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-09-04 00:33:43,885 [ scc.git] DEBUG ## Unique users: []
2024-09-04 00:33:43,885 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:33:43,885 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:33:43,889 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-04 00:33:43,895 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:33:43,898 [ 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'
2024-09-04 00:33:43,980 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-09-04 00:33:43,980 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-09-04 00:33:43,980 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-04 00:33:43,981 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-04 00:33:43,984 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-04 00:33:43,989 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-09-04 00:33:44,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:33:44,125 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-04 00:33:44,130 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-04 00:33:44,134 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#163](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/163/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/163/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-09-04 00:33:44,138 [ scc.config] DEBUG Found github.token
2024-09-04 00:33:44,138 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-09-04 00:33:44,138 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:33:44,171 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:33:44,171 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:33:44,175 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:33:44,208 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:33:44,213 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b6ed4beb0> has no local changes
2024-09-04 00:33:44,213 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- 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.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Generated by OMERO-python-superbuild-push#163 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/163/)'
2024-09-04 00:33:44,220 [ scc.git] DEBUG [detached HEAD 22e73c9] merge master -Dorg -Ssuccess-only
2024-09-04 00:33:44,220 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-04 00:33:44,220 [ scc.repo] DEBUG ## PRs found:
2024-09-04 00:33:44,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-09-04 00:33:45,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/576 HTTP/1.1" 200 None
2024-09-04 00:33:45,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341 HTTP/1.1" 200 None
2024-09-04 00:33:46,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-04 00:33:46,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-04 00:33:47,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341 HTTP/1.1" 200 None
2024-09-04 00:33:47,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/0663a746b95073b4bbb2b7459859a42b0fc4e341?per_page=1 HTTP/1.1" 200 None
2024-09-04 00:33:47,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341 HTTP/1.1" 200 None
2024-09-04 00:33:48,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341/status HTTP/1.1" 200 None
2024-09-04 00:33:48,308 [ scc.repo] DEBUG - PR 576 will-moore 'webclient page scaleable, login page device-width'
2024-09-04 00:33:48,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/574 HTTP/1.1" 200 None
2024-09-04 00:33:49,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/574/comments HTTP/1.1" 200 None
2024-09-04 00:33:49,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None
2024-09-04 00:33:50,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-04 00:33:50,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-04 00:33:51,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None
2024-09-04 00:33:51,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c?per_page=1 HTTP/1.1" 200 None
2024-09-04 00:33:51,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None
2024-09-04 00:33:52,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c/status HTTP/1.1" 200 None
2024-09-04 00:33:52,282 [ scc.repo] DEBUG - PR 574 will-moore 'Fix word wrap for names'
2024-09-04 00:33:52,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568 HTTP/1.1" 200 None
2024-09-04 00:33:53,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568/comments HTTP/1.1" 200 None
2024-09-04 00:33:53,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-09-04 00:33:54,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-09-04 00:33:54,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-09-04 00:33:54,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-09-04 00:33:55,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-09-04 00:33:55,990 [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
2024-09-04 00:33:56,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-04 00:33:56,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-09-04 00:33:57,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-09-04 00:33:57,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-09-04 00:33:58,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-09-04 00:33:58,269 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-09-04 00:33:58,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-09-04 00:33:59,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-09-04 00:33:59,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-09-04 00:34:00,157 [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
2024-09-04 00:34:00,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-04 00:34:01,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-09-04 00:34:01,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-09-04 00:34:01,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-09-04 00:34:02,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-09-04 00:34:02,354 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-09-04 00:34:02,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-09-04 00:34:03,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-09-04 00:34:03,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-09-04 00:34:04,198 [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
2024-09-04 00:34:04,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-09-04 00:34:04,670 [ scc.repo] DEBUG ## Branches found:
2024-09-04 00:34:04,670 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-09-04 00:34:04,671 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:34:04,671 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:34:04,675 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-04 00:34:04,679 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-04 00:34:04,679 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-04 00:34:04,683 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-04 00:34:04,688 [ scc.git] DEBUG Already up to date.
2024-09-04 00:34:04,688 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-09-04 00:34:05,049 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-04 00:34:05,049 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-09-04 00:34:05,053 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-09-04 00:34:05,383 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-04 00:34:05,383 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-09-04 00:34:05,387 [ scc.git] DEBUG Calling 'git fetch origin pull/574/head'
2024-09-04 00:34:05,788 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-04 00:34:05,788 [ scc.git] DEBUG * branch refs/pull/574/head -> FETCH_HEAD
2024-09-04 00:34:05,791 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-09-04 00:34:06,075 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-04 00:34:06,075 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-09-04 00:34:06,079 [ scc.git] DEBUG ## Unique users: []
2024-09-04 00:34:06,079 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:34:06,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:34:06,083 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-09-04 00:34:06,090 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:34:06,093 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 527 (Add some initial CSP settings to test) 5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-09-04 00:34:06,283 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-09-04 00:34:06,283 [ scc.git] DEBUG Auto-merging setup.py
2024-09-04 00:34:06,284 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:34:06,287 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-09-04 00:34:06,287 [ scc.git] DEBUG setup.py | 1 +
2024-09-04 00:34:06,287 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-09-04 00:34:06,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:34:06,430 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-09-04 00:34:06,438 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:34:06,441 [ 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'
2024-09-04 00:34:06,526 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-09-04 00:34:06,527 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-09-04 00:34:06,528 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:34:06,531 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-09-04 00:34:06,531 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-09-04 00:34:06,531 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-09-04 00:34:06,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:34:06,821 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ad846e500db8aa8ec32fe0ea9b828ecb44871c2c'
2024-09-04 00:34:06,827 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:34:06,830 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 574 (Fix word wrap for names) ad846e500db8aa8ec32fe0ea9b828ecb44871c2c'
2024-09-04 00:34:06,874 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:34:06,878 [ scc.git] DEBUG omeroweb/webclient/static/webclient/css/layout.css | 2 ++
2024-09-04 00:34:06,878 [ scc.git] DEBUG omeroweb/webclient/templates/webclient/annotations/includes/name.html | 4 ++--
2024-09-04 00:34:06,878 [ scc.git] DEBUG 2 files changed, 4 insertions(+), 2 deletions(-)
2024-09-04 00:34:07,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:34:07,205 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0663a746b95073b4bbb2b7459859a42b0fc4e341'
2024-09-04 00:34:07,211 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:34:07,215 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 576 (webclient page scaleable, login page device-width) 0663a746b95073b4bbb2b7459859a42b0fc4e341'
2024-09-04 00:34:07,231 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-04 00:34:07,234 [ scc.git] DEBUG omeroweb/webclient/templates/webclient/login.html | 3 ++-
2024-09-04 00:34:07,234 [ scc.git] DEBUG omeroweb/webgateway/templates/webgateway/base/base_main.html | 2 --
2024-09-04 00:34:07,234 [ scc.git] DEBUG 2 files changed, 2 insertions(+), 3 deletions(-)
2024-09-04 00:34:07,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:34:07,614 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-04 00:34:07,649 [ scc.git] DEBUG Get sha1 of %s
2024-09-04 00:34:07,649 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-04 00:34:07,652 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:34:07,685 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:34:07,693 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b6cc916d0> has no local changes
2024-09-04 00:34:07,693 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Already up to date.
Merged PRs:
- 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 574 will-moore 'Fix word wrap for names'
- PR 576 will-moore 'webclient page scaleable, login page device-width'
Generated by OMERO-python-superbuild-push#163 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/163/)'
2024-09-04 00:34:07,702 [ scc.git] DEBUG [detached HEAD dd4d13078] merge master -Dorg -Ssuccess-only
2024-09-04 00:34:07,703 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-04 00:34:07,703 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-04 00:34:07,745 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-09-04 00:34:07,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:34:08,008 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-09-04 00:34:08,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:34:08,393 [ scc.config] DEBUG Found submodule.omero-py.url
2024-09-04 00:34:08,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:34:08,776 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-09-04 00:34:09,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:34:09,161 [ scc.config] DEBUG Found submodule.omero-web.url
2024-09-04 00:34:09,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-04 00:34:09,542 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-04 00:34:09,565 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4b70ae4e20> has local changes
2024-09-04 00:34:09,565 [ 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 291 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `2b30141`'
Repository: ome/omero-dropbox
Already up to date.
Merged PRs:
- PR 16 joshmoore 'Review all instances of whitelist/blacklist'
Repository: ome/omero-marshal
Excluded PRs:
- PR 34 chris-allan 'Initial support for Event' (exclude comment)
- PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 will-moore 'Roi encoder allows Shape None'
Repository: ome/omero-py
Excluded PRs:
- PR 427 Rdornier 'Add fileset folder creation' (user: Rdornier)
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 408 jburel 'remove deprecated method'
- PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- 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.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Repository: ome/omero-web
Excluded PRs:
- PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Already up to date.
Merged PRs:
- 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 574 will-moore 'Fix word wrap for names'
- PR 576 will-moore 'webclient page scaleable, login page device-width'
Generated by OMERO-python-superbuild-push#163 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/163/)'
2024-09-04 00:34:09,573 [ scc.git] DEBUG [detached HEAD 717623a] merge master -Dorg -Ssuccess-only
2024-09-04 00:34:09,573 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-09-04 00:34:09,573 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-09-04 00:34:09,574 [ scc.merge] INFO Already up to date.
2024-09-04 00:34:09,574 [ scc.merge] INFO
2024-09-04 00:34:09,574 [ scc.merge] INFO Merged PRs:
2024-09-04 00:34:09,574 [ scc.merge] INFO - PR 291 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `2b30141`'
2024-09-04 00:34:09,574 [ scc.merge] INFO
2024-09-04 00:34:09,574 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-09-04 00:34:09,574 [ scc.merge] INFO Already up to date.
2024-09-04 00:34:09,574 [ scc.merge] INFO
2024-09-04 00:34:09,574 [ scc.merge] INFO Merged PRs:
2024-09-04 00:34:09,574 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-09-04 00:34:09,574 [ scc.merge] INFO
2024-09-04 00:34:09,574 [ scc.merge] INFO Repository: ome/omero-marshal
2024-09-04 00:34:09,574 [ scc.merge] INFO Excluded PRs:
2024-09-04 00:34:09,574 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-09-04 00:34:09,574 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-09-04 00:34:09,574 [ scc.merge] INFO Already up to date.
2024-09-04 00:34:09,574 [ scc.merge] INFO
2024-09-04 00:34:09,574 [ scc.merge] INFO Merged PRs:
2024-09-04 00:34:09,574 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-09-04 00:34:09,574 [ scc.merge] INFO
2024-09-04 00:34:09,574 [ scc.merge] INFO Repository: ome/omero-py
2024-09-04 00:34:09,574 [ scc.merge] INFO Excluded PRs:
2024-09-04 00:34:09,574 [ scc.merge] INFO - PR 427 Rdornier 'Add fileset folder creation' (user: Rdornier)
2024-09-04 00:34:09,574 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-09-04 00:34:09,574 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-09-04 00:34:09,574 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-09-04 00:34:09,574 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-09-04 00:34:09,574 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-09-04 00:34:09,574 [ scc.merge] INFO Already up to date.
2024-09-04 00:34:09,574 [ scc.merge] INFO
2024-09-04 00:34:09,574 [ scc.merge] INFO Merged PRs:
2024-09-04 00:34:09,574 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-09-04 00:34:09,575 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-09-04 00:34:09,575 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-09-04 00:34:09,575 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-09-04 00:34:09,575 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-09-04 00:34:09,575 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-09-04 00:34:09,575 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-09-04 00:34:09,575 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-09-04 00:34:09,575 [ scc.merge] INFO - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
2024-09-04 00:34:09,575 [ scc.merge] INFO
2024-09-04 00:34:09,575 [ scc.merge] INFO Repository: ome/omero-scripts
2024-09-04 00:34:09,575 [ scc.merge] INFO Excluded PRs:
2024-09-04 00:34:09,575 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-09-04 00:34:09,575 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-09-04 00:34:09,575 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-09-04 00:34:09,575 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-09-04 00:34:09,575 [ scc.merge] INFO Already up to date.
2024-09-04 00:34:09,575 [ scc.merge] INFO
2024-09-04 00:34:09,575 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-04 00:34:09,575 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-04 00:34:09,575 [ scc.merge] INFO
2024-09-04 00:34:09,575 [ scc.merge] INFO Repository: ome/omero-web
2024-09-04 00:34:09,575 [ scc.merge] INFO Excluded PRs:
2024-09-04 00:34:09,575 [ scc.merge] INFO - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
2024-09-04 00:34:09,575 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-09-04 00:34:09,575 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-09-04 00:34:09,575 [ scc.merge] INFO Already up to date.
2024-09-04 00:34:09,575 [ scc.merge] INFO
2024-09-04 00:34:09,575 [ scc.merge] INFO Merged PRs:
2024-09-04 00:34:09,575 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-09-04 00:34:09,575 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-09-04 00:34:09,575 [ scc.merge] INFO - PR 574 will-moore 'Fix word wrap for names'
2024-09-04 00:34:09,575 [ scc.merge] INFO - PR 576 will-moore 'webclient page scaleable, login page device-width'
2024-09-04 00:34:09,575 [ scc.merge] INFO
2024-09-04 00:34:09,575 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-04 00:34:09,576 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:34:09,579 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-09-04 00:34:09,579 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:34:09,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-04 00:34:09,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-09-04 00:34:09,582 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:34:09,586 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-04 00:34:09,586 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-09-04 00:34:09,586 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:34:09,589 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-04 00:34:09,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-09-04 00:34:09,590 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:34:09,593 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-04 00:34:09,593 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-09-04 00:34:09,593 [ scc.git] DEBUG Calling 'git remote'
2024-09-04 00:34:09,596 [ 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.5.5-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.9/urllib/request.py", line 214, in urlopen
return opener.open(url, data, timeout)
File "/usr/lib64/python3.9/urllib/request.py", line 523, in open
response = meth(req, response)
File "/usr/lib64/python3.9/urllib/request.py", line 632, in http_response
response = self.parent.error(
File "/usr/lib64/python3.9/urllib/request.py", line 561, in error
return self._call_chain(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 494, in _call_chain
result = func(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 641, 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.5.5-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.9/urllib/request.py", line 214, in urlopen
return opener.open(url, data, timeout)
File "/usr/lib64/python3.9/urllib/request.py", line 523, in open
response = meth(req, response)
File "/usr/lib64/python3.9/urllib/request.py", line 632, in http_response
response = self.parent.error(
File "/usr/lib64/python3.9/urllib/request.py", line 561, in error
return self._call_chain(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 494, in _call_chain
result = func(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 641, 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 a4307f4
nothing to commit, working tree clean
Entering 'omero-marshal'
HEAD detached from cca4c2f
nothing to commit, working tree clean
Entering 'omero-py'
HEAD detached from 749a68ac
nothing to commit, working tree clean
Entering 'omero-scripts'
HEAD detached from 312afbe
nothing to commit, working tree clean
Entering 'omero-web'
HEAD detached from 2b30141f0
nothing to commit, working tree clean
HEAD detached from 18cc8a4
nothing to commit, working tree clean
2024-09-04 00:34:37,040 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/9ed1fe1f/images/svgs/logo.svg){kind=logo}
