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-05 00:33:42,175 [ scc.config] DEBUG Found github.token
2024-09-05 00:33:42,178 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-09-05 00:33:42,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:33:42,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:33:43,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-09-05 00:33:43,159 [ scc.gh] DEBUG 4998 remaining from 5000 (Reset at 01:09
2024-09-05 00:33:43,159 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-05 00:33:43,164 [ scc.git] DEBUG Check current status
2024-09-05 00:33:43,164 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-05 00:33:43,168 [ scc.git] DEBUG 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-09-05 00:33:43,168 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-05 00:33:43,210 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-05 00:33:43,213 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-05 00:33:43,217 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-05 00:33:43,220 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-05 00:33:43,392 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-09-05 00:33:43,397 [ scc.config] DEBUG Found remote.origin.url
2024-09-05 00:33:43,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-09-05 00:33:44,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-05 00:33:44,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-05 00:33:44,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-05 00:33:45,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-05 00:33:45,311 [ scc.git] DEBUG Resetting...
2024-09-05 00:33:45,311 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-09-05 00:33:45,316 [ scc.git] DEBUG HEAD is now at 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-09-05 00:33:45,316 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-09-05 00:33:45,366 [ scc.git] DEBUG Check current status
2024-09-05 00:33:45,367 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-05 00:33:45,370 [ scc.git] DEBUG 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-09-05 00:33:45,371 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-05 00:33:45,413 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-05 00:33:45,415 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-05 00:33:45,419 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-05 00:33:45,422 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-05 00:33:45,427 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-09-05 00:33:45,428 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-09-05 00:33:45,428 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-09-05 00:33:45,428 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-09-05 00:33:45,428 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-09-05 00:33:45,428 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-09-05 00:33:45,428 [ scc.repo] DEBUG ## PRs found:
2024-09-05 00:33:45,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-09-05 00:33:46,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/291 HTTP/1.1" 200 None
2024-09-05 00:33:46,246 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-05 00:33:46,246 [ scc.repo] DEBUG - PR 291 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `2b30141`'
2024-09-05 00:33:46,246 [ scc.repo] DEBUG ## Branches found:
2024-09-05 00:33:46,246 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:33:46,246 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:33:46,251 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-05 00:33:46,255 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-05 00:33:46,256 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-05 00:33:46,260 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-05 00:33:46,264 [ scc.git] DEBUG Already up to date.
2024-09-05 00:33:46,264 [ scc.git] DEBUG Calling 'git fetch origin pull/291/head'
2024-09-05 00:33:46,569 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-09-05 00:33:46,570 [ scc.git] DEBUG * branch refs/pull/291/head -> FETCH_HEAD
2024-09-05 00:33:46,575 [ scc.git] DEBUG ## Unique users: []
2024-09-05 00:33:46,575 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:33:46,575 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:33:46,579 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...05f25c9f27af6269fa4ea407e603b23b408b34e4'
2024-09-05 00:33:46,588 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:33:46,592 [ 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-05 00:33:46,601 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:33:46,603 [ scc.git] DEBUG omero-web | 2 +-
2024-09-05 00:33:46,603 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-09-05 00:33:46,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:33:46,744 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:33:46,845 [ scc.git] DEBUG Submodule path 'omero-web': checked out '2b30141f008dbb3ef72cc06a3600f4a64f324c70'
2024-09-05 00:33:46,846 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:33:46,846 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:33:46,850 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:33:47,004 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff19fd53e50> has no local changes
2024-09-05 00:33:47,005 [ 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#164 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/164/)'
2024-09-05 00:33:47,033 [ scc.git] DEBUG [detached HEAD a932e1e] merge master -Dorg -Snone
2024-09-05 00:33:47,034 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-09-05 00:33:47,034 [ scc.merge] INFO Already up to date.
2024-09-05 00:33:47,034 [ scc.merge] INFO
2024-09-05 00:33:47,034 [ scc.merge] INFO Merged PRs:
2024-09-05 00:33:47,034 [ scc.merge] INFO - PR 291 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `2b30141`'
2024-09-05 00:33:47,034 [ scc.merge] INFO
2024-09-05 00:33:47,034 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-05 00:33:47,034 [ 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-05 00:33:49,203 [ scc.config] DEBUG Found github.token
2024-09-05 00:33:49,206 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-09-05 00:33:49,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:33:49,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:33:50,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-09-05 00:33:50,137 [ scc.gh] DEBUG 4988 remaining from 5000 (Reset at 01:09
2024-09-05 00:33:50,138 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-05 00:33:50,142 [ scc.git] DEBUG Check current status
2024-09-05 00:33:50,143 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-05 00:33:50,147 [ scc.git] DEBUG a932e1e merge master -Dorg -Snone
2024-09-05 00:33:50,147 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-05 00:33:50,192 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-05 00:33:50,196 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-05 00:33:50,200 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-05 00:33:50,204 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-05 00:33:50,207 [ scc.git] DEBUG 2b30141f008dbb3ef72cc06a3600f4a64f324c70 omero-web (v5.27.1-1-g2b30141f0)
2024-09-05 00:33:50,212 [ scc.config] DEBUG Found remote.origin.url
2024-09-05 00:33:50,212 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-09-05 00:33:50,214 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-09-05 00:33:50,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-09-05 00:33:51,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-05 00:33:51,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-05 00:33:51,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-05 00:33:52,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-05 00:33:52,282 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:33:52,331 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-09-05 00:33:52,332 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-05 00:33:52,335 [ scc.git] DEBUG Check current status
2024-09-05 00:33:52,335 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-05 00:33:52,339 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-09-05 00:33:52,339 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-05 00:33:52,384 [ scc.config] DEBUG Found remote.origin.url
2024-09-05 00:33:52,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-09-05 00:33:53,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-05 00:33:53,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-05 00:33:54,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-05 00:33:54,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-05 00:33:54,412 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:33:54,463 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-05 00:33:54,465 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-09-05 00:33:54,465 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-05 00:33:54,471 [ scc.git] DEBUG Check current status
2024-09-05 00:33:54,471 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-05 00:33:54,477 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-09-05 00:33:54,477 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-05 00:33:54,539 [ scc.config] DEBUG Found remote.origin.url
2024-09-05 00:33:54,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-09-05 00:33:55,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-05 00:33:55,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-05 00:33:56,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-05 00:33:56,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-05 00:33:56,592 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:33:56,635 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-05 00:33:56,637 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-09-05 00:33:56,637 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-05 00:33:56,641 [ scc.git] DEBUG Check current status
2024-09-05 00:33:56,641 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-05 00:33:56,645 [ scc.git] DEBUG 749a68ac Bump version: 5.19.4 → 5.19.5.dev0
2024-09-05 00:33:56,646 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-05 00:33:56,692 [ scc.config] DEBUG Found remote.origin.url
2024-09-05 00:33:57,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-09-05 00:33:57,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-05 00:33:57,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-05 00:33:58,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-05 00:33:58,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-05 00:33:58,822 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:33:58,865 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-05 00:33:58,866 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-09-05 00:33:58,866 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-05 00:33:58,871 [ scc.git] DEBUG Check current status
2024-09-05 00:33:58,871 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-05 00:33:58,875 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-09-05 00:33:58,876 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-05 00:33:58,921 [ scc.config] DEBUG Found remote.origin.url
2024-09-05 00:33:58,922 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-09-05 00:33:59,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-09-05 00:33:59,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-05 00:34:00,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-05 00:34:00,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-05 00:34:00,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-05 00:34:00,965 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:34:01,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-05 00:34:01,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-09-05 00:34:01,010 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-05 00:34:01,015 [ scc.git] DEBUG Check current status
2024-09-05 00:34:01,015 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-05 00:34:01,019 [ scc.git] DEBUG 2b30141f0 Bump version: 5.27.1 → 5.27.2.dev0
2024-09-05 00:34:01,020 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-05 00:34:01,062 [ scc.config] DEBUG Found remote.origin.url
2024-09-05 00:34:01,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-09-05 00:34:01,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-05 00:34:02,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-05 00:34:02,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-05 00:34:03,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-05 00:34:03,162 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:34:03,205 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-05 00:34:03,206 [ scc.git] DEBUG Resetting...
2024-09-05 00:34:03,206 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-09-05 00:34:03,212 [ scc.git] DEBUG HEAD is now at a932e1e merge master -Dorg -Snone
2024-09-05 00:34:03,212 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-09-05 00:34:03,263 [ scc.git] DEBUG Check current status
2024-09-05 00:34:03,263 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-05 00:34:03,268 [ scc.git] DEBUG a932e1e merge master -Dorg -Snone
2024-09-05 00:34:03,268 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-05 00:34:03,307 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-05 00:34:03,309 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-05 00:34:03,313 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-05 00:34:03,316 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-05 00:34:03,319 [ scc.git] DEBUG 2b30141f008dbb3ef72cc06a3600f4a64f324c70 omero-web (v5.27.1-1-g2b30141f0)
2024-09-05 00:34:03,320 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-09-05 00:34:03,320 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-09-05 00:34:03,321 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-09-05 00:34:03,321 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-09-05 00:34:03,321 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-09-05 00:34:03,321 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-09-05 00:34:03,321 [ scc.repo] DEBUG ## PRs found:
2024-09-05 00:34:03,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-09-05 00:34:04,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/291 HTTP/1.1" 200 None
2024-09-05 00:34:04,138 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-05 00:34:04,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/05f25c9f27af6269fa4ea407e603b23b408b34e4 HTTP/1.1" 200 None
2024-09-05 00:34:05,156 [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-05 00:34:05,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/05f25c9f27af6269fa4ea407e603b23b408b34e4 HTTP/1.1" 200 None
2024-09-05 00:34:06,100 [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-05 00:34:06,101 [ scc.repo] DEBUG - PR 291 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `2b30141`'
2024-09-05 00:34:06,101 [ scc.repo] DEBUG ## Branches found:
2024-09-05 00:34:06,101 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:34:06,101 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:34:06,107 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-05 00:34:06,112 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-05 00:34:06,112 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-05 00:34:06,117 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-05 00:34:06,122 [ scc.git] DEBUG Already up to date.
2024-09-05 00:34:06,122 [ scc.git] DEBUG Calling 'git fetch origin pull/291/head'
2024-09-05 00:34:06,456 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-09-05 00:34:06,457 [ scc.git] DEBUG * branch refs/pull/291/head -> FETCH_HEAD
2024-09-05 00:34:06,461 [ scc.git] DEBUG ## Unique users: []
2024-09-05 00:34:06,462 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:34:06,462 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:34:06,467 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...05f25c9f27af6269fa4ea407e603b23b408b34e4'
2024-09-05 00:34:06,472 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:34:06,475 [ 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-05 00:34:06,480 [ scc.git] DEBUG Already up to date.
2024-09-05 00:34:06,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:34:06,626 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:34:06,666 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:34:06,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:34:06,671 [ scc.repo] DEBUG ## PRs found:
2024-09-05 00:34:07,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-09-05 00:34:07,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-09-05 00:34:08,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-09-05 00:34:08,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-09-05 00:34:08,987 [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-05 00:34:09,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-09-05 00:34:09,909 [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-05 00:34:09,910 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-09-05 00:34:09,910 [ scc.repo] DEBUG ## Branches found:
2024-09-05 00:34:09,910 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-09-05 00:34:09,910 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:34:09,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:34:09,915 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-05 00:34:09,918 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-05 00:34:09,919 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-05 00:34:09,922 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-05 00:34:09,927 [ scc.git] DEBUG Already up to date.
2024-09-05 00:34:09,927 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-09-05 00:34:10,255 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-09-05 00:34:10,255 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-09-05 00:34:10,260 [ scc.git] DEBUG ## Unique users: []
2024-09-05 00:34:10,260 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:34:10,260 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:34:10,266 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-09-05 00:34:10,270 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:34:10,275 [ 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-05 00:34:10,377 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-09-05 00:34:10,378 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-09-05 00:34:10,378 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-09-05 00:34:10,378 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-09-05 00:34:10,378 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-09-05 00:34:10,378 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-09-05 00:34:10,378 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-09-05 00:34:10,378 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-09-05 00:34:10,378 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-09-05 00:34:10,379 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:34:10,382 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-09-05 00:34:10,383 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-09-05 00:34:10,383 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-09-05 00:34:10,383 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-09-05 00:34:10,383 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-09-05 00:34:10,383 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-09-05 00:34:10,383 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-09-05 00:34:10,383 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-09-05 00:34:10,383 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-09-05 00:34:10,383 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-09-05 00:34:10,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:34:10,516 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:34:10,560 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:34:10,560 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:34:10,564 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:34:10,604 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:34:10,612 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f43d3040820> has no local changes
2024-09-05 00:34:10,612 [ 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#164 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/164/)'
2024-09-05 00:34:10,620 [ scc.git] DEBUG [detached HEAD 3369ed1] merge master -Dorg -Ssuccess-only
2024-09-05 00:34:10,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-05 00:34:10,621 [ scc.repo] DEBUG ## PRs found:
2024-09-05 00:34:11,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-09-05 00:34:11,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-09-05 00:34:11,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-09-05 00:34:12,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-09-05 00:34:12,937 [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-05 00:34:13,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-09-05 00:34:13,829 [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-05 00:34:13,829 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-09-05 00:34:14,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-09-05 00:34:14,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-09-05 00:34:15,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-09-05 00:34:15,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-09-05 00:34:15,626 [ scc.repo] DEBUG ## Branches found:
2024-09-05 00:34:15,627 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-09-05 00:34:15,627 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:34:15,627 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:34:15,631 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-05 00:34:15,635 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-05 00:34:15,635 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-05 00:34:15,639 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-05 00:34:15,644 [ scc.git] DEBUG Already up to date.
2024-09-05 00:34:15,645 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-09-05 00:34:16,088 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-09-05 00:34:16,088 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-09-05 00:34:16,093 [ scc.git] DEBUG ## Unique users: []
2024-09-05 00:34:16,093 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:34:16,093 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:34:16,099 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-09-05 00:34:16,105 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:34:16,109 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-09-05 00:34:16,134 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-09-05 00:34:16,135 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:34:16,138 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-09-05 00:34:16,138 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-09-05 00:34:16,138 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-09-05 00:34:16,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:34:16,274 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:34:16,316 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:34:16,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:34:16,321 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:34:16,361 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:34:16,367 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f43d1f15670> has no local changes
2024-09-05 00:34:16,367 [ 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#164 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/164/)'
2024-09-05 00:34:16,376 [ scc.git] DEBUG [detached HEAD fc42686] merge master -Dorg -Ssuccess-only
2024-09-05 00:34:16,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-05 00:34:16,377 [ scc.repo] DEBUG ## PRs found:
2024-09-05 00:34:16,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-09-05 00:34:17,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427 HTTP/1.1" 200 None
2024-09-05 00:34:17,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/424 HTTP/1.1" 200 None
2024-09-05 00:34:18,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/424/comments HTTP/1.1" 200 None
2024-09-05 00:34:18,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None
2024-09-05 00:34:19,365 [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-05 00:34:19,831 [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-05 00:34:20,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None
2024-09-05 00:34:20,662 [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-05 00:34:21,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None
2024-09-05 00:34:21,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec/status HTTP/1.1" 200 None
2024-09-05 00:34:21,535 [ scc.repo] DEBUG - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
2024-09-05 00:34:21,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-09-05 00:34:22,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-09-05 00:34:22,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-09-05 00:34:23,435 [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-05 00:34:23,879 [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-05 00:34:24,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-09-05 00:34:24,824 [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-05 00:34:25,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-09-05 00:34:25,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-09-05 00:34:25,677 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-09-05 00:34:26,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-09-05 00:34:26,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-09-05 00:34:27,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-09-05 00:34:27,591 [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-05 00:34:28,079 [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-05 00:34:28,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-09-05 00:34:29,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-09-05 00:34:29,495 [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-05 00:34:29,906 [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-05 00:34:30,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-09-05 00:34:30,833 [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-05 00:34:31,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-09-05 00:34:31,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-09-05 00:34:31,753 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-09-05 00:34:32,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-09-05 00:34:32,217 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-09-05 00:34:32,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-09-05 00:34:33,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-09-05 00:34:33,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-09-05 00:34:34,013 [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-05 00:34:34,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-09-05 00:34:34,928 [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-05 00:34:34,929 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-09-05 00:34:35,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-09-05 00:34:35,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-09-05 00:34:36,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-09-05 00:34:36,834 [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-05 00:34:37,350 [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-05 00:34:37,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-09-05 00:34:38,230 [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-05 00:34:38,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-09-05 00:34:39,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-09-05 00:34:39,140 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-09-05 00:34:39,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-09-05 00:34:40,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-09-05 00:34:40,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-09-05 00:34:41,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-09-05 00:34:41,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-09-05 00:34:42,007 [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-05 00:34:42,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-09-05 00:34:42,952 [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-05 00:34:42,954 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-09-05 00:34:43,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-09-05 00:34:43,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-09-05 00:34:44,336 [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-05 00:34:44,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-09-05 00:34:45,173 [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-05 00:34:45,174 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-09-05 00:34:45,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-09-05 00:34:46,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-09-05 00:34:46,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-09-05 00:34:47,069 [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-05 00:34:47,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-09-05 00:34:47,967 [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-05 00:34:47,968 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-09-05 00:34:48,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-09-05 00:34:48,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-09-05 00:34:49,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-09-05 00:34:49,825 [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-05 00:34:50,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-09-05 00:34:50,665 [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-05 00:34:50,666 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-09-05 00:34:51,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-09-05 00:34:51,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-09-05 00:34:52,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-09-05 00:34:52,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-09-05 00:34:52,560 [ scc.repo] DEBUG ## Branches found:
2024-09-05 00:34:52,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-09-05 00:34:52,561 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:34:52,561 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:34:52,568 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-05 00:34:52,575 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-05 00:34:52,575 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-05 00:34:52,582 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-05 00:34:52,589 [ scc.git] DEBUG Already up to date.
2024-09-05 00:34:52,590 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-09-05 00:34:53,395 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-05 00:34:53,395 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-09-05 00:34:53,402 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-09-05 00:34:53,761 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-05 00:34:53,761 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-09-05 00:34:53,768 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-09-05 00:34:54,098 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-05 00:34:54,098 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-09-05 00:34:54,105 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-09-05 00:34:54,406 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-05 00:34:54,407 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-09-05 00:34:54,413 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-09-05 00:34:54,763 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-05 00:34:54,763 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-09-05 00:34:54,770 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-09-05 00:34:55,059 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-05 00:34:55,059 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-09-05 00:34:55,065 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-09-05 00:34:55,365 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-05 00:34:55,365 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-09-05 00:34:55,372 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-09-05 00:34:55,748 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-05 00:34:55,748 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-09-05 00:34:55,755 [ scc.git] DEBUG Calling 'git fetch origin pull/424/head'
2024-09-05 00:34:56,151 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-05 00:34:56,151 [ scc.git] DEBUG * branch refs/pull/424/head -> FETCH_HEAD
2024-09-05 00:34:56,158 [ scc.git] DEBUG ## Unique users: []
2024-09-05 00:34:56,158 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:34:56,158 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:34:56,163 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-09-05 00:34:56,176 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:34:56,184 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-09-05 00:34:56,260 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-09-05 00:34:56,260 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-09-05 00:34:56,261 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:34:56,267 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-09-05 00:34:56,267 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-09-05 00:34:56,267 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-09-05 00:34:56,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:34:56,401 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-09-05 00:34:56,417 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:34:56,422 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-09-05 00:34:56,572 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-09-05 00:34:56,573 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-09-05 00:34:56,573 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:34:56,582 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-09-05 00:34:56,582 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-09-05 00:34:56,582 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-09-05 00:34:56,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:34:56,790 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-09-05 00:34:56,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:34:56,809 [ 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-05 00:34:56,947 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-09-05 00:34:56,949 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:34:56,953 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-09-05 00:34:56,953 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-09-05 00:34:57,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:34:57,179 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-09-05 00:34:57,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:34:57,197 [ 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-05 00:34:57,308 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-09-05 00:34:57,309 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-09-05 00:34:57,311 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:34:57,315 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-09-05 00:34:57,315 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-09-05 00:34:57,315 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-09-05 00:34:57,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:34:57,564 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-09-05 00:34:57,584 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:34:57,590 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-09-05 00:34:57,631 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:34:57,634 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-09-05 00:34:57,634 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-09-05 00:34:57,634 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-09-05 00:34:57,634 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-09-05 00:34:57,634 [ scc.git] DEBUG create mode 100644 connect.py
2024-09-05 00:34:57,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:34:57,973 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-09-05 00:34:57,990 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:34:57,998 [ 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-05 00:34:58,051 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-09-05 00:34:58,053 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:34:58,057 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-09-05 00:34:58,057 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-09-05 00:34:58,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:34:58,356 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-09-05 00:34:58,369 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:34:58,374 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-09-05 00:34:58,459 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-09-05 00:34:58,461 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:34:58,465 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-09-05 00:34:58,465 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-09-05 00:34:58,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:34:58,752 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-09-05 00:34:58,766 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:34:58,772 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-09-05 00:34:58,877 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-09-05 00:34:58,878 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:34:58,886 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-09-05 00:34:58,886 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-09-05 00:34:59,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:34:59,140 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec'
2024-09-05 00:34:59,154 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:34:59,161 [ 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-05 00:34:59,188 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:34:59,193 [ scc.git] DEBUG src/omero/util/__init__.py | 8 +-------
2024-09-05 00:34:59,193 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 7 deletions(-)
2024-09-05 00:34:59,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:34:59,531 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:34:59,576 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:34:59,576 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:34:59,582 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:34:59,630 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:34:59,638 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f43d1f15580> has no local changes
2024-09-05 00:34:59,638 [ 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#164 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/164/)'
2024-09-05 00:34:59,652 [ scc.git] DEBUG [detached HEAD 524c21de] merge master -Dorg -Ssuccess-only
2024-09-05 00:34:59,652 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-05 00:34:59,652 [ scc.git] INFO Overriding base-branch from master to develop
2024-09-05 00:34:59,652 [ scc.repo] DEBUG ## PRs found:
2024-09-05 00:35:00,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-09-05 00:35:00,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-09-05 00:35:01,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-09-05 00:35:01,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-09-05 00:35:02,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-09-05 00:35:02,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-09-05 00:35:02,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-09-05 00:35:03,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-05 00:35:03,898 [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-05 00:35:04,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-05 00:35:04,781 [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-05 00:35:04,782 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-05 00:35:05,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-09-05 00:35:05,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-09-05 00:35:06,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-09-05 00:35:06,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-09-05 00:35:06,722 [ scc.repo] DEBUG ## Branches found:
2024-09-05 00:35:06,722 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-09-05 00:35:06,723 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:35:06,724 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:35:06,730 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-09-05 00:35:06,735 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-05 00:35:06,735 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-09-05 00:35:06,740 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-09-05 00:35:06,746 [ scc.git] DEBUG Already up to date.
2024-09-05 00:35:06,746 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-09-05 00:35:07,237 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-09-05 00:35:07,237 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-09-05 00:35:07,243 [ scc.git] DEBUG ## Unique users: []
2024-09-05 00:35:07,243 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:35:07,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:35:07,248 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-05 00:35:07,255 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:35:07,261 [ 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-05 00:35:07,303 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-09-05 00:35:07,304 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-09-05 00:35:07,304 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-05 00:35:07,304 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-05 00:35:07,310 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-05 00:35:07,318 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-09-05 00:35:07,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:35:07,455 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-05 00:35:07,462 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-05 00:35:07,468 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#164](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/164/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/164/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-09-05 00:35:07,473 [ scc.config] DEBUG Found github.token
2024-09-05 00:35:07,473 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-09-05 00:35:07,473 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:35:07,518 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:35:07,519 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:35:07,524 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:35:07,574 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:35:07,581 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f43d1f8ac40> has no local changes
2024-09-05 00:35:07,581 [ 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#164 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/164/)'
2024-09-05 00:35:07,591 [ scc.git] DEBUG [detached HEAD f874441] merge master -Dorg -Ssuccess-only
2024-09-05 00:35:07,592 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-05 00:35:07,592 [ scc.repo] DEBUG ## PRs found:
2024-09-05 00:35:08,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-09-05 00:35:08,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/576 HTTP/1.1" 200 None
2024-09-05 00:35:09,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341 HTTP/1.1" 200 None
2024-09-05 00:35:09,529 [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-05 00:35:10,064 [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-05 00:35:10,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341 HTTP/1.1" 200 None
2024-09-05 00:35:10,888 [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-05 00:35:11,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341 HTTP/1.1" 200 None
2024-09-05 00:35:11,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341/status HTTP/1.1" 200 None
2024-09-05 00:35:11,770 [ scc.repo] DEBUG - PR 576 will-moore 'webclient page scaleable, login page device-width'
2024-09-05 00:35:12,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/574 HTTP/1.1" 200 None
2024-09-05 00:35:12,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/574/comments HTTP/1.1" 200 None
2024-09-05 00:35:13,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None
2024-09-05 00:35:13,712 [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-05 00:35:14,164 [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-05 00:35:14,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None
2024-09-05 00:35:15,279 [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-05 00:35:15,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None
2024-09-05 00:35:16,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c/status HTTP/1.1" 200 None
2024-09-05 00:35:16,114 [ scc.repo] DEBUG - PR 574 will-moore 'Fix word wrap for names'
2024-09-05 00:35:16,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568 HTTP/1.1" 200 None
2024-09-05 00:35:17,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568/comments HTTP/1.1" 200 None
2024-09-05 00:35:17,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-09-05 00:35:17,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-09-05 00:35:18,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-09-05 00:35:18,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-09-05 00:35:19,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-09-05 00:35:19,927 [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-05 00:35:20,434 [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-05 00:35:20,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-09-05 00:35:21,354 [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-05 00:35:21,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-09-05 00:35:22,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-09-05 00:35:22,218 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-09-05 00:35:22,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-09-05 00:35:23,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-09-05 00:35:23,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-09-05 00:35:24,104 [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-05 00:35:24,571 [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-05 00:35:25,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-09-05 00:35:25,471 [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-05 00:35:25,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-09-05 00:35:26,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-09-05 00:35:26,319 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-09-05 00:35:26,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-09-05 00:35:27,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-09-05 00:35:27,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-09-05 00:35:28,221 [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-05 00:35:28,688 [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-05 00:35:28,690 [ scc.repo] DEBUG ## Branches found:
2024-09-05 00:35:28,690 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-09-05 00:35:28,690 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:35:28,690 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:35:28,695 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-05 00:35:28,699 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-05 00:35:28,699 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-05 00:35:28,705 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-05 00:35:28,710 [ scc.git] DEBUG Already up to date.
2024-09-05 00:35:28,711 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-09-05 00:35:29,191 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-05 00:35:29,192 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-09-05 00:35:29,198 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-09-05 00:35:29,536 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-05 00:35:29,536 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-09-05 00:35:29,541 [ scc.git] DEBUG Calling 'git fetch origin pull/574/head'
2024-09-05 00:35:29,912 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-05 00:35:29,913 [ scc.git] DEBUG * branch refs/pull/574/head -> FETCH_HEAD
2024-09-05 00:35:29,917 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-09-05 00:35:30,280 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-05 00:35:30,280 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-09-05 00:35:30,285 [ scc.git] DEBUG ## Unique users: []
2024-09-05 00:35:30,285 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:35:30,286 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:35:30,292 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-09-05 00:35:30,301 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:35:30,309 [ 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-05 00:35:30,380 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-09-05 00:35:30,381 [ scc.git] DEBUG Auto-merging setup.py
2024-09-05 00:35:30,382 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:35:30,386 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-09-05 00:35:30,386 [ scc.git] DEBUG setup.py | 1 +
2024-09-05 00:35:30,386 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-09-05 00:35:30,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:35:30,522 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-09-05 00:35:30,531 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:35:30,537 [ 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-05 00:35:30,651 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-09-05 00:35:30,651 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-09-05 00:35:30,652 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:35:30,657 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-09-05 00:35:30,657 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-09-05 00:35:30,657 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-09-05 00:35:30,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:35:30,909 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ad846e500db8aa8ec32fe0ea9b828ecb44871c2c'
2024-09-05 00:35:30,918 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:35:30,923 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 574 (Fix word wrap for names) ad846e500db8aa8ec32fe0ea9b828ecb44871c2c'
2024-09-05 00:35:30,972 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:35:30,977 [ scc.git] DEBUG omeroweb/webclient/static/webclient/css/layout.css | 2 ++
2024-09-05 00:35:30,977 [ scc.git] DEBUG omeroweb/webclient/templates/webclient/annotations/includes/name.html | 4 ++--
2024-09-05 00:35:30,977 [ scc.git] DEBUG 2 files changed, 4 insertions(+), 2 deletions(-)
2024-09-05 00:35:31,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:35:31,311 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0663a746b95073b4bbb2b7459859a42b0fc4e341'
2024-09-05 00:35:31,321 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:35:31,326 [ 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-05 00:35:31,348 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-05 00:35:31,351 [ scc.git] DEBUG omeroweb/webclient/templates/webclient/login.html | 3 ++-
2024-09-05 00:35:31,351 [ scc.git] DEBUG omeroweb/webgateway/templates/webgateway/base/base_main.html | 2 --
2024-09-05 00:35:31,352 [ scc.git] DEBUG 2 files changed, 2 insertions(+), 3 deletions(-)
2024-09-05 00:35:31,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:35:31,689 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-05 00:35:31,736 [ scc.git] DEBUG Get sha1 of %s
2024-09-05 00:35:31,736 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-05 00:35:31,741 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:35:31,790 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:35:31,800 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f43d1f3fbb0> has no local changes
2024-09-05 00:35:31,801 [ 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#164 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/164/)'
2024-09-05 00:35:31,814 [ scc.git] DEBUG [detached HEAD db0a9c530] merge master -Dorg -Ssuccess-only
2024-09-05 00:35:31,814 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-05 00:35:31,815 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-05 00:35:31,874 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-09-05 00:35:32,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:35:32,090 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-09-05 00:35:32,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:35:32,470 [ scc.config] DEBUG Found submodule.omero-py.url
2024-09-05 00:35:32,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:35:32,856 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-09-05 00:35:33,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:35:33,246 [ scc.config] DEBUG Found submodule.omero-web.url
2024-09-05 00:35:33,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-05 00:35:33,622 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-05 00:35:33,651 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f43d3d32e50> has local changes
2024-09-05 00:35:33,652 [ 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#164 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/164/)'
2024-09-05 00:35:33,661 [ scc.git] DEBUG [detached HEAD 88cdfaa] merge master -Dorg -Ssuccess-only
2024-09-05 00:35:33,661 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-09-05 00:35:33,662 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-09-05 00:35:33,662 [ scc.merge] INFO Already up to date.
2024-09-05 00:35:33,662 [ scc.merge] INFO
2024-09-05 00:35:33,662 [ scc.merge] INFO Merged PRs:
2024-09-05 00:35:33,662 [ scc.merge] INFO - PR 291 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `2b30141`'
2024-09-05 00:35:33,662 [ scc.merge] INFO
2024-09-05 00:35:33,662 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-09-05 00:35:33,662 [ scc.merge] INFO Already up to date.
2024-09-05 00:35:33,662 [ scc.merge] INFO
2024-09-05 00:35:33,662 [ scc.merge] INFO Merged PRs:
2024-09-05 00:35:33,662 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-09-05 00:35:33,662 [ scc.merge] INFO
2024-09-05 00:35:33,662 [ scc.merge] INFO Repository: ome/omero-marshal
2024-09-05 00:35:33,662 [ scc.merge] INFO Excluded PRs:
2024-09-05 00:35:33,662 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-09-05 00:35:33,662 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-09-05 00:35:33,662 [ scc.merge] INFO Already up to date.
2024-09-05 00:35:33,662 [ scc.merge] INFO
2024-09-05 00:35:33,662 [ scc.merge] INFO Merged PRs:
2024-09-05 00:35:33,662 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-09-05 00:35:33,662 [ scc.merge] INFO
2024-09-05 00:35:33,662 [ scc.merge] INFO Repository: ome/omero-py
2024-09-05 00:35:33,662 [ scc.merge] INFO Excluded PRs:
2024-09-05 00:35:33,663 [ scc.merge] INFO - PR 427 Rdornier 'Add fileset folder creation' (user: Rdornier)
2024-09-05 00:35:33,663 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-09-05 00:35:33,663 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-09-05 00:35:33,663 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-09-05 00:35:33,663 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-09-05 00:35:33,663 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-09-05 00:35:33,663 [ scc.merge] INFO Already up to date.
2024-09-05 00:35:33,663 [ scc.merge] INFO
2024-09-05 00:35:33,663 [ scc.merge] INFO Merged PRs:
2024-09-05 00:35:33,663 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-09-05 00:35:33,663 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-09-05 00:35:33,663 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-09-05 00:35:33,663 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-09-05 00:35:33,663 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-09-05 00:35:33,663 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-09-05 00:35:33,663 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-09-05 00:35:33,663 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-09-05 00:35:33,663 [ scc.merge] INFO - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
2024-09-05 00:35:33,663 [ scc.merge] INFO
2024-09-05 00:35:33,663 [ scc.merge] INFO Repository: ome/omero-scripts
2024-09-05 00:35:33,663 [ scc.merge] INFO Excluded PRs:
2024-09-05 00:35:33,663 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-09-05 00:35:33,663 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-09-05 00:35:33,663 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-09-05 00:35:33,663 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-09-05 00:35:33,663 [ scc.merge] INFO Already up to date.
2024-09-05 00:35:33,663 [ scc.merge] INFO
2024-09-05 00:35:33,663 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-05 00:35:33,664 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-05 00:35:33,664 [ scc.merge] INFO
2024-09-05 00:35:33,664 [ scc.merge] INFO Repository: ome/omero-web
2024-09-05 00:35:33,664 [ scc.merge] INFO Excluded PRs:
2024-09-05 00:35:33,664 [ scc.merge] INFO - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
2024-09-05 00:35:33,664 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-09-05 00:35:33,664 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-09-05 00:35:33,664 [ scc.merge] INFO Already up to date.
2024-09-05 00:35:33,664 [ scc.merge] INFO
2024-09-05 00:35:33,664 [ scc.merge] INFO Merged PRs:
2024-09-05 00:35:33,664 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-09-05 00:35:33,664 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-09-05 00:35:33,664 [ scc.merge] INFO - PR 574 will-moore 'Fix word wrap for names'
2024-09-05 00:35:33,664 [ scc.merge] INFO - PR 576 will-moore 'webclient page scaleable, login page device-width'
2024-09-05 00:35:33,664 [ scc.merge] INFO
2024-09-05 00:35:33,664 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-05 00:35:33,664 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:35:33,669 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-09-05 00:35:33,669 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:35:33,673 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-05 00:35:33,673 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-09-05 00:35:33,673 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:35:33,677 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-05 00:35:33,677 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-09-05 00:35:33,677 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:35:33,681 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-05 00:35:33,681 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-09-05 00:35:33,681 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:35:33,686 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-05 00:35:33,686 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-09-05 00:35:33,686 [ scc.git] DEBUG Calling 'git remote'
2024-09-05 00:35:33,691 [ 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-05 00:36:01,739 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/f5fa13f0/images/svgs/logo.svg){kind=logo}
