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-08 00:31:59,007 [ scc.config] DEBUG Found github.token
2024-09-08 00:31:59,010 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-09-08 00:31:59,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:31:59,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:31:59,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-09-08 00:31:59,989 [ scc.gh] DEBUG 4364 remaining from 5000 (Reset at 01:09
2024-09-08 00:31:59,989 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-08 00:31:59,993 [ scc.git] DEBUG Check current status
2024-09-08 00:31:59,993 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-08 00:31:59,997 [ scc.git] DEBUG 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-09-08 00:31:59,997 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-08 00:32:00,034 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-08 00:32:00,037 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-08 00:32:00,040 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-08 00:32:00,044 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-08 00:32:00,262 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-09-08 00:32:00,268 [ scc.config] DEBUG Found remote.origin.url
2024-09-08 00:32:00,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-09-08 00:32:00,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-08 00:32:01,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-08 00:32:01,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-08 00:32:02,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-08 00:32:02,109 [ scc.git] DEBUG Resetting...
2024-09-08 00:32:02,109 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-09-08 00:32:02,118 [ scc.git] DEBUG HEAD is now at 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-09-08 00:32:02,118 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-09-08 00:32:02,172 [ scc.git] DEBUG Check current status
2024-09-08 00:32:02,172 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-08 00:32:02,177 [ scc.git] DEBUG 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-09-08 00:32:02,177 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-08 00:32:02,221 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-08 00:32:02,224 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-08 00:32:02,228 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-08 00:32:02,231 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-08 00:32:02,238 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-09-08 00:32:02,239 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-09-08 00:32:02,239 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-09-08 00:32:02,240 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-09-08 00:32:02,240 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-09-08 00:32:02,240 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-09-08 00:32:02,240 [ scc.repo] DEBUG ## PRs found:
2024-09-08 00:32:02,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-09-08 00:32:03,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/291 HTTP/1.1" 200 None
2024-09-08 00:32:03,074 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-08 00:32:03,074 [ scc.repo] DEBUG - PR 291 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `2b30141`'
2024-09-08 00:32:03,075 [ scc.repo] DEBUG ## Branches found:
2024-09-08 00:32:03,075 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:32:03,075 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:32:03,079 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-08 00:32:03,083 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-08 00:32:03,083 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-08 00:32:03,087 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-08 00:32:03,092 [ scc.git] DEBUG Already up to date.
2024-09-08 00:32:03,093 [ scc.git] DEBUG Calling 'git fetch origin pull/291/head'
2024-09-08 00:32:03,409 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-09-08 00:32:03,409 [ scc.git] DEBUG * branch refs/pull/291/head -> FETCH_HEAD
2024-09-08 00:32:03,415 [ scc.git] DEBUG ## Unique users: []
2024-09-08 00:32:03,415 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:32:03,415 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:32:03,419 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...05f25c9f27af6269fa4ea407e603b23b408b34e4'
2024-09-08 00:32:03,439 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:32:03,444 [ 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-08 00:32:03,454 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-08 00:32:03,456 [ scc.git] DEBUG omero-web | 2 +-
2024-09-08 00:32:03,456 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-09-08 00:32:03,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:32:03,584 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-08 00:32:03,829 [ scc.git] DEBUG Submodule path 'omero-web': checked out '2b30141f008dbb3ef72cc06a3600f4a64f324c70'
2024-09-08 00:32:03,830 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:32:03,830 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:32:03,835 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-08 00:32:04,163 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f28575c4e50> has no local changes
2024-09-08 00:32:04,164 [ 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/167/)'
2024-09-08 00:32:04,191 [ scc.git] DEBUG [detached HEAD dfbc7c9] merge master -Dorg -Snone
2024-09-08 00:32:04,191 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-09-08 00:32:04,192 [ scc.merge] INFO Already up to date.
2024-09-08 00:32:04,192 [ scc.merge] INFO
2024-09-08 00:32:04,192 [ scc.merge] INFO Merged PRs:
2024-09-08 00:32:04,192 [ scc.merge] INFO - PR 291 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `2b30141`'
2024-09-08 00:32:04,192 [ scc.merge] INFO
2024-09-08 00:32:04,192 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-08 00:32:04,192 [ 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-08 00:32:06,335 [ scc.config] DEBUG Found github.token
2024-09-08 00:32:06,337 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-09-08 00:32:06,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:32:06,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:32:07,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-09-08 00:32:07,273 [ scc.gh] DEBUG 4354 remaining from 5000 (Reset at 01:09
2024-09-08 00:32:07,274 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-08 00:32:07,278 [ scc.git] DEBUG Check current status
2024-09-08 00:32:07,278 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-08 00:32:07,282 [ scc.git] DEBUG dfbc7c9 merge master -Dorg -Snone
2024-09-08 00:32:07,283 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-08 00:32:07,328 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-08 00:32:07,331 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-08 00:32:07,335 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-08 00:32:07,338 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-08 00:32:07,342 [ scc.git] DEBUG 2b30141f008dbb3ef72cc06a3600f4a64f324c70 omero-web (v5.27.1-1-g2b30141f0)
2024-09-08 00:32:07,346 [ scc.config] DEBUG Found remote.origin.url
2024-09-08 00:32:07,347 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-09-08 00:32:07,348 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-09-08 00:32:07,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-09-08 00:32:08,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-08 00:32:08,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-08 00:32:08,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-08 00:32:09,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-08 00:32:09,410 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-08 00:32:09,462 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-09-08 00:32:09,462 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-08 00:32:09,466 [ scc.git] DEBUG Check current status
2024-09-08 00:32:09,466 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-08 00:32:09,470 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-09-08 00:32:09,470 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-08 00:32:09,518 [ scc.config] DEBUG Found remote.origin.url
2024-09-08 00:32:09,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-09-08 00:32:10,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-08 00:32:10,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-08 00:32:11,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-08 00:32:11,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-08 00:32:11,668 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-08 00:32:11,712 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-08 00:32:11,713 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-09-08 00:32:11,713 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-08 00:32:11,717 [ scc.git] DEBUG Check current status
2024-09-08 00:32:11,717 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-08 00:32:11,721 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-09-08 00:32:11,721 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-08 00:32:11,767 [ scc.config] DEBUG Found remote.origin.url
2024-09-08 00:32:12,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-09-08 00:32:12,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-08 00:32:13,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-08 00:32:13,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-08 00:32:13,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-08 00:32:13,819 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-08 00:32:13,858 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-08 00:32:13,859 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-09-08 00:32:13,859 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-08 00:32:13,863 [ scc.git] DEBUG Check current status
2024-09-08 00:32:13,863 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-08 00:32:13,876 [ scc.git] DEBUG 749a68ac Bump version: 5.19.4 → 5.19.5.dev0
2024-09-08 00:32:13,877 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-08 00:32:13,916 [ scc.config] DEBUG Found remote.origin.url
2024-09-08 00:32:14,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-09-08 00:32:14,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-08 00:32:15,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-08 00:32:15,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-08 00:32:15,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-08 00:32:15,943 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-08 00:32:15,986 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-08 00:32:15,987 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-09-08 00:32:15,987 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-08 00:32:15,991 [ scc.git] DEBUG Check current status
2024-09-08 00:32:15,991 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-08 00:32:16,011 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-09-08 00:32:16,012 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-08 00:32:16,061 [ scc.config] DEBUG Found remote.origin.url
2024-09-08 00:32:16,063 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-09-08 00:32:16,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-09-08 00:32:16,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-08 00:32:17,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-08 00:32:17,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-08 00:32:18,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-08 00:32:18,056 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-08 00:32:18,102 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-08 00:32:18,103 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-09-08 00:32:18,103 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-08 00:32:18,107 [ scc.git] DEBUG Check current status
2024-09-08 00:32:18,107 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-08 00:32:18,148 [ scc.git] DEBUG 2b30141f0 Bump version: 5.27.1 → 5.27.2.dev0
2024-09-08 00:32:18,149 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-08 00:32:18,195 [ scc.config] DEBUG Found remote.origin.url
2024-09-08 00:32:18,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-09-08 00:32:18,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-08 00:32:19,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-08 00:32:19,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-08 00:32:20,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-08 00:32:20,189 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-08 00:32:20,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-08 00:32:20,233 [ scc.git] DEBUG Resetting...
2024-09-08 00:32:20,233 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-09-08 00:32:20,239 [ scc.git] DEBUG HEAD is now at dfbc7c9 merge master -Dorg -Snone
2024-09-08 00:32:20,240 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-09-08 00:32:20,295 [ scc.git] DEBUG Check current status
2024-09-08 00:32:20,295 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-08 00:32:20,300 [ scc.git] DEBUG dfbc7c9 merge master -Dorg -Snone
2024-09-08 00:32:20,300 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-08 00:32:20,345 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-08 00:32:20,348 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-08 00:32:20,351 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-08 00:32:20,355 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-08 00:32:20,359 [ scc.git] DEBUG 2b30141f008dbb3ef72cc06a3600f4a64f324c70 omero-web (v5.27.1-1-g2b30141f0)
2024-09-08 00:32:20,360 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-09-08 00:32:20,360 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-09-08 00:32:20,360 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-09-08 00:32:20,360 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-09-08 00:32:20,360 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-09-08 00:32:20,360 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-09-08 00:32:20,360 [ scc.repo] DEBUG ## PRs found:
2024-09-08 00:32:20,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-09-08 00:32:21,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/291 HTTP/1.1" 200 None
2024-09-08 00:32:21,101 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-08 00:32:21,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/05f25c9f27af6269fa4ea407e603b23b408b34e4 HTTP/1.1" 200 None
2024-09-08 00:32:22,040 [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-08 00:32:22,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/05f25c9f27af6269fa4ea407e603b23b408b34e4 HTTP/1.1" 200 None
2024-09-08 00:32:22,975 [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-08 00:32:22,976 [ scc.repo] DEBUG - PR 291 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `2b30141`'
2024-09-08 00:32:22,976 [ scc.repo] DEBUG ## Branches found:
2024-09-08 00:32:22,976 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:32:22,976 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:32:22,981 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-08 00:32:22,984 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-08 00:32:22,985 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-08 00:32:22,989 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-08 00:32:22,993 [ scc.git] DEBUG Already up to date.
2024-09-08 00:32:22,993 [ scc.git] DEBUG Calling 'git fetch origin pull/291/head'
2024-09-08 00:32:23,288 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-09-08 00:32:23,288 [ scc.git] DEBUG * branch refs/pull/291/head -> FETCH_HEAD
2024-09-08 00:32:23,293 [ scc.git] DEBUG ## Unique users: []
2024-09-08 00:32:23,293 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:32:23,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:32:23,298 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...05f25c9f27af6269fa4ea407e603b23b408b34e4'
2024-09-08 00:32:23,302 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:32:23,306 [ 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-08 00:32:23,311 [ scc.git] DEBUG Already up to date.
2024-09-08 00:32:23,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:32:23,453 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-08 00:32:23,497 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:32:23,498 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:32:23,503 [ scc.repo] DEBUG ## PRs found:
2024-09-08 00:32:23,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-09-08 00:32:24,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-09-08 00:32:24,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-09-08 00:32:25,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-09-08 00:32:25,839 [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-08 00:32:26,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-09-08 00:32:26,708 [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-08 00:32:26,709 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-09-08 00:32:26,709 [ scc.repo] DEBUG ## Branches found:
2024-09-08 00:32:26,709 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-09-08 00:32:26,709 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:32:26,709 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:32:26,714 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-08 00:32:26,719 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-08 00:32:26,719 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-08 00:32:26,724 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-08 00:32:26,729 [ scc.git] DEBUG Already up to date.
2024-09-08 00:32:26,729 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-09-08 00:32:27,063 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-09-08 00:32:27,063 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-09-08 00:32:27,068 [ scc.git] DEBUG ## Unique users: []
2024-09-08 00:32:27,069 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:32:27,069 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:32:27,073 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-09-08 00:32:27,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:32:27,083 [ 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-08 00:32:27,252 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-09-08 00:32:27,252 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-09-08 00:32:27,253 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-09-08 00:32:27,253 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-09-08 00:32:27,253 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-09-08 00:32:27,253 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-09-08 00:32:27,253 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-09-08 00:32:27,253 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-09-08 00:32:27,253 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-09-08 00:32:27,264 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-08 00:32:27,269 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-09-08 00:32:27,269 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-09-08 00:32:27,269 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-09-08 00:32:27,269 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-09-08 00:32:27,269 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-09-08 00:32:27,269 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-09-08 00:32:27,269 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-09-08 00:32:27,269 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-09-08 00:32:27,269 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-09-08 00:32:27,269 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-09-08 00:32:27,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:32:27,418 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-08 00:32:27,463 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:32:27,463 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:32:27,468 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-08 00:32:27,510 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-08 00:32:27,517 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f16660af820> has no local changes
2024-09-08 00:32:27,517 [ 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/167/)'
2024-09-08 00:32:27,526 [ scc.git] DEBUG [detached HEAD 390868a] merge master -Dorg -Ssuccess-only
2024-09-08 00:32:27,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-08 00:32:27,527 [ scc.repo] DEBUG ## PRs found:
2024-09-08 00:32:27,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-09-08 00:32:28,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-09-08 00:32:28,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-09-08 00:32:29,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-09-08 00:32:29,755 [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-08 00:32:30,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-09-08 00:32:30,584 [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-08 00:32:30,585 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-09-08 00:32:31,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-09-08 00:32:31,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-09-08 00:32:31,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-09-08 00:32:32,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-09-08 00:32:32,375 [ scc.repo] DEBUG ## Branches found:
2024-09-08 00:32:32,376 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-09-08 00:32:32,376 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:32:32,376 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:32:32,381 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-08 00:32:32,386 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-08 00:32:32,386 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-08 00:32:32,392 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-08 00:32:32,399 [ scc.git] DEBUG Already up to date.
2024-09-08 00:32:32,399 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-09-08 00:32:32,903 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-09-08 00:32:32,904 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-09-08 00:32:32,909 [ scc.git] DEBUG ## Unique users: []
2024-09-08 00:32:32,909 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:32:32,909 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:32:32,913 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-09-08 00:32:32,918 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:32:32,923 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-09-08 00:32:32,962 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-09-08 00:32:32,963 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-08 00:32:32,966 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-09-08 00:32:32,966 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-09-08 00:32:32,966 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-09-08 00:32:33,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:32:33,101 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-08 00:32:33,145 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:32:33,145 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:32:33,149 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-08 00:32:33,194 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-08 00:32:33,201 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1664f83730> has no local changes
2024-09-08 00:32:33,201 [ 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/167/)'
2024-09-08 00:32:33,211 [ scc.git] DEBUG [detached HEAD c026a70] merge master -Dorg -Ssuccess-only
2024-09-08 00:32:33,211 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-08 00:32:33,211 [ scc.repo] DEBUG ## PRs found:
2024-09-08 00:32:33,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-09-08 00:32:34,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/429 HTTP/1.1" 200 None
2024-09-08 00:32:34,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427 HTTP/1.1" 200 None
2024-09-08 00:32:35,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/424 HTTP/1.1" 200 None
2024-09-08 00:32:35,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/424/comments HTTP/1.1" 200 None
2024-09-08 00:32:36,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None
2024-09-08 00:32:36,564 [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-08 00:32:37,008 [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-08 00:32:37,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None
2024-09-08 00:32:37,835 [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-08 00:32:38,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None
2024-09-08 00:32:38,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec/status HTTP/1.1" 200 None
2024-09-08 00:32:38,662 [ scc.repo] DEBUG - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
2024-09-08 00:32:39,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-09-08 00:32:39,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-09-08 00:32:40,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-09-08 00:32:40,462 [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-08 00:32:40,919 [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-08 00:32:41,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-09-08 00:32:41,794 [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-08 00:32:42,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-09-08 00:32:42,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-09-08 00:32:42,721 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-09-08 00:32:43,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-09-08 00:32:43,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-09-08 00:32:44,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-09-08 00:32:44,572 [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-08 00:32:44,991 [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-08 00:32:45,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-09-08 00:32:45,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-09-08 00:32:46,377 [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-08 00:32:46,839 [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-08 00:32:47,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-09-08 00:32:47,668 [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-08 00:32:48,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-09-08 00:32:48,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-09-08 00:32:48,573 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-09-08 00:32:49,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-09-08 00:32:49,013 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-09-08 00:32:49,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-09-08 00:32:49,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-09-08 00:32:50,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-09-08 00:32:50,789 [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-08 00:32:51,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-09-08 00:32:51,587 [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-08 00:32:51,588 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-09-08 00:32:52,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-09-08 00:32:52,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-09-08 00:32:53,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-09-08 00:32:53,597 [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-08 00:32:54,067 [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-08 00:32:54,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-09-08 00:32:54,944 [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-08 00:32:55,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-09-08 00:32:55,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-09-08 00:32:55,833 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-09-08 00:32:56,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-09-08 00:32:56,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-09-08 00:32:57,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-09-08 00:32:57,589 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-09-08 00:32:58,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-09-08 00:32:58,480 [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-08 00:32:58,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-09-08 00:32:59,412 [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-08 00:32:59,414 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-09-08 00:32:59,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-09-08 00:33:00,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-09-08 00:33:00,771 [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-08 00:33:01,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-09-08 00:33:01,647 [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-08 00:33:01,648 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-09-08 00:33:02,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-09-08 00:33:02,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-09-08 00:33:03,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-09-08 00:33:03,595 [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-08 00:33:04,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-09-08 00:33:04,413 [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-08 00:33:04,413 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-09-08 00:33:04,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-09-08 00:33:05,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-09-08 00:33:05,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-09-08 00:33:06,247 [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-08 00:33:06,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-09-08 00:33:07,216 [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-08 00:33:07,217 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-09-08 00:33:07,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-09-08 00:33:08,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-09-08 00:33:08,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-09-08 00:33:09,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-09-08 00:33:09,018 [ scc.repo] DEBUG ## Branches found:
2024-09-08 00:33:09,019 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-09-08 00:33:09,019 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:33:09,019 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:33:09,026 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-08 00:33:09,031 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-08 00:33:09,031 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-08 00:33:09,036 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-08 00:33:09,041 [ scc.git] DEBUG Already up to date.
2024-09-08 00:33:09,042 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-09-08 00:33:09,871 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-08 00:33:09,871 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-09-08 00:33:09,876 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-09-08 00:33:10,195 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-08 00:33:10,195 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-09-08 00:33:10,200 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-09-08 00:33:10,541 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-08 00:33:10,541 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-09-08 00:33:10,549 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-09-08 00:33:10,860 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-08 00:33:10,860 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-09-08 00:33:10,868 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-09-08 00:33:11,274 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-08 00:33:11,275 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-09-08 00:33:11,282 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-09-08 00:33:11,588 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-08 00:33:11,589 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-09-08 00:33:11,595 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-09-08 00:33:11,899 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-08 00:33:11,899 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-09-08 00:33:11,909 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-09-08 00:33:12,420 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-08 00:33:12,420 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-09-08 00:33:12,426 [ scc.git] DEBUG Calling 'git fetch origin pull/424/head'
2024-09-08 00:33:12,731 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-08 00:33:12,731 [ scc.git] DEBUG * branch refs/pull/424/head -> FETCH_HEAD
2024-09-08 00:33:12,738 [ scc.git] DEBUG ## Unique users: []
2024-09-08 00:33:12,738 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:33:12,738 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:33:12,744 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-09-08 00:33:12,758 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:33:12,763 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-09-08 00:33:12,888 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-09-08 00:33:12,888 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-09-08 00:33:12,889 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-08 00:33:12,894 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-09-08 00:33:12,894 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-09-08 00:33:12,894 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-09-08 00:33:13,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:33:13,029 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-09-08 00:33:13,042 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:33:13,049 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-09-08 00:33:13,233 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-09-08 00:33:13,233 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-09-08 00:33:13,235 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-08 00:33:13,246 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-09-08 00:33:13,246 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-09-08 00:33:13,246 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-09-08 00:33:13,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:33:13,420 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-09-08 00:33:13,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:33:13,440 [ 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-08 00:33:13,502 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-09-08 00:33:13,503 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-08 00:33:13,508 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-09-08 00:33:13,508 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-09-08 00:33:13,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:33:13,851 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-09-08 00:33:13,865 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:33:13,872 [ 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-08 00:33:14,052 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-09-08 00:33:14,052 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-09-08 00:33:14,053 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-08 00:33:14,057 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-09-08 00:33:14,057 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-09-08 00:33:14,057 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-09-08 00:33:14,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:33:14,245 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-09-08 00:33:14,259 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:33:14,264 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-09-08 00:33:14,322 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-08 00:33:14,325 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-09-08 00:33:14,325 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-09-08 00:33:14,325 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-09-08 00:33:14,325 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-09-08 00:33:14,325 [ scc.git] DEBUG create mode 100644 connect.py
2024-09-08 00:33:14,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:33:14,620 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-09-08 00:33:14,633 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:33:14,638 [ 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-08 00:33:14,836 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-09-08 00:33:14,837 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-08 00:33:14,840 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-09-08 00:33:14,840 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-09-08 00:33:14,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:33:14,996 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-09-08 00:33:15,748 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:33:15,756 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-09-08 00:33:15,865 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-09-08 00:33:15,867 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-08 00:33:15,871 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-09-08 00:33:15,871 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-09-08 00:33:16,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:33:16,003 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-09-08 00:33:16,029 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:33:16,035 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-09-08 00:33:16,159 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-09-08 00:33:16,160 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-08 00:33:16,171 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-09-08 00:33:16,171 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-09-08 00:33:16,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:33:16,401 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec'
2024-09-08 00:33:16,414 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:33:16,419 [ 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-08 00:33:16,461 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-08 00:33:16,465 [ scc.git] DEBUG src/omero/util/__init__.py | 8 +-------
2024-09-08 00:33:16,465 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 7 deletions(-)
2024-09-08 00:33:16,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:33:16,780 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-08 00:33:16,822 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:33:16,822 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:33:16,828 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-08 00:33:16,874 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-08 00:33:16,886 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1664f835b0> has no local changes
2024-09-08 00:33:16,886 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-py
Excluded PRs:
- PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
- 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/167/)'
2024-09-08 00:33:16,905 [ scc.git] DEBUG [detached HEAD 0522a3e4] merge master -Dorg -Ssuccess-only
2024-09-08 00:33:16,905 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-08 00:33:16,906 [ scc.git] INFO Overriding base-branch from master to develop
2024-09-08 00:33:16,906 [ scc.repo] DEBUG ## PRs found:
2024-09-08 00:33:17,347 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-09-08 00:33:17,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-09-08 00:33:18,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-09-08 00:33:18,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-09-08 00:33:19,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-09-08 00:33:19,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-09-08 00:33:20,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-09-08 00:33:20,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-08 00:33:21,119 [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-08 00:33:21,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-08 00:33:22,016 [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-08 00:33:22,017 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-08 00:33:22,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-09-08 00:33:22,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-09-08 00:33:23,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-09-08 00:33:23,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-09-08 00:33:23,860 [ scc.repo] DEBUG ## Branches found:
2024-09-08 00:33:23,861 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-09-08 00:33:23,861 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:33:23,861 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:33:23,867 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-09-08 00:33:23,873 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-08 00:33:23,873 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-09-08 00:33:23,880 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-09-08 00:33:23,887 [ scc.git] DEBUG Already up to date.
2024-09-08 00:33:23,887 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-09-08 00:33:24,319 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-09-08 00:33:24,320 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-09-08 00:33:24,325 [ scc.git] DEBUG ## Unique users: []
2024-09-08 00:33:24,325 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:33:24,325 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:33:24,331 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-08 00:33:24,339 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:33:24,344 [ 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-08 00:33:24,396 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-09-08 00:33:24,397 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-09-08 00:33:24,397 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-08 00:33:24,397 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-08 00:33:24,403 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-08 00:33:24,410 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-09-08 00:33:24,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:33:24,551 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-08 00:33:24,560 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-08 00:33:24,568 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#167](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/167/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/167/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-09-08 00:33:24,573 [ scc.config] DEBUG Found github.token
2024-09-08 00:33:24,574 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-09-08 00:33:24,574 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-08 00:33:24,627 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:33:24,627 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:33:24,633 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-08 00:33:24,679 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-08 00:33:24,686 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1664ff8c70> has no local changes
2024-09-08 00:33:24,687 [ 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/167/)'
2024-09-08 00:33:24,696 [ scc.git] DEBUG [detached HEAD f38a693] merge master -Dorg -Ssuccess-only
2024-09-08 00:33:24,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-08 00:33:24,697 [ scc.repo] DEBUG ## PRs found:
2024-09-08 00:33:25,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-09-08 00:33:25,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/576 HTTP/1.1" 200 None
2024-09-08 00:33:26,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341 HTTP/1.1" 200 None
2024-09-08 00:33:26,531 [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-08 00:33:27,023 [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-08 00:33:27,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341 HTTP/1.1" 200 None
2024-09-08 00:33:27,835 [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-08 00:33:28,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341 HTTP/1.1" 200 None
2024-09-08 00:33:28,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341/status HTTP/1.1" 200 None
2024-09-08 00:33:28,715 [ scc.repo] DEBUG - PR 576 will-moore 'webclient page scaleable, login page device-width'
2024-09-08 00:33:29,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/574 HTTP/1.1" 200 None
2024-09-08 00:33:29,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/574/comments HTTP/1.1" 200 None
2024-09-08 00:33:30,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None
2024-09-08 00:33:30,600 [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-08 00:33:31,087 [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-08 00:33:31,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None
2024-09-08 00:33:31,926 [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-08 00:33:32,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None
2024-09-08 00:33:32,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c/status HTTP/1.1" 200 None
2024-09-08 00:33:32,764 [ scc.repo] DEBUG - PR 574 will-moore 'Fix word wrap for names'
2024-09-08 00:33:33,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568 HTTP/1.1" 200 None
2024-09-08 00:33:33,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568/comments HTTP/1.1" 200 None
2024-09-08 00:33:34,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-09-08 00:33:34,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-09-08 00:33:34,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-09-08 00:33:35,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-09-08 00:33:35,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-09-08 00:33:36,374 [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-08 00:33:36,850 [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-08 00:33:37,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-09-08 00:33:37,732 [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-08 00:33:38,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-09-08 00:33:38,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-09-08 00:33:38,550 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-09-08 00:33:39,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-09-08 00:33:39,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-09-08 00:33:39,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-09-08 00:33:40,468 [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-08 00:33:40,927 [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-08 00:33:41,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-09-08 00:33:41,816 [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-08 00:33:42,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-09-08 00:33:42,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-09-08 00:33:42,725 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-09-08 00:33:43,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-09-08 00:33:43,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-09-08 00:33:44,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-09-08 00:33:44,596 [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-08 00:33:45,050 [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-08 00:33:45,053 [ scc.repo] DEBUG ## Branches found:
2024-09-08 00:33:45,053 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-09-08 00:33:45,053 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:33:45,053 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:33:45,059 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-08 00:33:45,066 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-08 00:33:45,067 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-08 00:33:45,072 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-08 00:33:45,078 [ scc.git] DEBUG Already up to date.
2024-09-08 00:33:45,079 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-09-08 00:33:45,510 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-08 00:33:45,510 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-09-08 00:33:45,515 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-09-08 00:33:45,824 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-08 00:33:45,824 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-09-08 00:33:45,829 [ scc.git] DEBUG Calling 'git fetch origin pull/574/head'
2024-09-08 00:33:46,134 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-08 00:33:46,134 [ scc.git] DEBUG * branch refs/pull/574/head -> FETCH_HEAD
2024-09-08 00:33:46,139 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-09-08 00:33:46,446 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-08 00:33:46,446 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-09-08 00:33:46,451 [ scc.git] DEBUG ## Unique users: []
2024-09-08 00:33:46,451 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:33:46,451 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:33:46,456 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-09-08 00:33:46,463 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:33:46,468 [ 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-08 00:33:46,521 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-09-08 00:33:46,521 [ scc.git] DEBUG Auto-merging setup.py
2024-09-08 00:33:46,523 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-08 00:33:46,527 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-09-08 00:33:46,527 [ scc.git] DEBUG setup.py | 1 +
2024-09-08 00:33:46,527 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-09-08 00:33:46,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:33:46,662 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-09-08 00:33:46,670 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:33:46,675 [ 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-08 00:33:46,711 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-09-08 00:33:46,711 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-09-08 00:33:46,712 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-08 00:33:46,720 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-09-08 00:33:46,720 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-09-08 00:33:46,720 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-09-08 00:33:47,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:33:47,066 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ad846e500db8aa8ec32fe0ea9b828ecb44871c2c'
2024-09-08 00:33:47,075 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:33:47,081 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 574 (Fix word wrap for names) ad846e500db8aa8ec32fe0ea9b828ecb44871c2c'
2024-09-08 00:33:47,105 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-08 00:33:47,109 [ scc.git] DEBUG omeroweb/webclient/static/webclient/css/layout.css | 2 ++
2024-09-08 00:33:47,109 [ scc.git] DEBUG omeroweb/webclient/templates/webclient/annotations/includes/name.html | 4 ++--
2024-09-08 00:33:47,109 [ scc.git] DEBUG 2 files changed, 4 insertions(+), 2 deletions(-)
2024-09-08 00:33:47,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:33:47,450 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0663a746b95073b4bbb2b7459859a42b0fc4e341'
2024-09-08 00:33:47,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:33:47,465 [ 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-08 00:33:47,489 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-08 00:33:47,494 [ scc.git] DEBUG omeroweb/webclient/templates/webclient/login.html | 3 ++-
2024-09-08 00:33:47,494 [ scc.git] DEBUG omeroweb/webgateway/templates/webgateway/base/base_main.html | 2 --
2024-09-08 00:33:47,494 [ scc.git] DEBUG 2 files changed, 2 insertions(+), 3 deletions(-)
2024-09-08 00:33:47,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:33:47,831 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-08 00:33:47,879 [ scc.git] DEBUG Get sha1 of %s
2024-09-08 00:33:47,879 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-08 00:33:47,885 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-08 00:33:47,931 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-08 00:33:47,941 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1664745d60> has no local changes
2024-09-08 00:33:47,942 [ 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/167/)'
2024-09-08 00:33:47,956 [ scc.git] DEBUG [detached HEAD 3b38ee7cd] merge master -Dorg -Ssuccess-only
2024-09-08 00:33:47,956 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-08 00:33:47,956 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-08 00:33:48,008 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-09-08 00:33:48,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:33:48,233 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-09-08 00:33:48,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:33:48,619 [ scc.config] DEBUG Found submodule.omero-py.url
2024-09-08 00:33:48,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:33:49,012 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-09-08 00:33:49,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:33:49,409 [ scc.config] DEBUG Found submodule.omero-web.url
2024-09-08 00:33:49,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-08 00:33:49,776 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-08 00:33:49,813 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1666d8be50> has local changes
2024-09-08 00:33:49,813 [ 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 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
- 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#167 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/167/)'
2024-09-08 00:33:49,824 [ scc.git] DEBUG [detached HEAD 7b1d75d] merge master -Dorg -Ssuccess-only
2024-09-08 00:33:49,824 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-09-08 00:33:49,824 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-09-08 00:33:49,824 [ scc.merge] INFO Already up to date.
2024-09-08 00:33:49,824 [ scc.merge] INFO
2024-09-08 00:33:49,824 [ scc.merge] INFO Merged PRs:
2024-09-08 00:33:49,824 [ scc.merge] INFO - PR 291 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `2b30141`'
2024-09-08 00:33:49,824 [ scc.merge] INFO
2024-09-08 00:33:49,824 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-09-08 00:33:49,825 [ scc.merge] INFO Already up to date.
2024-09-08 00:33:49,825 [ scc.merge] INFO
2024-09-08 00:33:49,825 [ scc.merge] INFO Merged PRs:
2024-09-08 00:33:49,825 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-09-08 00:33:49,825 [ scc.merge] INFO
2024-09-08 00:33:49,825 [ scc.merge] INFO Repository: ome/omero-marshal
2024-09-08 00:33:49,825 [ scc.merge] INFO Excluded PRs:
2024-09-08 00:33:49,825 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-09-08 00:33:49,825 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-09-08 00:33:49,825 [ scc.merge] INFO Already up to date.
2024-09-08 00:33:49,825 [ scc.merge] INFO
2024-09-08 00:33:49,825 [ scc.merge] INFO Merged PRs:
2024-09-08 00:33:49,825 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-09-08 00:33:49,825 [ scc.merge] INFO
2024-09-08 00:33:49,825 [ scc.merge] INFO Repository: ome/omero-py
2024-09-08 00:33:49,825 [ scc.merge] INFO Excluded PRs:
2024-09-08 00:33:49,825 [ scc.merge] INFO - PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
2024-09-08 00:33:49,825 [ scc.merge] INFO - PR 427 Rdornier 'Add fileset folder creation' (user: Rdornier)
2024-09-08 00:33:49,825 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-09-08 00:33:49,825 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-09-08 00:33:49,825 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-09-08 00:33:49,825 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-09-08 00:33:49,825 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-09-08 00:33:49,825 [ scc.merge] INFO Already up to date.
2024-09-08 00:33:49,825 [ scc.merge] INFO
2024-09-08 00:33:49,825 [ scc.merge] INFO Merged PRs:
2024-09-08 00:33:49,825 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-09-08 00:33:49,825 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-09-08 00:33:49,825 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-09-08 00:33:49,825 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-09-08 00:33:49,825 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-09-08 00:33:49,825 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-09-08 00:33:49,825 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-09-08 00:33:49,825 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-09-08 00:33:49,826 [ scc.merge] INFO - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
2024-09-08 00:33:49,826 [ scc.merge] INFO
2024-09-08 00:33:49,826 [ scc.merge] INFO Repository: ome/omero-scripts
2024-09-08 00:33:49,826 [ scc.merge] INFO Excluded PRs:
2024-09-08 00:33:49,826 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-09-08 00:33:49,826 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-09-08 00:33:49,826 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-09-08 00:33:49,826 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-09-08 00:33:49,826 [ scc.merge] INFO Already up to date.
2024-09-08 00:33:49,826 [ scc.merge] INFO
2024-09-08 00:33:49,826 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-08 00:33:49,826 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-08 00:33:49,826 [ scc.merge] INFO
2024-09-08 00:33:49,826 [ scc.merge] INFO Repository: ome/omero-web
2024-09-08 00:33:49,826 [ scc.merge] INFO Excluded PRs:
2024-09-08 00:33:49,826 [ scc.merge] INFO - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
2024-09-08 00:33:49,826 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-09-08 00:33:49,826 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-09-08 00:33:49,826 [ scc.merge] INFO Already up to date.
2024-09-08 00:33:49,826 [ scc.merge] INFO
2024-09-08 00:33:49,826 [ scc.merge] INFO Merged PRs:
2024-09-08 00:33:49,826 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-09-08 00:33:49,826 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-09-08 00:33:49,826 [ scc.merge] INFO - PR 574 will-moore 'Fix word wrap for names'
2024-09-08 00:33:49,826 [ scc.merge] INFO - PR 576 will-moore 'webclient page scaleable, login page device-width'
2024-09-08 00:33:49,826 [ scc.merge] INFO
2024-09-08 00:33:49,826 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-08 00:33:49,826 [ scc.git] DEBUG Calling 'git remote'
2024-09-08 00:33:49,831 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-09-08 00:33:49,832 [ scc.git] DEBUG Calling 'git remote'
2024-09-08 00:33:49,836 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-08 00:33:49,836 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-09-08 00:33:49,836 [ scc.git] DEBUG Calling 'git remote'
2024-09-08 00:33:49,841 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-08 00:33:49,842 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-09-08 00:33:49,842 [ scc.git] DEBUG Calling 'git remote'
2024-09-08 00:33:49,847 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-08 00:33:49,847 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-09-08 00:33:49,847 [ scc.git] DEBUG Calling 'git remote'
2024-09-08 00:33:49,852 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-08 00:33:49,852 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-09-08 00:33:49,853 [ scc.git] DEBUG Calling 'git remote'
2024-09-08 00:33:49,859 [ 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-08 00:34:17,138 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/9ed1fe1f/images/svgs/logo.svg){kind=logo}
