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-07 00:33:32,856 [ scc.config] DEBUG Found github.token
2024-09-07 00:33:32,858 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-09-07 00:33:33,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:33:33,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:33:33,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-09-07 00:33:33,900 [ scc.gh] DEBUG 4642 remaining from 5000 (Reset at 01:09
2024-09-07 00:33:33,901 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-07 00:33:33,905 [ scc.git] DEBUG Check current status
2024-09-07 00:33:33,905 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-07 00:33:33,908 [ scc.git] DEBUG 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-09-07 00:33:33,908 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-07 00:33:33,950 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-07 00:33:33,953 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-07 00:33:33,956 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-07 00:33:33,960 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-07 00:33:34,124 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-09-07 00:33:34,129 [ scc.config] DEBUG Found remote.origin.url
2024-09-07 00:33:34,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-09-07 00:33:34,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-07 00:33:35,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-07 00:33:35,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-07 00:33:36,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-07 00:33:36,072 [ scc.git] DEBUG Resetting...
2024-09-07 00:33:36,072 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-09-07 00:33:36,077 [ scc.git] DEBUG HEAD is now at 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-09-07 00:33:36,078 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-09-07 00:33:36,130 [ scc.git] DEBUG Check current status
2024-09-07 00:33:36,130 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-07 00:33:36,134 [ scc.git] DEBUG 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-09-07 00:33:36,134 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-07 00:33:36,173 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-07 00:33:36,175 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-07 00:33:36,179 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-07 00:33:36,183 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-07 00:33:36,187 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-09-07 00:33:36,188 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-09-07 00:33:36,188 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-09-07 00:33:36,189 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-09-07 00:33:36,189 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-09-07 00:33:36,189 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-09-07 00:33:36,189 [ scc.repo] DEBUG ## PRs found:
2024-09-07 00:33:36,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-09-07 00:33:36,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/291 HTTP/1.1" 200 None
2024-09-07 00:33:36,989 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-07 00:33:36,990 [ scc.repo] DEBUG - PR 291 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `2b30141`'
2024-09-07 00:33:36,990 [ scc.repo] DEBUG ## Branches found:
2024-09-07 00:33:36,990 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:33:36,990 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:33:36,994 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-07 00:33:36,997 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-07 00:33:36,997 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-07 00:33:37,001 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-07 00:33:37,006 [ scc.git] DEBUG Already up to date.
2024-09-07 00:33:37,006 [ scc.git] DEBUG Calling 'git fetch origin pull/291/head'
2024-09-07 00:33:37,356 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-09-07 00:33:37,356 [ scc.git] DEBUG * branch refs/pull/291/head -> FETCH_HEAD
2024-09-07 00:33:37,361 [ scc.git] DEBUG ## Unique users: []
2024-09-07 00:33:37,361 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:33:37,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:33:37,365 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...05f25c9f27af6269fa4ea407e603b23b408b34e4'
2024-09-07 00:33:37,376 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:33:37,379 [ 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-07 00:33:37,388 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:33:37,390 [ scc.git] DEBUG omero-web | 2 +-
2024-09-07 00:33:37,390 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-09-07 00:33:37,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:33:37,521 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:33:37,672 [ scc.git] DEBUG Submodule path 'omero-web': checked out '2b30141f008dbb3ef72cc06a3600f4a64f324c70'
2024-09-07 00:33:37,673 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:33:37,673 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:33:37,677 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:33:37,892 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6284b9ee50> has no local changes
2024-09-07 00:33:37,893 [ 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#166 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/166/)'
2024-09-07 00:33:37,921 [ scc.git] DEBUG [detached HEAD 025ccf4] merge master -Dorg -Snone
2024-09-07 00:33:37,921 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-09-07 00:33:37,921 [ scc.merge] INFO Already up to date.
2024-09-07 00:33:37,921 [ scc.merge] INFO
2024-09-07 00:33:37,921 [ scc.merge] INFO Merged PRs:
2024-09-07 00:33:37,922 [ scc.merge] INFO - PR 291 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `2b30141`'
2024-09-07 00:33:37,922 [ scc.merge] INFO
2024-09-07 00:33:37,922 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-07 00:33:37,922 [ 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-07 00:33:40,026 [ scc.config] DEBUG Found github.token
2024-09-07 00:33:40,029 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-09-07 00:33:40,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:33:40,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:33:40,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-09-07 00:33:40,958 [ scc.gh] DEBUG 4632 remaining from 5000 (Reset at 01:09
2024-09-07 00:33:40,958 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-07 00:33:40,962 [ scc.git] DEBUG Check current status
2024-09-07 00:33:40,962 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-07 00:33:40,966 [ scc.git] DEBUG 025ccf4 merge master -Dorg -Snone
2024-09-07 00:33:40,966 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-07 00:33:41,006 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-07 00:33:41,009 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-07 00:33:41,015 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-07 00:33:41,018 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-07 00:33:41,022 [ scc.git] DEBUG 2b30141f008dbb3ef72cc06a3600f4a64f324c70 omero-web (v5.27.1-1-g2b30141f0)
2024-09-07 00:33:41,026 [ scc.config] DEBUG Found remote.origin.url
2024-09-07 00:33:41,026 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-09-07 00:33:41,028 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-09-07 00:33:41,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-09-07 00:33:41,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-07 00:33:42,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-07 00:33:42,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-07 00:33:43,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-07 00:33:43,099 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:33:43,145 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-09-07 00:33:43,145 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-07 00:33:43,149 [ scc.git] DEBUG Check current status
2024-09-07 00:33:43,149 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-07 00:33:43,153 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-09-07 00:33:43,153 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-07 00:33:43,195 [ scc.config] DEBUG Found remote.origin.url
2024-09-07 00:33:43,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-09-07 00:33:44,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-07 00:33:44,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-07 00:33:44,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-07 00:33:45,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-07 00:33:45,261 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:33:45,301 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-07 00:33:45,302 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-09-07 00:33:45,302 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-07 00:33:45,306 [ scc.git] DEBUG Check current status
2024-09-07 00:33:45,306 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-07 00:33:45,309 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-09-07 00:33:45,309 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-07 00:33:45,349 [ scc.config] DEBUG Found remote.origin.url
2024-09-07 00:33:45,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-09-07 00:33:46,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-07 00:33:46,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-07 00:33:47,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-07 00:33:47,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-07 00:33:47,450 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:33:47,488 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-07 00:33:47,490 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-09-07 00:33:47,490 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-07 00:33:47,493 [ scc.git] DEBUG Check current status
2024-09-07 00:33:47,494 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-07 00:33:47,506 [ scc.git] DEBUG 749a68ac Bump version: 5.19.4 → 5.19.5.dev0
2024-09-07 00:33:47,506 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-07 00:33:47,550 [ scc.config] DEBUG Found remote.origin.url
2024-09-07 00:33:47,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-09-07 00:33:48,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-07 00:33:48,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-07 00:33:49,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-07 00:33:49,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-07 00:33:49,686 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:33:49,724 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-07 00:33:49,725 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-09-07 00:33:49,725 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-07 00:33:49,730 [ scc.git] DEBUG Check current status
2024-09-07 00:33:49,730 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-07 00:33:49,761 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-09-07 00:33:49,761 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-07 00:33:49,806 [ scc.config] DEBUG Found remote.origin.url
2024-09-07 00:33:49,806 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-09-07 00:33:50,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-09-07 00:33:50,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-07 00:33:51,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-07 00:33:51,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-07 00:33:51,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-07 00:33:51,839 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:33:51,883 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-07 00:33:51,883 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-09-07 00:33:51,884 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-07 00:33:51,888 [ scc.git] DEBUG Check current status
2024-09-07 00:33:51,888 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-07 00:33:51,913 [ scc.git] DEBUG 2b30141f0 Bump version: 5.27.1 → 5.27.2.dev0
2024-09-07 00:33:51,913 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-07 00:33:51,958 [ scc.config] DEBUG Found remote.origin.url
2024-09-07 00:33:52,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-09-07 00:33:52,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-07 00:33:53,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-07 00:33:53,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-07 00:33:53,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-07 00:33:53,980 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:33:54,022 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-07 00:33:54,023 [ scc.git] DEBUG Resetting...
2024-09-07 00:33:54,023 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-09-07 00:33:54,029 [ scc.git] DEBUG HEAD is now at 025ccf4 merge master -Dorg -Snone
2024-09-07 00:33:54,029 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-09-07 00:33:54,085 [ scc.git] DEBUG Check current status
2024-09-07 00:33:54,085 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-07 00:33:54,090 [ scc.git] DEBUG 025ccf4 merge master -Dorg -Snone
2024-09-07 00:33:54,090 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-07 00:33:54,135 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-07 00:33:54,138 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-07 00:33:54,141 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-07 00:33:54,145 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-07 00:33:54,149 [ scc.git] DEBUG 2b30141f008dbb3ef72cc06a3600f4a64f324c70 omero-web (v5.27.1-1-g2b30141f0)
2024-09-07 00:33:54,150 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-09-07 00:33:54,150 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-09-07 00:33:54,150 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-09-07 00:33:54,150 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-09-07 00:33:54,150 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-09-07 00:33:54,150 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-09-07 00:33:54,150 [ scc.repo] DEBUG ## PRs found:
2024-09-07 00:33:54,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-09-07 00:33:54,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/291 HTTP/1.1" 200 None
2024-09-07 00:33:54,876 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-07 00:33:55,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/05f25c9f27af6269fa4ea407e603b23b408b34e4 HTTP/1.1" 200 None
2024-09-07 00:33:55,854 [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-07 00:33:56,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/05f25c9f27af6269fa4ea407e603b23b408b34e4 HTTP/1.1" 200 None
2024-09-07 00:33:56,787 [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-07 00:33:56,788 [ scc.repo] DEBUG - PR 291 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `2b30141`'
2024-09-07 00:33:56,788 [ scc.repo] DEBUG ## Branches found:
2024-09-07 00:33:56,788 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:33:56,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:33:56,793 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-07 00:33:56,797 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-07 00:33:56,797 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-07 00:33:56,802 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-07 00:33:56,806 [ scc.git] DEBUG Already up to date.
2024-09-07 00:33:56,806 [ scc.git] DEBUG Calling 'git fetch origin pull/291/head'
2024-09-07 00:33:57,117 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-09-07 00:33:57,117 [ scc.git] DEBUG * branch refs/pull/291/head -> FETCH_HEAD
2024-09-07 00:33:57,122 [ scc.git] DEBUG ## Unique users: []
2024-09-07 00:33:57,122 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:33:57,122 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:33:57,127 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...05f25c9f27af6269fa4ea407e603b23b408b34e4'
2024-09-07 00:33:57,131 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:33:57,136 [ 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-07 00:33:57,140 [ scc.git] DEBUG Already up to date.
2024-09-07 00:33:57,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:33:57,266 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:33:57,310 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:33:57,311 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:33:57,315 [ scc.repo] DEBUG ## PRs found:
2024-09-07 00:33:57,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-09-07 00:33:58,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-09-07 00:33:58,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-09-07 00:33:59,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-09-07 00:33:59,587 [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-07 00:34:00,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-09-07 00:34:00,508 [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-07 00:34:00,509 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-09-07 00:34:00,509 [ scc.repo] DEBUG ## Branches found:
2024-09-07 00:34:00,509 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-09-07 00:34:00,509 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:34:00,509 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:34:00,514 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-07 00:34:00,518 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-07 00:34:00,518 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-07 00:34:00,523 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-07 00:34:00,527 [ scc.git] DEBUG Already up to date.
2024-09-07 00:34:00,527 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-09-07 00:34:00,904 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-09-07 00:34:00,905 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-09-07 00:34:00,910 [ scc.git] DEBUG ## Unique users: []
2024-09-07 00:34:00,910 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:34:00,910 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:34:00,915 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-09-07 00:34:00,919 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:34:00,924 [ 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-07 00:34:01,110 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-09-07 00:34:01,110 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-09-07 00:34:01,111 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-09-07 00:34:01,111 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-09-07 00:34:01,111 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-09-07 00:34:01,111 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-09-07 00:34:01,111 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-09-07 00:34:01,111 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-09-07 00:34:01,111 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-09-07 00:34:01,111 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:34:01,115 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-09-07 00:34:01,115 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-09-07 00:34:01,115 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-09-07 00:34:01,115 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-09-07 00:34:01,115 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-09-07 00:34:01,115 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-09-07 00:34:01,115 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-09-07 00:34:01,115 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-09-07 00:34:01,116 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-09-07 00:34:01,116 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-09-07 00:34:01,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:34:01,267 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:34:01,309 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:34:01,309 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:34:01,314 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:34:01,352 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:34:01,358 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4f772ae820> has no local changes
2024-09-07 00:34:01,358 [ 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#166 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/166/)'
2024-09-07 00:34:01,367 [ scc.git] DEBUG [detached HEAD c8c844c] merge master -Dorg -Ssuccess-only
2024-09-07 00:34:01,367 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-07 00:34:01,367 [ scc.repo] DEBUG ## PRs found:
2024-09-07 00:34:01,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-09-07 00:34:02,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-09-07 00:34:02,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-09-07 00:34:03,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-09-07 00:34:03,590 [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-07 00:34:04,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-09-07 00:34:04,429 [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-07 00:34:04,430 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-09-07 00:34:04,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-09-07 00:34:05,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-09-07 00:34:05,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-09-07 00:34:06,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-09-07 00:34:06,164 [ scc.repo] DEBUG ## Branches found:
2024-09-07 00:34:06,164 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-09-07 00:34:06,164 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:34:06,164 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:34:06,169 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-07 00:34:06,173 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-07 00:34:06,173 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-07 00:34:06,177 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-07 00:34:06,181 [ scc.git] DEBUG Already up to date.
2024-09-07 00:34:06,182 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-09-07 00:34:06,577 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-09-07 00:34:06,577 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-09-07 00:34:06,582 [ scc.git] DEBUG ## Unique users: []
2024-09-07 00:34:06,582 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:34:06,582 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:34:06,587 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-09-07 00:34:06,592 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:34:06,596 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-09-07 00:34:06,623 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-09-07 00:34:06,623 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:34:06,627 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-09-07 00:34:06,627 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-09-07 00:34:06,627 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-09-07 00:34:06,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:34:06,759 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:34:06,802 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:34:06,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:34:06,807 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:34:06,850 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:34:06,858 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4f76183730> has no local changes
2024-09-07 00:34:06,858 [ 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#166 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/166/)'
2024-09-07 00:34:06,867 [ scc.git] DEBUG [detached HEAD d77296a] merge master -Dorg -Ssuccess-only
2024-09-07 00:34:06,868 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-07 00:34:06,868 [ scc.repo] DEBUG ## PRs found:
2024-09-07 00:34:07,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-09-07 00:34:08,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/429 HTTP/1.1" 200 None
2024-09-07 00:34:08,690 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427 HTTP/1.1" 200 None
2024-09-07 00:34:09,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/424 HTTP/1.1" 200 None
2024-09-07 00:34:09,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/424/comments HTTP/1.1" 200 None
2024-09-07 00:34:10,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None
2024-09-07 00:34:10,556 [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-07 00:34:11,014 [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-07 00:34:11,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None
2024-09-07 00:34:12,015 [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-07 00:34:12,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None
2024-09-07 00:34:12,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec/status HTTP/1.1" 200 None
2024-09-07 00:34:12,846 [ scc.repo] DEBUG - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
2024-09-07 00:34:13,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-09-07 00:34:13,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-09-07 00:34:14,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-09-07 00:34:14,943 [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-07 00:34:15,447 [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-07 00:34:15,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-09-07 00:34:16,320 [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-07 00:34:16,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-09-07 00:34:17,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-09-07 00:34:17,169 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-09-07 00:34:17,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-09-07 00:34:18,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-09-07 00:34:18,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-09-07 00:34:19,214 [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-07 00:34:19,719 [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-07 00:34:20,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-09-07 00:34:20,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-09-07 00:34:21,125 [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-07 00:34:21,550 [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-07 00:34:22,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-09-07 00:34:22,435 [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-07 00:34:23,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-09-07 00:34:23,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-09-07 00:34:23,440 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-09-07 00:34:23,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-09-07 00:34:23,904 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-09-07 00:34:24,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-09-07 00:34:24,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-09-07 00:34:25,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-09-07 00:34:25,724 [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-07 00:34:26,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-09-07 00:34:26,663 [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-07 00:34:26,664 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-09-07 00:34:27,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-09-07 00:34:27,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-09-07 00:34:28,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-09-07 00:34:28,503 [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-07 00:34:28,933 [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-07 00:34:29,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-09-07 00:34:29,751 [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-07 00:34:30,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-09-07 00:34:30,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-09-07 00:34:30,652 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-09-07 00:34:31,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-09-07 00:34:31,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-09-07 00:34:31,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-09-07 00:34:32,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-09-07 00:34:32,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-09-07 00:34:33,388 [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-07 00:34:33,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-09-07 00:34:34,199 [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-07 00:34:34,199 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-09-07 00:34:34,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-09-07 00:34:35,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-09-07 00:34:35,542 [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-07 00:34:36,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-09-07 00:34:36,420 [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-07 00:34:36,421 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-09-07 00:34:36,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-09-07 00:34:37,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-09-07 00:34:37,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-09-07 00:34:38,308 [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-07 00:34:38,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-09-07 00:34:39,244 [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-07 00:34:39,245 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-09-07 00:34:39,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-09-07 00:34:40,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-09-07 00:34:40,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-09-07 00:34:41,147 [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-07 00:34:41,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-09-07 00:34:42,005 [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-07 00:34:42,006 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-09-07 00:34:42,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-09-07 00:34:42,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-09-07 00:34:43,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-09-07 00:34:43,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-09-07 00:34:43,808 [ scc.repo] DEBUG ## Branches found:
2024-09-07 00:34:43,808 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-09-07 00:34:43,809 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:34:43,809 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:34:43,814 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-07 00:34:43,818 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-07 00:34:43,818 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-07 00:34:43,822 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-07 00:34:43,827 [ scc.git] DEBUG Already up to date.
2024-09-07 00:34:43,827 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-09-07 00:34:44,546 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-07 00:34:44,546 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-09-07 00:34:44,551 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-09-07 00:34:44,882 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-07 00:34:44,882 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-09-07 00:34:44,887 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-09-07 00:34:45,211 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-07 00:34:45,211 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-09-07 00:34:45,216 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-09-07 00:34:45,508 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-07 00:34:45,508 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-09-07 00:34:45,513 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-09-07 00:34:45,870 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-07 00:34:45,870 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-09-07 00:34:45,875 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-09-07 00:34:46,165 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-07 00:34:46,165 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-09-07 00:34:46,170 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-09-07 00:34:46,453 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-07 00:34:46,453 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-09-07 00:34:46,458 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-09-07 00:34:46,735 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-07 00:34:46,735 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-09-07 00:34:46,740 [ scc.git] DEBUG Calling 'git fetch origin pull/424/head'
2024-09-07 00:34:47,172 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-07 00:34:47,172 [ scc.git] DEBUG * branch refs/pull/424/head -> FETCH_HEAD
2024-09-07 00:34:47,177 [ scc.git] DEBUG ## Unique users: []
2024-09-07 00:34:47,178 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:34:47,178 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:34:47,183 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-09-07 00:34:47,194 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:34:47,198 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-09-07 00:34:47,248 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-09-07 00:34:47,248 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-09-07 00:34:47,249 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:34:47,254 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-09-07 00:34:47,254 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-09-07 00:34:47,254 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-09-07 00:34:47,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:34:47,384 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-09-07 00:34:47,397 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:34:47,402 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-09-07 00:34:47,507 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-09-07 00:34:47,507 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-09-07 00:34:47,507 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:34:47,515 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-09-07 00:34:47,515 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-09-07 00:34:47,515 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-09-07 00:34:47,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:34:47,766 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-09-07 00:34:47,779 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:34:47,783 [ 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-07 00:34:47,848 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-09-07 00:34:47,849 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:34:47,852 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-09-07 00:34:47,852 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-09-07 00:34:48,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:34:48,156 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-09-07 00:34:48,168 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:34:48,171 [ 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-07 00:34:48,275 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-09-07 00:34:48,275 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-09-07 00:34:48,276 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:34:48,280 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-09-07 00:34:48,280 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-09-07 00:34:48,280 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-09-07 00:34:48,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:34:48,532 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-09-07 00:34:48,543 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:34:48,548 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-09-07 00:34:48,582 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:34:48,585 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-09-07 00:34:48,585 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-09-07 00:34:48,585 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-09-07 00:34:48,585 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-09-07 00:34:48,585 [ scc.git] DEBUG create mode 100644 connect.py
2024-09-07 00:34:48,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:34:48,915 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-09-07 00:34:48,927 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:34:48,931 [ 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-07 00:34:49,026 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-09-07 00:34:49,026 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:34:49,030 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-09-07 00:34:49,030 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-09-07 00:34:49,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:34:49,327 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-09-07 00:34:49,339 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:34:49,343 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-09-07 00:34:49,386 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-09-07 00:34:49,388 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:34:49,392 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-09-07 00:34:49,392 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-09-07 00:34:49,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:34:49,715 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-09-07 00:34:49,728 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:34:49,733 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-09-07 00:34:49,855 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-09-07 00:34:49,856 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:34:49,863 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-09-07 00:34:49,864 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-09-07 00:34:50,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:34:50,096 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec'
2024-09-07 00:34:50,108 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:34:50,113 [ 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-07 00:34:50,148 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:34:50,152 [ scc.git] DEBUG src/omero/util/__init__.py | 8 +-------
2024-09-07 00:34:50,152 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 7 deletions(-)
2024-09-07 00:34:50,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:34:50,476 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:34:50,521 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:34:50,521 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:34:50,526 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:34:50,568 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:34:50,576 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4f761835b0> has no local changes
2024-09-07 00:34:50,576 [ 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#166 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/166/)'
2024-09-07 00:34:50,586 [ scc.git] DEBUG [detached HEAD a8a79ebe] merge master -Dorg -Ssuccess-only
2024-09-07 00:34:50,587 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-07 00:34:50,587 [ scc.git] INFO Overriding base-branch from master to develop
2024-09-07 00:34:50,587 [ scc.repo] DEBUG ## PRs found:
2024-09-07 00:34:51,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-09-07 00:34:51,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-09-07 00:34:52,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-09-07 00:34:52,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-09-07 00:34:52,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-09-07 00:34:53,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-09-07 00:34:53,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-09-07 00:34:54,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-07 00:34:54,805 [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-07 00:34:55,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-07 00:34:55,651 [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-07 00:34:55,652 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-07 00:34:56,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-09-07 00:34:56,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-09-07 00:34:57,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-09-07 00:34:57,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-09-07 00:34:57,500 [ scc.repo] DEBUG ## Branches found:
2024-09-07 00:34:57,500 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-09-07 00:34:57,501 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:34:57,501 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:34:57,506 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-09-07 00:34:57,510 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-07 00:34:57,510 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-09-07 00:34:57,515 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-09-07 00:34:57,519 [ scc.git] DEBUG Already up to date.
2024-09-07 00:34:57,519 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-09-07 00:34:58,033 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-09-07 00:34:58,034 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-09-07 00:34:58,039 [ scc.git] DEBUG ## Unique users: []
2024-09-07 00:34:58,039 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:34:58,039 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:34:58,043 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-07 00:34:58,050 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:34:58,054 [ 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-07 00:34:58,151 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-09-07 00:34:58,151 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-09-07 00:34:58,151 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-07 00:34:58,152 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-07 00:34:58,157 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-07 00:34:58,163 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-09-07 00:34:58,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:34:58,302 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-07 00:34:58,309 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-07 00:34:58,314 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#166](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/166/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/166/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-09-07 00:34:58,318 [ scc.config] DEBUG Found github.token
2024-09-07 00:34:58,318 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-09-07 00:34:58,318 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:34:58,361 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:34:58,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:34:58,366 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:34:58,406 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:34:58,412 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4f761ebc70> has no local changes
2024-09-07 00:34:58,413 [ 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#166 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/166/)'
2024-09-07 00:34:58,420 [ scc.git] DEBUG [detached HEAD 9015d72] merge master -Dorg -Ssuccess-only
2024-09-07 00:34:58,421 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-07 00:34:58,421 [ scc.repo] DEBUG ## PRs found:
2024-09-07 00:34:58,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-09-07 00:34:59,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/576 HTTP/1.1" 200 None
2024-09-07 00:34:59,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341 HTTP/1.1" 200 None
2024-09-07 00:35:00,223 [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-07 00:35:00,710 [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-07 00:35:01,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341 HTTP/1.1" 200 None
2024-09-07 00:35:01,555 [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-07 00:35:02,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341 HTTP/1.1" 200 None
2024-09-07 00:35:02,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341/status HTTP/1.1" 200 None
2024-09-07 00:35:02,490 [ scc.repo] DEBUG - PR 576 will-moore 'webclient page scaleable, login page device-width'
2024-09-07 00:35:02,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/574 HTTP/1.1" 200 None
2024-09-07 00:35:03,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/574/comments HTTP/1.1" 200 None
2024-09-07 00:35:03,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None
2024-09-07 00:35:04,309 [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-07 00:35:04,814 [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-07 00:35:05,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None
2024-09-07 00:35:05,738 [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-07 00:35:06,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None
2024-09-07 00:35:06,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c/status HTTP/1.1" 200 None
2024-09-07 00:35:06,722 [ scc.repo] DEBUG - PR 574 will-moore 'Fix word wrap for names'
2024-09-07 00:35:07,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568 HTTP/1.1" 200 None
2024-09-07 00:35:07,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568/comments HTTP/1.1" 200 None
2024-09-07 00:35:08,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-09-07 00:35:08,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-09-07 00:35:08,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-09-07 00:35:09,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-09-07 00:35:09,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-09-07 00:35:10,399 [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-07 00:35:10,922 [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-07 00:35:11,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-09-07 00:35:11,783 [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-07 00:35:12,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-09-07 00:35:12,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-09-07 00:35:12,670 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-09-07 00:35:13,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-09-07 00:35:13,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-09-07 00:35:14,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-09-07 00:35:14,638 [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-07 00:35:15,108 [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-07 00:35:15,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-09-07 00:35:15,946 [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-07 00:35:16,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-09-07 00:35:16,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-09-07 00:35:16,892 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-09-07 00:35:17,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-09-07 00:35:17,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-09-07 00:35:18,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-09-07 00:35:18,709 [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-07 00:35:19,194 [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-07 00:35:19,197 [ scc.repo] DEBUG ## Branches found:
2024-09-07 00:35:19,197 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-09-07 00:35:19,197 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:35:19,197 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:35:19,212 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-07 00:35:19,217 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-07 00:35:19,217 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-07 00:35:19,223 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-07 00:35:19,229 [ scc.git] DEBUG Already up to date.
2024-09-07 00:35:19,229 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-09-07 00:35:19,765 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-07 00:35:19,765 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-09-07 00:35:19,771 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-09-07 00:35:20,080 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-07 00:35:20,080 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-09-07 00:35:20,087 [ scc.git] DEBUG Calling 'git fetch origin pull/574/head'
2024-09-07 00:35:20,440 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-07 00:35:20,440 [ scc.git] DEBUG * branch refs/pull/574/head -> FETCH_HEAD
2024-09-07 00:35:20,446 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-09-07 00:35:20,778 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-07 00:35:20,778 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-09-07 00:35:20,784 [ scc.git] DEBUG ## Unique users: []
2024-09-07 00:35:20,784 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:35:20,785 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:35:20,790 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-09-07 00:35:20,799 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:35:20,805 [ 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-07 00:35:20,984 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-09-07 00:35:20,984 [ scc.git] DEBUG Auto-merging setup.py
2024-09-07 00:35:20,986 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:35:20,992 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-09-07 00:35:20,992 [ scc.git] DEBUG setup.py | 1 +
2024-09-07 00:35:20,992 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-09-07 00:35:21,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:35:21,131 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-09-07 00:35:21,139 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:35:21,145 [ 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-07 00:35:21,254 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-09-07 00:35:21,254 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-09-07 00:35:21,256 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:35:21,261 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-09-07 00:35:21,261 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-09-07 00:35:21,261 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-09-07 00:35:21,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:35:21,520 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ad846e500db8aa8ec32fe0ea9b828ecb44871c2c'
2024-09-07 00:35:21,531 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:35:21,538 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 574 (Fix word wrap for names) ad846e500db8aa8ec32fe0ea9b828ecb44871c2c'
2024-09-07 00:35:21,610 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:35:21,615 [ scc.git] DEBUG omeroweb/webclient/static/webclient/css/layout.css | 2 ++
2024-09-07 00:35:21,615 [ scc.git] DEBUG omeroweb/webclient/templates/webclient/annotations/includes/name.html | 4 ++--
2024-09-07 00:35:21,615 [ scc.git] DEBUG 2 files changed, 4 insertions(+), 2 deletions(-)
2024-09-07 00:35:21,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:35:21,935 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0663a746b95073b4bbb2b7459859a42b0fc4e341'
2024-09-07 00:35:21,948 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:35:21,955 [ 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-07 00:35:21,986 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-07 00:35:21,990 [ scc.git] DEBUG omeroweb/webclient/templates/webclient/login.html | 3 ++-
2024-09-07 00:35:21,990 [ scc.git] DEBUG omeroweb/webgateway/templates/webgateway/base/base_main.html | 2 --
2024-09-07 00:35:21,990 [ scc.git] DEBUG 2 files changed, 2 insertions(+), 3 deletions(-)
2024-09-07 00:35:22,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:35:22,338 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-07 00:35:22,386 [ scc.git] DEBUG Get sha1 of %s
2024-09-07 00:35:22,386 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-07 00:35:22,392 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:35:22,442 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:35:22,468 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4f7413f6d0> has no local changes
2024-09-07 00:35:22,468 [ 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#166 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/166/)'
2024-09-07 00:35:22,483 [ scc.git] DEBUG [detached HEAD 0de3d8ae4] merge master -Dorg -Ssuccess-only
2024-09-07 00:35:22,483 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-07 00:35:22,484 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-07 00:35:22,543 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-09-07 00:35:22,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:35:22,730 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-09-07 00:35:23,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:35:23,117 [ scc.config] DEBUG Found submodule.omero-py.url
2024-09-07 00:35:23,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:35:23,496 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-09-07 00:35:23,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:35:23,877 [ scc.config] DEBUG Found submodule.omero-web.url
2024-09-07 00:35:24,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-07 00:35:24,257 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-07 00:35:24,284 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4f77f8be50> has local changes
2024-09-07 00:35:24,284 [ 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#166 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/166/)'
2024-09-07 00:35:24,299 [ scc.git] DEBUG [detached HEAD 214e1e4] merge master -Dorg -Ssuccess-only
2024-09-07 00:35:24,300 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-09-07 00:35:24,300 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-09-07 00:35:24,300 [ scc.merge] INFO Already up to date.
2024-09-07 00:35:24,300 [ scc.merge] INFO
2024-09-07 00:35:24,300 [ scc.merge] INFO Merged PRs:
2024-09-07 00:35:24,300 [ scc.merge] INFO - PR 291 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `2b30141`'
2024-09-07 00:35:24,300 [ scc.merge] INFO
2024-09-07 00:35:24,300 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-09-07 00:35:24,300 [ scc.merge] INFO Already up to date.
2024-09-07 00:35:24,300 [ scc.merge] INFO
2024-09-07 00:35:24,300 [ scc.merge] INFO Merged PRs:
2024-09-07 00:35:24,300 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-09-07 00:35:24,300 [ scc.merge] INFO
2024-09-07 00:35:24,300 [ scc.merge] INFO Repository: ome/omero-marshal
2024-09-07 00:35:24,301 [ scc.merge] INFO Excluded PRs:
2024-09-07 00:35:24,301 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-09-07 00:35:24,301 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-09-07 00:35:24,301 [ scc.merge] INFO Already up to date.
2024-09-07 00:35:24,301 [ scc.merge] INFO
2024-09-07 00:35:24,301 [ scc.merge] INFO Merged PRs:
2024-09-07 00:35:24,301 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-09-07 00:35:24,301 [ scc.merge] INFO
2024-09-07 00:35:24,301 [ scc.merge] INFO Repository: ome/omero-py
2024-09-07 00:35:24,301 [ scc.merge] INFO Excluded PRs:
2024-09-07 00:35:24,301 [ scc.merge] INFO - PR 429 jo-mueller 'move `repr_html` to `_ImageWrapper`' (user: jo-mueller)
2024-09-07 00:35:24,301 [ scc.merge] INFO - PR 427 Rdornier 'Add fileset folder creation' (user: Rdornier)
2024-09-07 00:35:24,301 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-09-07 00:35:24,301 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-09-07 00:35:24,301 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-09-07 00:35:24,301 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-09-07 00:35:24,301 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-09-07 00:35:24,301 [ scc.merge] INFO Already up to date.
2024-09-07 00:35:24,301 [ scc.merge] INFO
2024-09-07 00:35:24,301 [ scc.merge] INFO Merged PRs:
2024-09-07 00:35:24,301 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-09-07 00:35:24,301 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-09-07 00:35:24,301 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-09-07 00:35:24,301 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-09-07 00:35:24,301 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-09-07 00:35:24,301 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-09-07 00:35:24,301 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-09-07 00:35:24,301 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-09-07 00:35:24,301 [ scc.merge] INFO - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
2024-09-07 00:35:24,301 [ scc.merge] INFO
2024-09-07 00:35:24,301 [ scc.merge] INFO Repository: ome/omero-scripts
2024-09-07 00:35:24,301 [ scc.merge] INFO Excluded PRs:
2024-09-07 00:35:24,301 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-09-07 00:35:24,301 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-09-07 00:35:24,301 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-09-07 00:35:24,301 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-09-07 00:35:24,301 [ scc.merge] INFO Already up to date.
2024-09-07 00:35:24,301 [ scc.merge] INFO
2024-09-07 00:35:24,302 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-07 00:35:24,302 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-07 00:35:24,302 [ scc.merge] INFO
2024-09-07 00:35:24,302 [ scc.merge] INFO Repository: ome/omero-web
2024-09-07 00:35:24,302 [ scc.merge] INFO Excluded PRs:
2024-09-07 00:35:24,302 [ scc.merge] INFO - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
2024-09-07 00:35:24,302 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-09-07 00:35:24,302 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-09-07 00:35:24,302 [ scc.merge] INFO Already up to date.
2024-09-07 00:35:24,302 [ scc.merge] INFO
2024-09-07 00:35:24,302 [ scc.merge] INFO Merged PRs:
2024-09-07 00:35:24,302 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-09-07 00:35:24,302 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-09-07 00:35:24,302 [ scc.merge] INFO - PR 574 will-moore 'Fix word wrap for names'
2024-09-07 00:35:24,302 [ scc.merge] INFO - PR 576 will-moore 'webclient page scaleable, login page device-width'
2024-09-07 00:35:24,302 [ scc.merge] INFO
2024-09-07 00:35:24,302 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-07 00:35:24,302 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:35:24,307 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-09-07 00:35:24,307 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:35:24,312 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-07 00:35:24,312 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-09-07 00:35:24,312 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:35:24,317 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-07 00:35:24,317 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-09-07 00:35:24,317 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:35:24,321 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-07 00:35:24,321 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-09-07 00:35:24,321 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:35:24,325 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-07 00:35:24,325 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-09-07 00:35:24,326 [ scc.git] DEBUG Calling 'git remote'
2024-09-07 00:35:24,330 [ 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-07 00:35:52,112 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
