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-02 00:34:08,086 [ scc.config] DEBUG Found github.token
2024-09-02 00:34:08,091 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-09-02 00:34:08,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:34:08,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:34:09,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-09-02 00:34:09,053 [ scc.gh] DEBUG 4325 remaining from 5000 (Reset at 00:09
2024-09-02 00:34:09,054 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-02 00:34:09,058 [ scc.git] DEBUG Check current status
2024-09-02 00:34:09,059 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-02 00:34:09,062 [ scc.git] DEBUG 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-09-02 00:34:09,062 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-02 00:34:09,099 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-02 00:34:09,102 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-02 00:34:09,105 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-02 00:34:09,109 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-02 00:34:09,114 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-09-02 00:34:09,118 [ scc.config] DEBUG Found remote.origin.url
2024-09-02 00:34:09,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-09-02 00:34:10,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-02 00:34:10,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-02 00:34:10,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-02 00:34:11,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-02 00:34:11,287 [ scc.git] DEBUG Resetting...
2024-09-02 00:34:11,287 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-09-02 00:34:11,293 [ scc.git] DEBUG HEAD is now at 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-09-02 00:34:11,293 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-09-02 00:34:11,340 [ scc.git] DEBUG Check current status
2024-09-02 00:34:11,340 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-02 00:34:11,344 [ scc.git] DEBUG 18cc8a4 Merge pull request #289 from ome/dependabot/submodules/omero-scripts-312afbe
2024-09-02 00:34:11,344 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-02 00:34:11,381 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-02 00:34:11,383 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-02 00:34:11,387 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-02 00:34:11,391 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-02 00:34:11,396 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-09-02 00:34:11,397 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-09-02 00:34:11,397 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-09-02 00:34:11,397 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-09-02 00:34:11,397 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-09-02 00:34:11,397 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-09-02 00:34:11,397 [ scc.repo] DEBUG ## PRs found:
2024-09-02 00:34:11,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-09-02 00:34:12,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/290 HTTP/1.1" 200 None
2024-09-02 00:34:12,185 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-02 00:34:12,185 [ scc.repo] DEBUG - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`'
2024-09-02 00:34:12,185 [ scc.repo] DEBUG ## Branches found:
2024-09-02 00:34:12,185 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:34:12,185 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:34:12,189 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-02 00:34:12,192 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-02 00:34:12,192 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-02 00:34:12,196 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-02 00:34:12,200 [ scc.git] DEBUG Already up to date.
2024-09-02 00:34:12,200 [ scc.git] DEBUG Calling 'git fetch origin pull/290/head'
2024-09-02 00:34:12,495 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-09-02 00:34:12,495 [ scc.git] DEBUG * branch refs/pull/290/head -> FETCH_HEAD
2024-09-02 00:34:12,500 [ scc.git] DEBUG ## Unique users: []
2024-09-02 00:34:12,500 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:34:12,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:34:12,504 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...43005729b7a6c8fd86894b00183ee7806d5fec7e'
2024-09-02 00:34:12,508 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:34:12,513 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 290 (Bump omero-web from `ba8c7e2` to `7cd445c`) 43005729b7a6c8fd86894b00183ee7806d5fec7e'
2024-09-02 00:34:12,522 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:34:12,524 [ scc.git] DEBUG omero-web | 2 +-
2024-09-02 00:34:12,524 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-09-02 00:34:12,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:34:12,665 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:34:12,728 [ scc.git] DEBUG Submodule path 'omero-web': checked out '7cd445ce3cc018efb4327eac5fc74701cffdc578'
2024-09-02 00:34:12,728 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:34:12,728 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:34:12,733 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:34:12,930 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f7006ee4e20> has no local changes
2024-09-02 00:34:12,930 [ 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 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`'
Generated by OMERO-python-superbuild-push#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/161/)'
2024-09-02 00:34:12,959 [ scc.git] DEBUG [detached HEAD 8f7733b] merge master -Dorg -Snone
2024-09-02 00:34:12,960 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-09-02 00:34:12,960 [ scc.merge] INFO Already up to date.
2024-09-02 00:34:12,960 [ scc.merge] INFO
2024-09-02 00:34:12,960 [ scc.merge] INFO Merged PRs:
2024-09-02 00:34:12,960 [ scc.merge] INFO - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`'
2024-09-02 00:34:12,960 [ scc.merge] INFO
2024-09-02 00:34:12,960 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-02 00:34:12,960 [ 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'
Submodule path 'omero-web': checked out '2b30141f008dbb3ef72cc06a3600f4a64f324c70'
Merge all submodules using repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-09-02 00:34:15,198 [ scc.config] DEBUG Found github.token
2024-09-02 00:34:15,201 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-09-02 00:34:15,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:34:15,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:34:16,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-09-02 00:34:16,143 [ scc.gh] DEBUG 4315 remaining from 5000 (Reset at 00:09
2024-09-02 00:34:16,144 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-02 00:34:16,148 [ scc.git] DEBUG Check current status
2024-09-02 00:34:16,148 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-02 00:34:16,153 [ scc.git] DEBUG 8f7733b merge master -Dorg -Snone
2024-09-02 00:34:16,153 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-02 00:34:16,195 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-02 00:34:16,198 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-02 00:34:16,201 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-02 00:34:16,205 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-02 00:34:16,209 [ scc.git] DEBUG +2b30141f008dbb3ef72cc06a3600f4a64f324c70 omero-web (v5.27.1-1-g2b30141f0)
2024-09-02 00:34:16,214 [ scc.config] DEBUG Found remote.origin.url
2024-09-02 00:34:16,214 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-09-02 00:34:16,216 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-09-02 00:34:16,610 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-09-02 00:34:17,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-02 00:34:17,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-02 00:34:17,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-02 00:34:18,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-02 00:34:18,254 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:34:18,312 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-09-02 00:34:18,312 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-02 00:34:18,316 [ scc.git] DEBUG Check current status
2024-09-02 00:34:18,316 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-02 00:34:18,320 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-09-02 00:34:18,320 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-02 00:34:18,360 [ scc.config] DEBUG Found remote.origin.url
2024-09-02 00:34:18,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-09-02 00:34:19,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-02 00:34:19,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-02 00:34:20,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-02 00:34:20,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-02 00:34:20,410 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:34:20,450 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-02 00:34:20,451 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-09-02 00:34:20,451 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-02 00:34:20,455 [ scc.git] DEBUG Check current status
2024-09-02 00:34:20,455 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-02 00:34:20,459 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-09-02 00:34:20,459 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-02 00:34:20,500 [ scc.config] DEBUG Found remote.origin.url
2024-09-02 00:34:20,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-09-02 00:34:21,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-02 00:34:21,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-02 00:34:22,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-02 00:34:22,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-02 00:34:22,529 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:34:22,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-02 00:34:22,572 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-09-02 00:34:22,572 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-02 00:34:22,576 [ scc.git] DEBUG Check current status
2024-09-02 00:34:22,576 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-02 00:34:22,597 [ scc.git] DEBUG 749a68ac Bump version: 5.19.4 → 5.19.5.dev0
2024-09-02 00:34:22,597 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-02 00:34:22,642 [ scc.config] DEBUG Found remote.origin.url
2024-09-02 00:34:22,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-09-02 00:34:23,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-02 00:34:23,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-02 00:34:24,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-02 00:34:24,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-02 00:34:24,644 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:34:24,686 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-02 00:34:24,687 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-09-02 00:34:24,687 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-02 00:34:24,691 [ scc.git] DEBUG Check current status
2024-09-02 00:34:24,692 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-02 00:34:24,701 [ scc.git] DEBUG 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-09-02 00:34:24,702 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-02 00:34:24,748 [ scc.config] DEBUG Found remote.origin.url
2024-09-02 00:34:24,749 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-09-02 00:34:25,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-09-02 00:34:25,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-02 00:34:25,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-02 00:34:26,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-02 00:34:26,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-02 00:34:26,715 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:34:26,754 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-02 00:34:26,755 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-09-02 00:34:26,755 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-09-02 00:34:26,760 [ scc.git] DEBUG Check current status
2024-09-02 00:34:26,760 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-02 00:34:26,779 [ scc.git] DEBUG 2b30141f0 Bump version: 5.27.1 → 5.27.2.dev0
2024-09-02 00:34:26,779 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-02 00:34:26,821 [ scc.config] DEBUG Found remote.origin.url
2024-09-02 00:34:27,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-09-02 00:34:27,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-09-02 00:34:28,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-09-02 00:34:28,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-09-02 00:34:28,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-09-02 00:34:28,871 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:34:28,909 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-02 00:34:28,910 [ scc.git] DEBUG Resetting...
2024-09-02 00:34:28,910 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-09-02 00:34:28,916 [ scc.git] DEBUG HEAD is now at 8f7733b merge master -Dorg -Snone
2024-09-02 00:34:28,916 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-09-02 00:34:28,978 [ scc.git] DEBUG Submodule path 'omero-web': checked out '7cd445ce3cc018efb4327eac5fc74701cffdc578'
2024-09-02 00:34:28,981 [ scc.git] DEBUG Check current status
2024-09-02 00:34:28,981 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-09-02 00:34:28,985 [ scc.git] DEBUG 8f7733b merge master -Dorg -Snone
2024-09-02 00:34:28,986 [ scc.git] DEBUG Calling 'git submodule status'
2024-09-02 00:34:29,023 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-09-02 00:34:29,026 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-09-02 00:34:29,030 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-09-02 00:34:29,033 [ scc.git] DEBUG 312afbed633613e1f728a1fe9eaac096e54318e0 omero-scripts (v5.8.3-1-g312afbe)
2024-09-02 00:34:29,036 [ scc.git] DEBUG 7cd445ce3cc018efb4327eac5fc74701cffdc578 omero-web (v5.27.0-1-g7cd445ce3)
2024-09-02 00:34:29,037 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-09-02 00:34:29,037 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-09-02 00:34:29,037 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-09-02 00:34:29,037 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-09-02 00:34:29,038 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-09-02 00:34:29,038 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-09-02 00:34:29,038 [ scc.repo] DEBUG ## PRs found:
2024-09-02 00:34:29,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-09-02 00:34:29,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/290 HTTP/1.1" 200 None
2024-09-02 00:34:29,835 [ scc.repo] DEBUG # ... Include label: dependencies
2024-09-02 00:34:30,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/43005729b7a6c8fd86894b00183ee7806d5fec7e HTTP/1.1" 200 None
2024-09-02 00:34:30,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/43005729b7a6c8fd86894b00183ee7806d5fec7e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-09-02 00:34:31,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/43005729b7a6c8fd86894b00183ee7806d5fec7e HTTP/1.1" 200 None
2024-09-02 00:34:31,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/statuses/43005729b7a6c8fd86894b00183ee7806d5fec7e?per_page=1 HTTP/1.1" 200 2
2024-09-02 00:34:31,997 [ scc.repo] DEBUG - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`'
2024-09-02 00:34:31,997 [ scc.repo] DEBUG ## Branches found:
2024-09-02 00:34:31,997 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:34:31,997 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:34:32,002 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-02 00:34:32,007 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-02 00:34:32,007 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-02 00:34:32,012 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-02 00:34:32,018 [ scc.git] DEBUG Already up to date.
2024-09-02 00:34:32,018 [ scc.git] DEBUG Calling 'git fetch origin pull/290/head'
2024-09-02 00:34:32,329 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-09-02 00:34:32,329 [ scc.git] DEBUG * branch refs/pull/290/head -> FETCH_HEAD
2024-09-02 00:34:32,335 [ scc.git] DEBUG ## Unique users: []
2024-09-02 00:34:32,335 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:34:32,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:34:32,340 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...43005729b7a6c8fd86894b00183ee7806d5fec7e'
2024-09-02 00:34:32,344 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:34:32,348 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 290 (Bump omero-web from `ba8c7e2` to `7cd445c`) 43005729b7a6c8fd86894b00183ee7806d5fec7e'
2024-09-02 00:34:32,352 [ scc.git] DEBUG Already up to date.
2024-09-02 00:34:32,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:34:32,491 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:34:32,537 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:34:32,537 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:34:32,542 [ scc.repo] DEBUG ## PRs found:
2024-09-02 00:34:32,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-09-02 00:34:33,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-09-02 00:34:33,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-09-02 00:34:34,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-09-02 00:34:34,863 [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-02 00:34:35,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-09-02 00:34:35,765 [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-02 00:34:35,765 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-09-02 00:34:35,765 [ scc.repo] DEBUG ## Branches found:
2024-09-02 00:34:35,765 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-09-02 00:34:35,765 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:34:35,766 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:34:35,770 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-02 00:34:35,773 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-02 00:34:35,773 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-02 00:34:35,777 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-02 00:34:35,781 [ scc.git] DEBUG Already up to date.
2024-09-02 00:34:35,782 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-09-02 00:34:36,137 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-09-02 00:34:36,138 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-09-02 00:34:36,142 [ scc.git] DEBUG ## Unique users: []
2024-09-02 00:34:36,142 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:34:36,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:34:36,147 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-09-02 00:34:36,151 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:34:36,154 [ 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-02 00:34:36,369 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-09-02 00:34:36,369 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-09-02 00:34:36,370 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-09-02 00:34:36,370 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-09-02 00:34:36,370 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-09-02 00:34:36,370 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-09-02 00:34:36,370 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-09-02 00:34:36,370 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-09-02 00:34:36,370 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-09-02 00:34:36,371 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:34:36,374 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-09-02 00:34:36,374 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-09-02 00:34:36,374 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-09-02 00:34:36,374 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-09-02 00:34:36,375 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-09-02 00:34:36,375 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-09-02 00:34:36,375 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-09-02 00:34:36,375 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-09-02 00:34:36,375 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-09-02 00:34:36,375 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-09-02 00:34:36,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:34:36,507 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:34:36,549 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:34:36,549 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:34:36,554 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:34:36,597 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:34:36,604 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e7769b1c0> has no local changes
2024-09-02 00:34:36,604 [ 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#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/161/)'
2024-09-02 00:34:36,613 [ scc.git] DEBUG [detached HEAD da08855] merge master -Dorg -Ssuccess-only
2024-09-02 00:34:36,613 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-02 00:34:36,613 [ scc.repo] DEBUG ## PRs found:
2024-09-02 00:34:37,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-09-02 00:34:37,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-09-02 00:34:37,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-09-02 00:34:38,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-09-02 00:34:38,860 [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-02 00:34:39,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-09-02 00:34:39,794 [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-02 00:34:39,794 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-09-02 00:34:40,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-09-02 00:34:40,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-09-02 00:34:41,186 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-09-02 00:34:41,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-09-02 00:34:41,612 [ scc.repo] DEBUG ## Branches found:
2024-09-02 00:34:41,612 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-09-02 00:34:41,612 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:34:41,612 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:34:41,617 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-02 00:34:41,620 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-02 00:34:41,620 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-02 00:34:41,624 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-02 00:34:41,628 [ scc.git] DEBUG Already up to date.
2024-09-02 00:34:41,629 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-09-02 00:34:41,998 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-09-02 00:34:41,998 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-09-02 00:34:42,003 [ scc.git] DEBUG ## Unique users: []
2024-09-02 00:34:42,003 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:34:42,003 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:34:42,008 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-09-02 00:34:42,014 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:34:42,019 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-09-02 00:34:42,048 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-09-02 00:34:42,049 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:34:42,052 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-09-02 00:34:42,052 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-09-02 00:34:42,052 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-09-02 00:34:42,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:34:42,193 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:34:42,234 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:34:42,235 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:34:42,239 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:34:42,277 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:34:42,283 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e76570730> has no local changes
2024-09-02 00:34:42,283 [ 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#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/161/)'
2024-09-02 00:34:42,290 [ scc.git] DEBUG [detached HEAD 1aaf523] merge master -Dorg -Ssuccess-only
2024-09-02 00:34:42,290 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-02 00:34:42,290 [ scc.repo] DEBUG ## PRs found:
2024-09-02 00:34:42,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-09-02 00:34:43,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/427 HTTP/1.1" 200 None
2024-09-02 00:34:43,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/424 HTTP/1.1" 200 None
2024-09-02 00:34:44,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/424/comments HTTP/1.1" 200 None
2024-09-02 00:34:44,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None
2024-09-02 00:34:45,385 [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-02 00:34:45,829 [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-02 00:34:46,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None
2024-09-02 00:34:46,755 [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-02 00:34:47,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec HTTP/1.1" 200 None
2024-09-02 00:34:47,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec/status HTTP/1.1" 200 None
2024-09-02 00:34:47,633 [ scc.repo] DEBUG - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
2024-09-02 00:34:48,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-09-02 00:34:48,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-09-02 00:34:48,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-09-02 00:34:49,457 [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-02 00:34:49,935 [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-02 00:34:50,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-09-02 00:34:50,834 [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-02 00:34:51,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-09-02 00:34:51,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-09-02 00:34:51,740 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-09-02 00:34:52,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-09-02 00:34:52,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-09-02 00:34:53,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-09-02 00:34:53,659 [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-02 00:34:54,100 [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-02 00:34:54,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-09-02 00:34:55,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-09-02 00:34:55,524 [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-02 00:34:55,966 [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-02 00:34:56,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-09-02 00:34:56,873 [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-02 00:34:57,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-09-02 00:34:57,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-09-02 00:34:57,780 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-09-02 00:34:58,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-09-02 00:34:58,229 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-09-02 00:34:58,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-09-02 00:34:59,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-09-02 00:34:59,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-09-02 00:35:00,025 [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-02 00:35:00,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-09-02 00:35:00,917 [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-02 00:35:00,918 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-09-02 00:35:01,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-09-02 00:35:01,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-09-02 00:35:02,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-09-02 00:35:02,788 [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-02 00:35:03,370 [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-02 00:35:03,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-09-02 00:35:04,287 [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-02 00:35:04,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-09-02 00:35:05,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-09-02 00:35:05,177 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-09-02 00:35:05,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-09-02 00:35:06,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-09-02 00:35:06,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-09-02 00:35:07,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-09-02 00:35:07,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-09-02 00:35:07,966 [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-02 00:35:08,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-09-02 00:35:08,858 [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-02 00:35:08,859 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-09-02 00:35:09,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-09-02 00:35:09,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-09-02 00:35:10,246 [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-02 00:35:10,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-09-02 00:35:11,087 [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-02 00:35:11,088 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-09-02 00:35:11,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-09-02 00:35:12,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-09-02 00:35:12,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-09-02 00:35:13,059 [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-02 00:35:13,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-09-02 00:35:13,892 [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-02 00:35:13,893 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-09-02 00:35:14,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-09-02 00:35:14,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-09-02 00:35:15,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-09-02 00:35:15,729 [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-02 00:35:16,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-09-02 00:35:16,543 [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-02 00:35:16,544 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-09-02 00:35:16,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-09-02 00:35:17,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-09-02 00:35:17,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-09-02 00:35:18,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-09-02 00:35:18,342 [ scc.repo] DEBUG ## Branches found:
2024-09-02 00:35:18,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-09-02 00:35:18,343 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:35:18,343 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:35:18,348 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-02 00:35:18,351 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-02 00:35:18,352 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-02 00:35:18,357 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-02 00:35:18,361 [ scc.git] DEBUG Already up to date.
2024-09-02 00:35:18,362 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-09-02 00:35:19,013 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-02 00:35:19,013 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-09-02 00:35:19,018 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-09-02 00:35:19,312 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-02 00:35:19,312 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-09-02 00:35:19,316 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-09-02 00:35:19,660 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-02 00:35:19,660 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-09-02 00:35:19,666 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-09-02 00:35:19,949 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-02 00:35:19,949 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-09-02 00:35:19,953 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-09-02 00:35:20,230 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-02 00:35:20,230 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-09-02 00:35:20,235 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-09-02 00:35:20,516 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-02 00:35:20,516 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-09-02 00:35:20,521 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-09-02 00:35:20,815 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-02 00:35:20,815 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-09-02 00:35:20,821 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-09-02 00:35:21,100 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-02 00:35:21,100 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-09-02 00:35:21,105 [ scc.git] DEBUG Calling 'git fetch origin pull/424/head'
2024-09-02 00:35:21,380 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-09-02 00:35:21,380 [ scc.git] DEBUG * branch refs/pull/424/head -> FETCH_HEAD
2024-09-02 00:35:21,385 [ scc.git] DEBUG ## Unique users: []
2024-09-02 00:35:21,385 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:35:21,385 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:35:21,390 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-09-02 00:35:21,401 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:35:21,404 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-09-02 00:35:21,424 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-09-02 00:35:21,424 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-09-02 00:35:21,425 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:35:21,428 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-09-02 00:35:21,429 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-09-02 00:35:21,429 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-09-02 00:35:21,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:35:21,568 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-09-02 00:35:21,580 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:35:21,584 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-09-02 00:35:21,710 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-09-02 00:35:21,711 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-09-02 00:35:21,711 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:35:21,718 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-09-02 00:35:21,718 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-09-02 00:35:21,719 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-09-02 00:35:22,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:35:22,005 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-09-02 00:35:22,016 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:35:22,020 [ 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-02 00:35:22,038 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-09-02 00:35:22,039 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:35:22,042 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-09-02 00:35:22,042 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-09-02 00:35:22,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:35:22,395 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-09-02 00:35:22,406 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:35:22,410 [ 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-02 00:35:22,430 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-09-02 00:35:22,431 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-09-02 00:35:22,432 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:35:22,436 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-09-02 00:35:22,436 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-09-02 00:35:22,436 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-09-02 00:35:22,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:35:22,786 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-09-02 00:35:22,797 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:35:22,802 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-09-02 00:35:22,819 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:35:22,821 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-09-02 00:35:22,821 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-09-02 00:35:22,821 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-09-02 00:35:22,821 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-09-02 00:35:22,821 [ scc.git] DEBUG create mode 100644 connect.py
2024-09-02 00:35:23,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:35:23,209 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-09-02 00:35:23,221 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:35:23,225 [ 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-02 00:35:23,244 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-09-02 00:35:23,244 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:35:23,247 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-09-02 00:35:23,247 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-09-02 00:35:23,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:35:23,634 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-09-02 00:35:23,646 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:35:23,650 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-09-02 00:35:23,686 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-09-02 00:35:23,687 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:35:23,692 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-09-02 00:35:23,692 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-09-02 00:35:24,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:35:24,017 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-09-02 00:35:24,031 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:35:24,035 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-09-02 00:35:24,163 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-09-02 00:35:24,164 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:35:24,171 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-09-02 00:35:24,171 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-09-02 00:35:24,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:35:24,400 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0f8fe1cf7fd80f6bdaa7788a5f0b15dcb6d542ec'
2024-09-02 00:35:24,414 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:35:24,418 [ 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-02 00:35:24,439 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:35:24,442 [ scc.git] DEBUG src/omero/util/__init__.py | 8 +-------
2024-09-02 00:35:24,442 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 7 deletions(-)
2024-09-02 00:35:24,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:35:24,800 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:35:24,841 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:35:24,841 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:35:24,845 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:35:24,887 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:35:24,896 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e765705e0> has no local changes
2024-09-02 00:35:24,896 [ 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#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/161/)'
2024-09-02 00:35:24,908 [ scc.git] DEBUG [detached HEAD 030d9968] merge master -Dorg -Ssuccess-only
2024-09-02 00:35:24,909 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-02 00:35:24,909 [ scc.git] INFO Overriding base-branch from master to develop
2024-09-02 00:35:24,909 [ scc.repo] DEBUG ## PRs found:
2024-09-02 00:35:25,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-09-02 00:35:25,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-09-02 00:35:26,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-09-02 00:35:26,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-09-02 00:35:27,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-09-02 00:35:27,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-09-02 00:35:28,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-09-02 00:35:28,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-02 00:35:29,203 [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-02 00:35:29,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-09-02 00:35:30,078 [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-02 00:35:30,079 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-02 00:35:30,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-09-02 00:35:31,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-09-02 00:35:31,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-09-02 00:35:31,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-09-02 00:35:31,994 [ scc.repo] DEBUG ## Branches found:
2024-09-02 00:35:31,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-09-02 00:35:31,994 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:35:31,995 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:35:32,000 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-09-02 00:35:32,004 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-02 00:35:32,004 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-09-02 00:35:32,010 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-09-02 00:35:32,015 [ scc.git] DEBUG Already up to date.
2024-09-02 00:35:32,015 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-09-02 00:35:32,457 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-09-02 00:35:32,457 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-09-02 00:35:32,462 [ scc.git] DEBUG ## Unique users: []
2024-09-02 00:35:32,462 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:35:32,462 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:35:32,468 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-02 00:35:32,475 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:35:32,479 [ 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-02 00:35:32,541 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-09-02 00:35:32,542 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-09-02 00:35:32,542 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-09-02 00:35:32,542 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-09-02 00:35:32,547 [ scc.git] DEBUG Calling 'git reset --hard 312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-02 00:35:32,553 [ scc.git] DEBUG HEAD is now at 312afbe Bump version: 5.8.3 → 5.8.4.dev0
2024-09-02 00:35:32,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:35:32,726 [ scc.git] DEBUG Calling 'git merge-base 312afbed633613e1f728a1fe9eaac096e54318e0 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-09-02 00:35:32,732 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..312afbed633613e1f728a1fe9eaac096e54318e0'
2024-09-02 00:35:32,737 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#161](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/161/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/161/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-09-02 00:35:32,741 [ scc.config] DEBUG Found github.token
2024-09-02 00:35:32,741 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-09-02 00:35:32,741 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:35:32,782 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:35:32,783 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:35:32,788 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:35:32,847 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:35:32,857 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e765d1c70> has no local changes
2024-09-02 00:35:32,858 [ 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#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/161/)'
2024-09-02 00:35:32,869 [ scc.git] DEBUG [detached HEAD 8c3f887] merge master -Dorg -Ssuccess-only
2024-09-02 00:35:32,869 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-02 00:35:32,869 [ scc.repo] DEBUG ## PRs found:
2024-09-02 00:35:33,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-09-02 00:35:33,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/576 HTTP/1.1" 200 None
2024-09-02 00:35:34,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341 HTTP/1.1" 200 None
2024-09-02 00:35:34,700 [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-02 00:35:35,173 [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-02 00:35:35,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341 HTTP/1.1" 200 None
2024-09-02 00:35:36,033 [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-02 00:35:36,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341 HTTP/1.1" 200 None
2024-09-02 00:35:36,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0663a746b95073b4bbb2b7459859a42b0fc4e341/status HTTP/1.1" 200 None
2024-09-02 00:35:36,866 [ scc.repo] DEBUG - PR 576 will-moore 'webclient page scaleable, login page device-width'
2024-09-02 00:35:37,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/574 HTTP/1.1" 200 None
2024-09-02 00:35:37,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/574/comments HTTP/1.1" 200 None
2024-09-02 00:35:38,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None
2024-09-02 00:35:38,722 [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-02 00:35:39,188 [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-02 00:35:39,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None
2024-09-02 00:35:40,051 [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-02 00:35:40,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c HTTP/1.1" 200 None
2024-09-02 00:35:40,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ad846e500db8aa8ec32fe0ea9b828ecb44871c2c/status HTTP/1.1" 200 None
2024-09-02 00:35:40,879 [ scc.repo] DEBUG - PR 574 will-moore 'Fix word wrap for names'
2024-09-02 00:35:41,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568 HTTP/1.1" 200 None
2024-09-02 00:35:41,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568/comments HTTP/1.1" 200 None
2024-09-02 00:35:42,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-09-02 00:35:42,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-09-02 00:35:43,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-09-02 00:35:43,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-09-02 00:35:44,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-09-02 00:35:44,619 [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-02 00:35:45,071 [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-02 00:35:45,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-09-02 00:35:45,975 [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-02 00:35:46,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-09-02 00:35:46,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-09-02 00:35:46,932 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-09-02 00:35:47,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-09-02 00:35:47,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-09-02 00:35:48,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-09-02 00:35:48,845 [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-02 00:35:49,311 [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-02 00:35:49,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-09-02 00:35:50,155 [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-02 00:35:50,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-09-02 00:35:50,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-09-02 00:35:50,993 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-09-02 00:35:51,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-09-02 00:35:51,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-09-02 00:35:52,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-09-02 00:35:52,872 [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-02 00:35:53,364 [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-02 00:35:53,366 [ scc.repo] DEBUG ## Branches found:
2024-09-02 00:35:53,366 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-09-02 00:35:53,366 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:35:53,366 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:35:53,371 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-09-02 00:35:53,375 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-09-02 00:35:53,375 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-09-02 00:35:53,380 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-09-02 00:35:53,395 [ scc.git] DEBUG Updating 7cd445ce3..2b30141f0
2024-09-02 00:35:53,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls/578 HTTP/1.1" 200 None
2024-09-02 00:35:54,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls/577 HTTP/1.1" 200 None
2024-09-02 00:35:55,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls/571 HTTP/1.1" 200 None
2024-09-02 00:35:55,235 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-09-02 00:35:55,746 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-02 00:35:55,746 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-09-02 00:35:55,751 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-09-02 00:35:56,080 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-02 00:35:56,081 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-09-02 00:35:56,086 [ scc.git] DEBUG Calling 'git fetch origin pull/574/head'
2024-09-02 00:35:56,386 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-02 00:35:56,386 [ scc.git] DEBUG * branch refs/pull/574/head -> FETCH_HEAD
2024-09-02 00:35:56,392 [ scc.git] DEBUG Calling 'git fetch origin pull/576/head'
2024-09-02 00:35:56,749 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-09-02 00:35:56,750 [ scc.git] DEBUG * branch refs/pull/576/head -> FETCH_HEAD
2024-09-02 00:35:56,755 [ scc.git] DEBUG ## Unique users: []
2024-09-02 00:35:56,755 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:35:56,755 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:35:56,760 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-09-02 00:35:56,768 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:35:56,774 [ 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-02 00:35:56,854 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-09-02 00:35:56,854 [ scc.git] DEBUG Auto-merging setup.py
2024-09-02 00:35:56,878 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:35:56,883 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-09-02 00:35:56,883 [ scc.git] DEBUG setup.py | 1 +
2024-09-02 00:35:56,883 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-09-02 00:35:57,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:35:57,019 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-09-02 00:35:57,031 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:35:57,037 [ 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-02 00:35:57,140 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-09-02 00:35:57,140 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-09-02 00:35:57,149 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:35:57,154 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-09-02 00:35:57,154 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-09-02 00:35:57,154 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-09-02 00:35:57,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:35:57,411 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ad846e500db8aa8ec32fe0ea9b828ecb44871c2c'
2024-09-02 00:35:57,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:35:57,426 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 574 (Fix word wrap for names) ad846e500db8aa8ec32fe0ea9b828ecb44871c2c'
2024-09-02 00:35:57,450 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:35:57,456 [ scc.git] DEBUG omeroweb/webclient/static/webclient/css/layout.css | 2 ++
2024-09-02 00:35:57,456 [ scc.git] DEBUG omeroweb/webclient/templates/webclient/annotations/includes/name.html | 4 ++--
2024-09-02 00:35:57,456 [ scc.git] DEBUG 2 files changed, 4 insertions(+), 2 deletions(-)
2024-09-02 00:35:57,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:35:57,810 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0663a746b95073b4bbb2b7459859a42b0fc4e341'
2024-09-02 00:35:57,824 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:35:57,833 [ 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-02 00:35:57,872 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-09-02 00:35:57,876 [ scc.git] DEBUG omeroweb/webclient/templates/webclient/login.html | 3 ++-
2024-09-02 00:35:57,877 [ scc.git] DEBUG omeroweb/webgateway/templates/webgateway/base/base_main.html | 2 --
2024-09-02 00:35:57,877 [ scc.git] DEBUG 2 files changed, 2 insertions(+), 3 deletions(-)
2024-09-02 00:35:58,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:35:58,205 [ scc.git] DEBUG Calling 'git submodule update'
2024-09-02 00:35:58,263 [ scc.git] DEBUG Get sha1 of %s
2024-09-02 00:35:58,264 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-09-02 00:35:58,270 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:35:58,315 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:35:58,328 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e7452b790> has no local changes
2024-09-02 00:35:58,328 [ 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)
Updating 7cd445ce3..2b30141f0
Previously merged:
- PR 578 knabar 'Update changelog'
- PR 577 chris-allan 'Refactors #555 to allow for backward compatibility'
- PR 571 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate'
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#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/161/)'
2024-09-02 00:35:58,341 [ scc.git] DEBUG [detached HEAD 6a9a16f3a] merge master -Dorg -Ssuccess-only
2024-09-02 00:35:58,341 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-02 00:35:58,341 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-09-02 00:35:58,406 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-09-02 00:35:58,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:35:58,645 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-09-02 00:35:59,026 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:35:59,039 [ scc.config] DEBUG Found submodule.omero-py.url
2024-09-02 00:35:59,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:35:59,439 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-09-02 00:35:59,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:35:59,847 [ scc.config] DEBUG Found submodule.omero-web.url
2024-09-02 00:36:00,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-09-02 00:36:00,217 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-09-02 00:36:00,245 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1e78371e20> has local changes
2024-09-02 00:36:00,246 [ 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 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`'
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)
Updating 7cd445ce3..2b30141f0
Previously merged:
- PR 578 knabar 'Update changelog'
- PR 577 chris-allan 'Refactors #555 to allow for backward compatibility'
- PR 571 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate'
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#161 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/161/)'
2024-09-02 00:36:00,257 [ scc.git] DEBUG [detached HEAD 22d9913] merge master -Dorg -Ssuccess-only
2024-09-02 00:36:00,257 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-09-02 00:36:00,257 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-09-02 00:36:00,258 [ scc.merge] INFO Already up to date.
2024-09-02 00:36:00,258 [ scc.merge] INFO
2024-09-02 00:36:00,258 [ scc.merge] INFO Merged PRs:
2024-09-02 00:36:00,258 [ scc.merge] INFO - PR 290 dependabot[bot] 'Bump omero-web from `ba8c7e2` to `7cd445c`'
2024-09-02 00:36:00,258 [ scc.merge] INFO
2024-09-02 00:36:00,258 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-09-02 00:36:00,258 [ scc.merge] INFO Already up to date.
2024-09-02 00:36:00,258 [ scc.merge] INFO
2024-09-02 00:36:00,258 [ scc.merge] INFO Merged PRs:
2024-09-02 00:36:00,258 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-09-02 00:36:00,258 [ scc.merge] INFO
2024-09-02 00:36:00,258 [ scc.merge] INFO Repository: ome/omero-marshal
2024-09-02 00:36:00,258 [ scc.merge] INFO Excluded PRs:
2024-09-02 00:36:00,258 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-09-02 00:36:00,258 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-09-02 00:36:00,258 [ scc.merge] INFO Already up to date.
2024-09-02 00:36:00,259 [ scc.merge] INFO
2024-09-02 00:36:00,259 [ scc.merge] INFO Merged PRs:
2024-09-02 00:36:00,259 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-09-02 00:36:00,259 [ scc.merge] INFO
2024-09-02 00:36:00,259 [ scc.merge] INFO Repository: ome/omero-py
2024-09-02 00:36:00,259 [ scc.merge] INFO Excluded PRs:
2024-09-02 00:36:00,259 [ scc.merge] INFO - PR 427 Rdornier 'Add fileset folder creation' (user: Rdornier)
2024-09-02 00:36:00,259 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-09-02 00:36:00,259 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-09-02 00:36:00,259 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-09-02 00:36:00,259 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-09-02 00:36:00,259 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-09-02 00:36:00,259 [ scc.merge] INFO Already up to date.
2024-09-02 00:36:00,259 [ scc.merge] INFO
2024-09-02 00:36:00,259 [ scc.merge] INFO Merged PRs:
2024-09-02 00:36:00,259 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-09-02 00:36:00,259 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-09-02 00:36:00,259 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-09-02 00:36:00,259 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-09-02 00:36:00,260 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-09-02 00:36:00,260 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-09-02 00:36:00,260 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-09-02 00:36:00,260 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-09-02 00:36:00,260 [ scc.merge] INFO - PR 424 DavidStirling 'Prevent hang on exit while omero.client keepalive is active'
2024-09-02 00:36:00,260 [ scc.merge] INFO
2024-09-02 00:36:00,260 [ scc.merge] INFO Repository: ome/omero-scripts
2024-09-02 00:36:00,260 [ scc.merge] INFO Excluded PRs:
2024-09-02 00:36:00,260 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-09-02 00:36:00,260 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-09-02 00:36:00,260 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-09-02 00:36:00,260 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-09-02 00:36:00,260 [ scc.merge] INFO Already up to date.
2024-09-02 00:36:00,260 [ scc.merge] INFO
2024-09-02 00:36:00,260 [ scc.merge] INFO Conflicting PRs (not included):
2024-09-02 00:36:00,260 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-09-02 00:36:00,260 [ scc.merge] INFO
2024-09-02 00:36:00,261 [ scc.merge] INFO Repository: ome/omero-web
2024-09-02 00:36:00,261 [ scc.merge] INFO Excluded PRs:
2024-09-02 00:36:00,261 [ scc.merge] INFO - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
2024-09-02 00:36:00,261 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-09-02 00:36:00,261 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-09-02 00:36:00,261 [ scc.merge] INFO Updating 7cd445ce3..2b30141f0
2024-09-02 00:36:00,261 [ scc.merge] INFO Previously merged:
2024-09-02 00:36:00,261 [ scc.merge] INFO - PR 578 knabar 'Update changelog'
2024-09-02 00:36:00,261 [ scc.merge] INFO - PR 577 chris-allan 'Refactors #555 to allow for backward compatibility'
2024-09-02 00:36:00,261 [ scc.merge] INFO - PR 571 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate'
2024-09-02 00:36:00,261 [ scc.merge] INFO
2024-09-02 00:36:00,261 [ scc.merge] INFO Merged PRs:
2024-09-02 00:36:00,261 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-09-02 00:36:00,261 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-09-02 00:36:00,261 [ scc.merge] INFO - PR 574 will-moore 'Fix word wrap for names'
2024-09-02 00:36:00,261 [ scc.merge] INFO - PR 576 will-moore 'webclient page scaleable, login page device-width'
2024-09-02 00:36:00,261 [ scc.merge] INFO
2024-09-02 00:36:00,261 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-09-02 00:36:00,262 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:36:00,270 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-09-02 00:36:00,271 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:36:00,276 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-02 00:36:00,276 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-09-02 00:36:00,276 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:36:00,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-02 00:36:00,280 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-09-02 00:36:00,280 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:36:00,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-02 00:36:00,284 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-09-02 00:36:00,284 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:36:00,288 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-09-02 00:36:00,288 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-09-02 00:36:00,288 [ scc.git] DEBUG Calling 'git remote'
2024-09-02 00:36:00,292 [ 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 7cd445ce3
nothing to commit, working tree clean
HEAD detached from 18cc8a4
nothing to commit, working tree clean
2024-09-02 00:36:27,329 [ 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}
