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-06 00:34:17,279 [ scc.config] DEBUG Found github.token
2024-09-06 00:34:17,281 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-09-06 00:34:17,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:34:17,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:34:18,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-09-06 00:34:18,218 [ scc.gh] DEBUG 4352 remaining from 5000 (Reset at 01:09
2024-09-06 00:34:18,219 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-06 00:34:18,223 [ scc.git] DEBUG Check current status
2024-09-06 00:34:18,223 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-06 00:34:18,227 [ scc.git] DEBUG 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-09-06 00:34:18,227 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-06 00:34:18,264 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-06 00:34:18,266 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-06 00:34:18,270 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-06 00:34:18,273 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-06 00:34:18,470 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-09-06 00:34:18,474 [ scc.config] DEBUG Found remote.origin.url
2024-09-06 00:34:18,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-09-06 00:34:19,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-06 00:34:19,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-06 00:34:19,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-06 00:34:20,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-06 00:34:20,339 [ scc.git] DEBUG Resetting...
2024-09-06 00:34:20,339 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-09-06 00:34:20,344 [ scc.git] DEBUG HEAD is now at 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-09-06 00:34:20,345 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-09-06 00:34:20,400 [ scc.git] DEBUG Check current status
2024-09-06 00:34:20,400 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-06 00:34:20,405 [ scc.git] DEBUG 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-09-06 00:34:20,405 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-06 00:34:20,447 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-06 00:34:20,450 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-06 00:34:20,454 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-06 00:34:20,458 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-06 00:34:20,463 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-09-06 00:34:20,464 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-09-06 00:34:20,464 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-09-06 00:34:20,464 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-09-06 00:34:20,464 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-09-06 00:34:20,464 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-09-06 00:34:20,464 [ scc.repo] DEBUG ## PRs found:
2024-09-06 00:34:20,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-09-06 00:34:21,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/291 HTTP/1.1" 200 None
2024-09-06 00:34:21,261 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-06 00:34:21,261 [ scc.repo] DEBUG - PR 291 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `2b30141`'
2024-09-06 00:34:21,261 [ scc.repo] DEBUG ## Branches found:
2024-09-06 00:34:21,262 [ scc.git] DEBUG Get sha1 of %s
2024-09-06 00:34:21,262 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:34:21,265 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-06 00:34:21,268 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-06 00:34:21,269 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-06 00:34:21,272 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-06 00:34:21,276 [ scc.git] DEBUG Already up to date.
2024-09-06 00:34:21,276 [ scc.git] DEBUG Calling 'git fetch origin pull/291/head'
2024-09-06 00:34:21,581 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-09-06 00:34:21,581 [ scc.git] DEBUG * branch refs/pull/291/head -> FETCH_HEAD
2024-09-06 00:34:21,586 [ scc.git] DEBUG ## Unique users: []
2024-09-06 00:34:21,586 [ scc.git] DEBUG Get sha1 of %s
2024-09-06 00:34:21,586 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:34:21,590 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...05f25c9f27af6269fa4ea407e603b23b408b34e4'
2024-09-06 00:34:21,593 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:34:21,597 [ 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-06 00:34:21,605 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-06 00:34:21,607 [ scc.git] DEBUG omero-web | 2 +-
2024-09-06 00:34:21,607 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-09-06 00:34:21,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:34:21,776 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-06 00:34:21,911 [ scc.git] DEBUG Submodule path 'omero-web': checked out '2b30141f008dbb3ef72cc06a3600f4a64f324c70'
2024-09-06 00:34:21,912 [ scc.git] DEBUG Get sha1 of %s
2024-09-06 00:34:21,912 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:34:21,916 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-06 00:34:22,122 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f36f662fe20> has no local changes
2024-09-06 00:34:22,123 [ 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#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/165/)'
2024-09-06 00:34:22,149 [ scc.git] DEBUG [detached HEAD 07364b2] merge master -Dorg -Snone
2024-09-06 00:34:22,149 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-09-06 00:34:22,150 [ scc.merge] INFO Already up to date.
2024-09-06 00:34:22,150 [ scc.merge] INFO
2024-09-06 00:34:22,150 [ scc.merge] INFO Merged PRs:
2024-09-06 00:34:22,150 [ scc.merge] INFO - PR 291 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `2b30141`'
2024-09-06 00:34:22,150 [ scc.merge] INFO
2024-09-06 00:34:22,150 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-06 00:34:22,150 [ 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-06 00:34:24,205 [ scc.config] DEBUG Found github.token
2024-09-06 00:34:24,208 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-09-06 00:34:24,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:34:24,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:34:25,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-09-06 00:34:25,144 [ scc.gh] DEBUG 4342 remaining from 5000 (Reset at 01:09
2024-09-06 00:34:25,145 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-06 00:34:25,149 [ scc.git] DEBUG Check current status
2024-09-06 00:34:25,149 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-06 00:34:25,153 [ scc.git] DEBUG 07364b2 merge master -Dorg -Snone
2024-09-06 00:34:25,153 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-06 00:34:25,195 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-06 00:34:25,198 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-06 00:34:25,202 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-06 00:34:25,206 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-06 00:34:25,210 [ scc.git] DEBUG 2b30141f008dbb3ef72cc06a3600f4a64f324c70 omero-web (v5.27.1-1-g2b30141f0)
2024-09-06 00:34:25,215 [ scc.config] DEBUG Found remote.origin.url
2024-09-06 00:34:25,215 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-09-06 00:34:25,217 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-09-06 00:34:25,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-09-06 00:34:26,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-06 00:34:26,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-06 00:34:26,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-06 00:34:27,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-06 00:34:27,300 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-06 00:34:27,345 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-09-06 00:34:27,345 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-06 00:34:27,349 [ scc.git] DEBUG Check current status
2024-09-06 00:34:27,349 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-06 00:34:27,353 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-09-06 00:34:27,354 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-06 00:34:27,398 [ scc.config] DEBUG Found remote.origin.url
2024-09-06 00:34:27,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-09-06 00:34:28,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-06 00:34:28,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-06 00:34:29,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-06 00:34:29,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-06 00:34:29,431 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-06 00:34:29,470 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-06 00:34:29,471 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-09-06 00:34:29,471 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-06 00:34:29,475 [ scc.git] DEBUG Check current status
2024-09-06 00:34:29,475 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-06 00:34:29,478 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-09-06 00:34:29,478 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-06 00:34:29,522 [ scc.config] DEBUG Found remote.origin.url
2024-09-06 00:34:29,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-09-06 00:34:30,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-06 00:34:30,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-06 00:34:31,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-06 00:34:31,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-06 00:34:31,550 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-06 00:34:31,589 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-06 00:34:31,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-09-06 00:34:31,590 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-06 00:34:31,593 [ scc.git] DEBUG Check current status
2024-09-06 00:34:31,593 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-06 00:34:31,612 [ scc.git] DEBUG 749a68ac Bump version: 5.19.4 → 5.19.5.dev0
2024-09-06 00:34:31,613 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-06 00:34:31,662 [ scc.config] DEBUG Found remote.origin.url
2024-09-06 00:34:32,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-09-06 00:34:32,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-06 00:34:32,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-06 00:34:33,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-06 00:34:33,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-06 00:34:33,709 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-06 00:34:33,750 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-06 00:34:33,751 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-09-06 00:34:33,751 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-06 00:34:33,756 [ scc.git] DEBUG Check current status
2024-09-06 00:34:33,757 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-06 00:34:33,762 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-09-06 00:34:33,762 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-06 00:34:33,816 [ scc.config] DEBUG Found remote.origin.url
2024-09-06 00:34:33,817 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-09-06 00:34:34,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-09-06 00:34:34,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-06 00:34:34,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-06 00:34:35,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-06 00:34:35,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-06 00:34:35,836 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-06 00:34:35,876 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-06 00:34:35,877 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-09-06 00:34:35,877 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-06 00:34:35,881 [ scc.git] DEBUG Check current status
2024-09-06 00:34:35,881 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-06 00:34:35,898 [ scc.git] DEBUG 2b30141f0 Bump version: 5.27.1 → 5.27.2.dev0
2024-09-06 00:34:35,899 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-06 00:34:35,946 [ scc.config] DEBUG Found remote.origin.url
2024-09-06 00:34:36,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-09-06 00:34:36,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-06 00:34:37,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-06 00:34:37,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-06 00:34:38,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-06 00:34:38,159 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-06 00:34:38,200 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-06 00:34:38,200 [ scc.git] DEBUG Resetting...
2024-09-06 00:34:38,200 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-09-06 00:34:38,206 [ scc.git] DEBUG HEAD is now at 07364b2 merge master -Dorg -Snone
2024-09-06 00:34:38,207 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-09-06 00:34:38,261 [ scc.git] DEBUG Check current status
2024-09-06 00:34:38,261 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-06 00:34:38,265 [ scc.git] DEBUG 07364b2 merge master -Dorg -Snone
2024-09-06 00:34:38,266 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-06 00:34:38,308 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-06 00:34:38,311 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-06 00:34:38,314 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-06 00:34:38,318 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-06 00:34:38,322 [ scc.git] DEBUG 2b30141f008dbb3ef72cc06a3600f4a64f324c70 omero-web (v5.27.1-1-g2b30141f0)
2024-09-06 00:34:38,323 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-09-06 00:34:38,323 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-09-06 00:34:38,323 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-09-06 00:34:38,323 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-09-06 00:34:38,323 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-09-06 00:34:38,323 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-09-06 00:34:38,323 [ scc.repo] DEBUG ## PRs found:
2024-09-06 00:34:38,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-09-06 00:34:39,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/291 HTTP/1.1" 200 None
2024-09-06 00:34:39,083 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-06 00:34:39,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/05f25c9f27af6269fa4ea407e603b23b408b34e4 HTTP/1.1" 200 None
2024-09-06 00:34:40,074 [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-06 00:34:40,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/05f25c9f27af6269fa4ea407e603b23b408b34e4 HTTP/1.1" 200 None
2024-09-06 00:34:40,914 [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-06 00:34:40,915 [ scc.repo] DEBUG - PR 291 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `2b30141`'
2024-09-06 00:34:40,915 [ scc.repo] DEBUG ## Branches found:
2024-09-06 00:34:40,915 [ scc.git] DEBUG Get sha1 of %s
2024-09-06 00:34:40,915 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:34:40,920 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-06 00:34:40,924 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-06 00:34:40,924 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-06 00:34:40,928 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-06 00:34:40,932 [ scc.git] DEBUG Already up to date.
2024-09-06 00:34:40,932 [ scc.git] DEBUG Calling 'git fetch origin pull/291/head'
2024-09-06 00:34:41,247 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-09-06 00:34:41,247 [ scc.git] DEBUG * branch refs/pull/291/head -> FETCH_HEAD
2024-09-06 00:34:41,252 [ scc.git] DEBUG ## Unique users: []
2024-09-06 00:34:41,252 [ scc.git] DEBUG Get sha1 of %s
2024-09-06 00:34:41,252 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:34:41,257 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...05f25c9f27af6269fa4ea407e603b23b408b34e4'
2024-09-06 00:34:41,262 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:34:41,266 [ 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-06 00:34:41,270 [ scc.git] DEBUG Already up to date.
2024-09-06 00:34:41,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:34:41,409 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-06 00:34:41,451 [ scc.git] DEBUG Get sha1 of %s
2024-09-06 00:34:41,452 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:34:41,456 [ scc.repo] DEBUG ## PRs found:
2024-09-06 00:34:41,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-09-06 00:34:42,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-09-06 00:34:42,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-09-06 00:34:43,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-09-06 00:34:43,779 [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-06 00:34:44,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-09-06 00:34:44,643 [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-06 00:34:44,644 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-09-06 00:34:44,645 [ scc.repo] DEBUG ## Branches found:
2024-09-06 00:34:44,645 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-09-06 00:34:44,645 [ scc.git] DEBUG Get sha1 of %s
2024-09-06 00:34:44,645 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:34:44,650 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-06 00:34:44,655 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-06 00:34:44,655 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-06 00:34:44,659 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-06 00:34:44,664 [ scc.git] DEBUG Already up to date.
2024-09-06 00:34:44,664 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-09-06 00:34:44,961 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-09-06 00:34:44,961 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-09-06 00:34:44,966 [ scc.git] DEBUG ## Unique users: []
2024-09-06 00:34:44,967 [ scc.git] DEBUG Get sha1 of %s
2024-09-06 00:34:44,967 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:34:44,974 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-09-06 00:34:44,981 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:34:44,986 [ 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-06 00:34:45,103 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-09-06 00:34:45,104 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-09-06 00:34:45,104 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-09-06 00:34:45,104 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-09-06 00:34:45,104 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-09-06 00:34:45,104 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-09-06 00:34:45,104 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-09-06 00:34:45,104 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-09-06 00:34:45,104 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-09-06 00:34:45,105 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-06 00:34:45,109 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-09-06 00:34:45,109 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-09-06 00:34:45,109 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-09-06 00:34:45,109 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-09-06 00:34:45,109 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-09-06 00:34:45,109 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-09-06 00:34:45,109 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-09-06 00:34:45,109 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-09-06 00:34:45,109 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-09-06 00:34:45,111 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-09-06 00:34:45,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:34:45,238 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-06 00:34:45,278 [ scc.git] DEBUG Get sha1 of %s
2024-09-06 00:34:45,278 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:34:45,284 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-06 00:34:45,327 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-06 00:34:45,333 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4c51731c70> has no local changes
2024-09-06 00:34:45,333 [ 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#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/165/)'
2024-09-06 00:34:45,342 [ scc.git] DEBUG [detached HEAD 81fc7fa] merge master -Dorg -Ssuccess-only
2024-09-06 00:34:45,343 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-06 00:34:45,343 [ scc.repo] DEBUG ## PRs found:
2024-09-06 00:34:45,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-09-06 00:34:46,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-09-06 00:34:46,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-09-06 00:34:47,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-09-06 00:34:47,583 [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-06 00:34:48,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-09-06 00:34:48,513 [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-06 00:34:48,514 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-09-06 00:34:48,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-09-06 00:34:49,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-09-06 00:34:49,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-09-06 00:34:50,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-09-06 00:34:50,271 [ scc.repo] DEBUG ## Branches found:
2024-09-06 00:34:50,271 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-09-06 00:34:50,271 [ scc.git] DEBUG Get sha1 of %s
2024-09-06 00:34:50,271 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:34:50,276 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-06 00:34:50,281 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-06 00:34:50,281 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-06 00:34:50,286 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-06 00:34:50,290 [ scc.git] DEBUG Already up to date.
2024-09-06 00:34:50,291 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-09-06 00:34:50,661 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-09-06 00:34:50,661 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-09-06 00:34:50,667 [ scc.git] DEBUG ## Unique users: []
2024-09-06 00:34:50,667 [ scc.git] DEBUG Get sha1 of %s
2024-09-06 00:34:50,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:34:50,672 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-09-06 00:34:50,677 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:34:50,681 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-09-06 00:34:50,706 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-09-06 00:34:50,707 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-06 00:34:50,710 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-09-06 00:34:50,710 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-09-06 00:34:50,710 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-09-06 00:34:50,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:34:50,869 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-06 00:34:50,919 [ scc.git] DEBUG Get sha1 of %s
2024-09-06 00:34:50,920 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:34:50,924 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-06 00:34:50,979 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-06 00:34:50,998 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4c5064f730> has no local changes
2024-09-06 00:34:50,999 [ 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#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/165/)'
2024-09-06 00:34:51,009 [ scc.git] DEBUG [detached HEAD 2a9d943] merge master -Dorg -Ssuccess-only
2024-09-06 00:34:51,009 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-06 00:34:51,009 [ scc.repo] DEBUG ## PRs found:
2024-09-06 00:34:51,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-09-06 00:34:52,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427 HTTP/1.1" 200 None
2024-09-06 00:34:52,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/424 HTTP/1.1" 200 None
2024-09-06 00:34:52,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/424/comments HTTP/1.1" 200 None
2024-09-06 00:34:53,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None
2024-09-06 00:34:53,906 [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-06 00:34:54,343 [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-06 00:34:54,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None
2024-09-06 00:34:55,260 [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-06 00:34:55,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None
2024-09-06 00:34:56,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec/status HTTP/1.1" 200 None
2024-09-06 00:34:56,191 [ scc.repo] DEBUG - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
2024-09-06 00:34:56,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-09-06 00:34:57,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-09-06 00:34:57,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-09-06 00:34:58,125 [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-06 00:34:58,612 [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-06 00:34:59,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-09-06 00:34:59,504 [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-06 00:34:59,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-09-06 00:35:00,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-09-06 00:35:00,336 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-09-06 00:35:00,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-09-06 00:35:01,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-09-06 00:35:01,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-09-06 00:35:02,184 [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-06 00:35:02,704 [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-06 00:35:03,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-09-06 00:35:03,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-09-06 00:35:04,187 [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-06 00:35:04,618 [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-06 00:35:05,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-09-06 00:35:05,548 [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-06 00:35:05,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-09-06 00:35:06,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-09-06 00:35:06,368 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-09-06 00:35:06,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-09-06 00:35:06,826 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-09-06 00:35:07,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-09-06 00:35:07,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-09-06 00:35:08,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-09-06 00:35:08,671 [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-06 00:35:09,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-09-06 00:35:09,674 [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-06 00:35:09,675 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-09-06 00:35:10,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-09-06 00:35:10,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-09-06 00:35:11,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-09-06 00:35:11,603 [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-06 00:35:12,040 [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-06 00:35:12,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-09-06 00:35:12,859 [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-06 00:35:13,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-09-06 00:35:13,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-09-06 00:35:13,733 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-09-06 00:35:14,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-09-06 00:35:14,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-09-06 00:35:15,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-09-06 00:35:15,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-09-06 00:35:16,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-09-06 00:35:16,491 [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-06 00:35:17,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-09-06 00:35:17,403 [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-06 00:35:17,403 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-09-06 00:35:17,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-09-06 00:35:18,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-09-06 00:35:18,787 [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-06 00:35:19,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-09-06 00:35:19,715 [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-06 00:35:19,716 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-09-06 00:35:20,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-09-06 00:35:20,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-09-06 00:35:21,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-09-06 00:35:21,688 [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-06 00:35:22,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-09-06 00:35:22,601 [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-06 00:35:22,602 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-09-06 00:35:23,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-09-06 00:35:23,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-09-06 00:35:24,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-09-06 00:35:24,419 [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-06 00:35:24,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-09-06 00:35:25,233 [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-06 00:35:25,234 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-09-06 00:35:25,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-09-06 00:35:26,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-09-06 00:35:26,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-09-06 00:35:27,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-09-06 00:35:27,020 [ scc.repo] DEBUG ## Branches found:
2024-09-06 00:35:27,020 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-09-06 00:35:27,021 [ scc.git] DEBUG Get sha1 of %s
2024-09-06 00:35:27,021 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:35:27,026 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-06 00:35:27,029 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-06 00:35:27,029 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-06 00:35:27,033 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-06 00:35:27,037 [ scc.git] DEBUG Already up to date.
2024-09-06 00:35:27,038 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-09-06 00:35:27,766 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-06 00:35:27,766 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-09-06 00:35:27,771 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-09-06 00:35:28,078 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-06 00:35:28,078 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-09-06 00:35:28,083 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-09-06 00:35:28,368 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-06 00:35:28,368 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-09-06 00:35:28,373 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-09-06 00:35:28,694 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-06 00:35:28,695 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-09-06 00:35:28,700 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-09-06 00:35:29,035 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-06 00:35:29,035 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-09-06 00:35:29,040 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-09-06 00:35:29,323 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-06 00:35:29,324 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-09-06 00:35:29,330 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-09-06 00:35:29,648 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-06 00:35:29,648 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-09-06 00:35:29,655 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-09-06 00:35:30,051 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-06 00:35:30,051 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-09-06 00:35:30,056 [ scc.git] DEBUG Calling 'git fetch origin pull/424/head'
2024-09-06 00:35:30,373 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-06 00:35:30,373 [ scc.git] DEBUG * branch refs/pull/424/head -> FETCH_HEAD
2024-09-06 00:35:30,378 [ scc.git] DEBUG ## Unique users: []
2024-09-06 00:35:30,378 [ scc.git] DEBUG Get sha1 of %s
2024-09-06 00:35:30,378 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:35:30,383 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-09-06 00:35:30,397 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:35:30,401 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-09-06 00:35:30,495 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-09-06 00:35:30,495 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-09-06 00:35:30,496 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-06 00:35:30,500 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-09-06 00:35:30,501 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-09-06 00:35:30,501 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-09-06 00:35:30,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:35:30,634 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-09-06 00:35:30,645 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:35:30,649 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-09-06 00:35:30,753 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-09-06 00:35:30,753 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-09-06 00:35:30,754 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-06 00:35:30,761 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-09-06 00:35:30,761 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-09-06 00:35:30,761 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-09-06 00:35:31,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:35:31,046 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-09-06 00:35:31,065 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:35:31,072 [ 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-06 00:35:31,127 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-09-06 00:35:31,129 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-06 00:35:31,132 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-09-06 00:35:31,132 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-09-06 00:35:31,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:35:31,424 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-09-06 00:35:31,435 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:35:31,440 [ 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-06 00:35:31,458 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-09-06 00:35:31,458 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-09-06 00:35:31,459 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-06 00:35:31,463 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-09-06 00:35:31,463 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-09-06 00:35:31,463 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-09-06 00:35:31,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:35:31,806 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-09-06 00:35:31,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:35:31,824 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-09-06 00:35:31,841 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-06 00:35:31,844 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-09-06 00:35:31,844 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-09-06 00:35:31,844 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-09-06 00:35:31,844 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-09-06 00:35:31,844 [ scc.git] DEBUG create mode 100644 connect.py
2024-09-06 00:35:32,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:35:32,185 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-09-06 00:35:32,197 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:35:32,202 [ 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-06 00:35:32,289 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-09-06 00:35:32,290 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-06 00:35:32,294 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-09-06 00:35:32,294 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-09-06 00:35:32,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:35:32,572 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-09-06 00:35:32,585 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:35:32,590 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-09-06 00:35:32,672 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-09-06 00:35:32,674 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-06 00:35:32,678 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-09-06 00:35:32,679 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-09-06 00:35:32,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:35:32,964 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-09-06 00:35:32,976 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:35:32,981 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-09-06 00:35:33,082 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-09-06 00:35:33,084 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-06 00:35:33,093 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-09-06 00:35:33,093 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-09-06 00:35:33,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:35:33,359 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec'
2024-09-06 00:35:33,371 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:35:33,376 [ 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-06 00:35:33,397 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-06 00:35:33,400 [ scc.git] DEBUG src/omero/util/__init__.py | 8 +-------
2024-09-06 00:35:33,400 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 7 deletions(-)
2024-09-06 00:35:33,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:35:33,786 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-06 00:35:33,831 [ scc.git] DEBUG Get sha1 of %s
2024-09-06 00:35:33,831 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:35:33,835 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-06 00:35:33,885 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-06 00:35:33,894 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4c5064f5b0> has no local changes
2024-09-06 00:35:33,894 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-py
Excluded PRs:
- PR 427 Rdornier 'Add fileset folder creation' (user: Rdornier)
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 408 jburel 'remove deprecated method'
- PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
Generated by OMERO-python-superbuild-push#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/165/)'
2024-09-06 00:35:33,906 [ scc.git] DEBUG [detached HEAD b34ed8f1] merge master -Dorg -Ssuccess-only
2024-09-06 00:35:33,907 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-06 00:35:33,907 [ scc.git] INFO Overriding base-branch from master to develop
2024-09-06 00:35:33,907 [ scc.repo] DEBUG ## PRs found:
2024-09-06 00:35:34,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-09-06 00:35:34,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-09-06 00:35:35,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-09-06 00:35:35,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-09-06 00:35:36,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-09-06 00:35:36,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-09-06 00:35:37,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-09-06 00:35:37,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-06 00:35:38,198 [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-06 00:35:38,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-06 00:35:39,010 [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-06 00:35:39,011 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-06 00:35:39,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-09-06 00:35:40,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-09-06 00:35:40,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-09-06 00:35:40,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-09-06 00:35:40,972 [ scc.repo] DEBUG ## Branches found:
2024-09-06 00:35:40,972 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-09-06 00:35:40,972 [ scc.git] DEBUG Get sha1 of %s
2024-09-06 00:35:40,973 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:35:40,978 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-09-06 00:35:40,983 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-06 00:35:40,983 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-09-06 00:35:40,988 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-09-06 00:35:40,993 [ scc.git] DEBUG Already up to date.
2024-09-06 00:35:40,994 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-09-06 00:35:41,428 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-09-06 00:35:41,428 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-09-06 00:35:41,433 [ scc.git] DEBUG ## Unique users: []
2024-09-06 00:35:41,433 [ scc.git] DEBUG Get sha1 of %s
2024-09-06 00:35:41,433 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:35:41,437 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-06 00:35:41,444 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:35:41,450 [ 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-06 00:35:41,491 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-09-06 00:35:41,491 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-09-06 00:35:41,491 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-06 00:35:41,492 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-06 00:35:41,497 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-06 00:35:41,503 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-09-06 00:35:41,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:35:41,633 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-06 00:35:41,640 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-06 00:35:41,644 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#165](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/165/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/165/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-09-06 00:35:41,648 [ scc.config] DEBUG Found github.token
2024-09-06 00:35:41,649 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-09-06 00:35:41,649 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-06 00:35:41,693 [ scc.git] DEBUG Get sha1 of %s
2024-09-06 00:35:41,693 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:35:41,698 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-06 00:35:41,743 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-06 00:35:41,750 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4c506c4eb0> has no local changes
2024-09-06 00:35:41,750 [ 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#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/165/)'
2024-09-06 00:35:41,759 [ scc.git] DEBUG [detached HEAD 207687d] merge master -Dorg -Ssuccess-only
2024-09-06 00:35:41,759 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-06 00:35:41,759 [ scc.repo] DEBUG ## PRs found:
2024-09-06 00:35:42,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-09-06 00:35:42,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/576 HTTP/1.1" 200 None
2024-09-06 00:35:43,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341 HTTP/1.1" 200 None
2024-09-06 00:35:43,710 [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-06 00:35:44,189 [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-06 00:35:44,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341 HTTP/1.1" 200 None
2024-09-06 00:35:45,000 [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-06 00:35:45,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341 HTTP/1.1" 200 None
2024-09-06 00:35:45,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341/status HTTP/1.1" 200 None
2024-09-06 00:35:45,911 [ scc.repo] DEBUG - PR 576 will-moore 'webclient page scaleable, login page device-width'
2024-09-06 00:35:46,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/574 HTTP/1.1" 200 None
2024-09-06 00:35:46,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/574/comments HTTP/1.1" 200 None
2024-09-06 00:35:47,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None
2024-09-06 00:35:47,762 [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-06 00:35:48,270 [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-06 00:35:48,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None
2024-09-06 00:35:49,159 [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-06 00:35:49,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None
2024-09-06 00:35:49,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c/status HTTP/1.1" 200 None
2024-09-06 00:35:49,977 [ scc.repo] DEBUG - PR 574 will-moore 'Fix word wrap for names'
2024-09-06 00:35:50,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568 HTTP/1.1" 200 None
2024-09-06 00:35:50,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568/comments HTTP/1.1" 200 None
2024-09-06 00:35:51,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-09-06 00:35:51,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-09-06 00:35:52,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-09-06 00:35:52,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-09-06 00:35:53,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-09-06 00:35:53,664 [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-06 00:35:54,146 [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-06 00:35:54,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-09-06 00:35:55,042 [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-06 00:35:55,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-09-06 00:35:55,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-09-06 00:35:55,944 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-09-06 00:35:56,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-09-06 00:35:56,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-09-06 00:35:57,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-09-06 00:35:57,820 [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-06 00:35:58,289 [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-06 00:35:58,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-09-06 00:35:59,169 [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-06 00:35:59,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-09-06 00:36:00,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-09-06 00:36:00,071 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-09-06 00:36:00,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-09-06 00:36:00,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-09-06 00:36:01,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-09-06 00:36:01,937 [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-06 00:36:02,386 [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-06 00:36:02,389 [ scc.repo] DEBUG ## Branches found:
2024-09-06 00:36:02,389 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-09-06 00:36:02,390 [ scc.git] DEBUG Get sha1 of %s
2024-09-06 00:36:02,390 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:36:02,397 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-06 00:36:02,402 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-06 00:36:02,403 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-06 00:36:02,409 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-06 00:36:02,415 [ scc.git] DEBUG Already up to date.
2024-09-06 00:36:02,416 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-09-06 00:36:02,856 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-06 00:36:02,856 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-09-06 00:36:02,862 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-09-06 00:36:03,188 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-06 00:36:03,189 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-09-06 00:36:03,194 [ scc.git] DEBUG Calling 'git fetch origin pull/574/head'
2024-09-06 00:36:03,504 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-06 00:36:03,504 [ scc.git] DEBUG * branch refs/pull/574/head -> FETCH_HEAD
2024-09-06 00:36:03,510 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-09-06 00:36:03,815 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-06 00:36:03,816 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-09-06 00:36:03,821 [ scc.git] DEBUG ## Unique users: []
2024-09-06 00:36:03,821 [ scc.git] DEBUG Get sha1 of %s
2024-09-06 00:36:03,821 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:36:03,826 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-09-06 00:36:03,833 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:36:03,837 [ 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-06 00:36:03,892 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-09-06 00:36:03,892 [ scc.git] DEBUG Auto-merging setup.py
2024-09-06 00:36:03,894 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-06 00:36:03,897 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-09-06 00:36:03,897 [ scc.git] DEBUG setup.py | 1 +
2024-09-06 00:36:03,897 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-09-06 00:36:04,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:36:04,033 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-09-06 00:36:04,040 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:36:04,044 [ 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-06 00:36:04,063 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-09-06 00:36:04,064 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-09-06 00:36:04,064 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-06 00:36:04,068 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-09-06 00:36:04,069 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-09-06 00:36:04,069 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-09-06 00:36:04,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:36:04,416 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ad846e500db8aa8ec32fe0ea9b828ecb44871c2c'
2024-09-06 00:36:04,425 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:36:04,432 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 574 (Fix word wrap for names) ad846e500db8aa8ec32fe0ea9b828ecb44871c2c'
2024-09-06 00:36:04,489 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-06 00:36:04,495 [ scc.git] DEBUG omeroweb/webclient/static/webclient/css/layout.css | 2 ++
2024-09-06 00:36:04,495 [ scc.git] DEBUG omeroweb/webclient/templates/webclient/annotations/includes/name.html | 4 ++--
2024-09-06 00:36:04,495 [ scc.git] DEBUG 2 files changed, 4 insertions(+), 2 deletions(-)
2024-09-06 00:36:04,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:36:04,815 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0663a746b95073b4bbb2b7459859a42b0fc4e341'
2024-09-06 00:36:04,826 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:36:04,830 [ 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-06 00:36:04,852 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-06 00:36:04,856 [ scc.git] DEBUG omeroweb/webclient/templates/webclient/login.html | 3 ++-
2024-09-06 00:36:04,856 [ scc.git] DEBUG omeroweb/webgateway/templates/webgateway/base/base_main.html | 2 --
2024-09-06 00:36:04,856 [ scc.git] DEBUG 2 files changed, 2 insertions(+), 3 deletions(-)
2024-09-06 00:36:05,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:36:05,197 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-06 00:36:05,247 [ scc.git] DEBUG Get sha1 of %s
2024-09-06 00:36:05,247 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-06 00:36:05,251 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-06 00:36:05,292 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-06 00:36:05,305 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4c5060f6d0> has no local changes
2024-09-06 00:36:05,305 [ 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#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/165/)'
2024-09-06 00:36:05,316 [ scc.git] DEBUG [detached HEAD 48dadb5e2] merge master -Dorg -Ssuccess-only
2024-09-06 00:36:05,317 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-06 00:36:05,317 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-06 00:36:05,368 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-09-06 00:36:05,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:36:05,591 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-09-06 00:36:05,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:36:05,979 [ scc.config] DEBUG Found submodule.omero-py.url
2024-09-06 00:36:06,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:36:06,358 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-09-06 00:36:06,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:36:06,794 [ scc.config] DEBUG Found submodule.omero-web.url
2024-09-06 00:36:07,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-06 00:36:07,206 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-06 00:36:07,240 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f4c52455e20> has local changes
2024-09-06 00:36:07,240 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-python-superbuild
Already up to date.
Merged PRs:
- PR 291 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `2b30141`'
Repository: ome/omero-dropbox
Already up to date.
Merged PRs:
- PR 16 joshmoore 'Review all instances of whitelist/blacklist'
Repository: ome/omero-marshal
Excluded PRs:
- PR 34 chris-allan 'Initial support for Event' (exclude comment)
- PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 will-moore 'Roi encoder allows Shape None'
Repository: ome/omero-py
Excluded PRs:
- PR 427 Rdornier 'Add fileset folder creation' (user: Rdornier)
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 408 jburel 'remove deprecated method'
- PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Repository: ome/omero-web
Excluded PRs:
- PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 574 will-moore 'Fix word wrap for names'
- PR 576 will-moore 'webclient page scaleable, login page device-width'
Generated by OMERO-python-superbuild-push#165 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/165/)'
2024-09-06 00:36:07,255 [ scc.git] DEBUG [detached HEAD 9824129] merge master -Dorg -Ssuccess-only
2024-09-06 00:36:07,256 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-09-06 00:36:07,256 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-09-06 00:36:07,256 [ scc.merge] INFO Already up to date.
2024-09-06 00:36:07,256 [ scc.merge] INFO
2024-09-06 00:36:07,256 [ scc.merge] INFO Merged PRs:
2024-09-06 00:36:07,256 [ scc.merge] INFO - PR 291 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `2b30141`'
2024-09-06 00:36:07,256 [ scc.merge] INFO
2024-09-06 00:36:07,256 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-09-06 00:36:07,257 [ scc.merge] INFO Already up to date.
2024-09-06 00:36:07,257 [ scc.merge] INFO
2024-09-06 00:36:07,257 [ scc.merge] INFO Merged PRs:
2024-09-06 00:36:07,257 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-09-06 00:36:07,257 [ scc.merge] INFO
2024-09-06 00:36:07,257 [ scc.merge] INFO Repository: ome/omero-marshal
2024-09-06 00:36:07,257 [ scc.merge] INFO Excluded PRs:
2024-09-06 00:36:07,257 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-09-06 00:36:07,257 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-09-06 00:36:07,257 [ scc.merge] INFO Already up to date.
2024-09-06 00:36:07,257 [ scc.merge] INFO
2024-09-06 00:36:07,257 [ scc.merge] INFO Merged PRs:
2024-09-06 00:36:07,257 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-09-06 00:36:07,257 [ scc.merge] INFO
2024-09-06 00:36:07,257 [ scc.merge] INFO Repository: ome/omero-py
2024-09-06 00:36:07,257 [ scc.merge] INFO Excluded PRs:
2024-09-06 00:36:07,257 [ scc.merge] INFO - PR 427 Rdornier 'Add fileset folder creation' (user: Rdornier)
2024-09-06 00:36:07,257 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-09-06 00:36:07,258 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-09-06 00:36:07,258 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-09-06 00:36:07,258 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-09-06 00:36:07,258 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-09-06 00:36:07,258 [ scc.merge] INFO Already up to date.
2024-09-06 00:36:07,258 [ scc.merge] INFO
2024-09-06 00:36:07,258 [ scc.merge] INFO Merged PRs:
2024-09-06 00:36:07,258 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-09-06 00:36:07,258 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-09-06 00:36:07,258 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-09-06 00:36:07,258 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-09-06 00:36:07,258 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-09-06 00:36:07,258 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-09-06 00:36:07,258 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-09-06 00:36:07,258 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-09-06 00:36:07,258 [ scc.merge] INFO - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
2024-09-06 00:36:07,258 [ scc.merge] INFO
2024-09-06 00:36:07,258 [ scc.merge] INFO Repository: ome/omero-scripts
2024-09-06 00:36:07,258 [ scc.merge] INFO Excluded PRs:
2024-09-06 00:36:07,259 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-09-06 00:36:07,259 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-09-06 00:36:07,259 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-09-06 00:36:07,259 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-09-06 00:36:07,259 [ scc.merge] INFO Already up to date.
2024-09-06 00:36:07,259 [ scc.merge] INFO
2024-09-06 00:36:07,259 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-06 00:36:07,259 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-06 00:36:07,259 [ scc.merge] INFO
2024-09-06 00:36:07,259 [ scc.merge] INFO Repository: ome/omero-web
2024-09-06 00:36:07,259 [ scc.merge] INFO Excluded PRs:
2024-09-06 00:36:07,259 [ scc.merge] INFO - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
2024-09-06 00:36:07,259 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-09-06 00:36:07,259 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-09-06 00:36:07,259 [ scc.merge] INFO Already up to date.
2024-09-06 00:36:07,260 [ scc.merge] INFO
2024-09-06 00:36:07,260 [ scc.merge] INFO Merged PRs:
2024-09-06 00:36:07,260 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-09-06 00:36:07,260 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-09-06 00:36:07,260 [ scc.merge] INFO - PR 574 will-moore 'Fix word wrap for names'
2024-09-06 00:36:07,260 [ scc.merge] INFO - PR 576 will-moore 'webclient page scaleable, login page device-width'
2024-09-06 00:36:07,260 [ scc.merge] INFO
2024-09-06 00:36:07,260 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-06 00:36:07,260 [ scc.git] DEBUG Calling 'git remote'
2024-09-06 00:36:07,267 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-09-06 00:36:07,267 [ scc.git] DEBUG Calling 'git remote'
2024-09-06 00:36:07,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-06 00:36:07,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-09-06 00:36:07,274 [ scc.git] DEBUG Calling 'git remote'
2024-09-06 00:36:07,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-06 00:36:07,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-09-06 00:36:07,282 [ scc.git] DEBUG Calling 'git remote'
2024-09-06 00:36:07,289 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-06 00:36:07,289 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-09-06 00:36:07,289 [ scc.git] DEBUG Calling 'git remote'
2024-09-06 00:36:07,296 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-06 00:36:07,296 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-09-06 00:36:07,296 [ scc.git] DEBUG Calling 'git remote'
2024-09-06 00:36:07,305 [ 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-06 00:36:34,790 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/d0200910/images/svgs/logo.svg){kind=logo}
