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-07-23 10:25:36,895 [ scc.config] DEBUG Found github.token
2024-07-23 10:25:36,898 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-07-23 10:25:37,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:25:37,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:25:37,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-07-23 10:25:37,941 [ scc.gh] DEBUG 4340 remaining from 5000 (Reset at 10:07
2024-07-23 10:25:37,942 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-23 10:25:37,945 [ scc.git] DEBUG Check current status
2024-07-23 10:25:37,946 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-23 10:25:37,949 [ scc.git] DEBUG 508496f Merge pull request #288 from ome/dependabot/submodules/omero-web-ba8c7e2
2024-07-23 10:25:37,949 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-23 10:25:37,989 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-23 10:25:37,992 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-23 10:25:37,996 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-23 10:25:37,999 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-23 10:25:38,141 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-07-23 10:25:38,145 [ scc.config] DEBUG Found remote.origin.url
2024-07-23 10:25:38,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-07-23 10:25:38,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-23 10:25:39,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-23 10:25:39,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-23 10:25:40,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-23 10:25:40,172 [ scc.git] DEBUG Resetting...
2024-07-23 10:25:40,172 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-07-23 10:25:40,178 [ scc.git] DEBUG HEAD is now at 508496f Merge pull request #288 from ome/dependabot/submodules/omero-web-ba8c7e2
2024-07-23 10:25:40,178 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-07-23 10:25:40,229 [ scc.git] DEBUG Check current status
2024-07-23 10:25:40,230 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-23 10:25:40,233 [ scc.git] DEBUG 508496f Merge pull request #288 from ome/dependabot/submodules/omero-web-ba8c7e2
2024-07-23 10:25:40,233 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-23 10:25:40,273 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-23 10:25:40,276 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-23 10:25:40,279 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-23 10:25:40,283 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-23 10:25:40,287 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-07-23 10:25:40,288 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-07-23 10:25:40,288 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-07-23 10:25:40,288 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-07-23 10:25:40,288 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-07-23 10:25:40,288 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-07-23 10:25:40,288 [ scc.repo] DEBUG ## PRs found:
2024-07-23 10:25:40,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-07-23 10:25:40,600 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:25:40,600 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:25:40,600 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:25:40,604 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-23 10:25:40,608 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:25:40,608 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-23 10:25:40,611 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-23 10:25:40,615 [ scc.git] DEBUG Already up to date.
2024-07-23 10:25:40,616 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:25:40,616 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:25:40,616 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:25:40,619 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:25:40,661 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:25:40,662 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:25:40,665 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:25:40,769 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f636ac7b8e0> has no local changes
2024-07-23 10:25:40,769 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone
Repository: ome/omero-python-superbuild
Already up to date.
Generated by OMERO-python-superbuild-push#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/124/)'
2024-07-23 10:25:40,795 [ scc.git] DEBUG [detached HEAD 0a51eb1] merge master -Dorg -Snone
2024-07-23 10:25:40,795 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-07-23 10:25:40,795 [ scc.merge] INFO Already up to date.
2024-07-23 10:25:40,795 [ scc.merge] INFO
2024-07-23 10:25:40,795 [ scc.merge] INFO
2024-07-23 10:25:40,795 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-23 10:25:40,795 [ scc.git] DEBUG Calling 'git remote'
Synchronizing submodule url for 'omero-dropbox'
Synchronizing submodule url for 'omero-marshal'
Synchronizing submodule url for 'omero-py'
Synchronizing submodule url for 'omero-scripts'
Synchronizing submodule url for 'omero-web'
Merge all submodules using repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-07-23 10:25:43,495 [ scc.config] DEBUG Found github.token
2024-07-23 10:25:43,498 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-07-23 10:25:43,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:25:44,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:25:44,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-07-23 10:25:44,544 [ scc.gh] DEBUG 4332 remaining from 5000 (Reset at 10:07
2024-07-23 10:25:44,545 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-23 10:25:44,549 [ scc.git] DEBUG Check current status
2024-07-23 10:25:44,549 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-23 10:25:44,553 [ scc.git] DEBUG 0a51eb1 merge master -Dorg -Snone
2024-07-23 10:25:44,553 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-23 10:25:44,594 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-23 10:25:44,597 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-23 10:25:44,600 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-23 10:25:44,604 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-23 10:25:44,608 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-07-23 10:25:44,612 [ scc.config] DEBUG Found remote.origin.url
2024-07-23 10:25:44,613 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-07-23 10:25:44,614 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-07-23 10:25:45,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-07-23 10:25:45,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-23 10:25:45,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-23 10:25:46,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-23 10:25:46,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-23 10:25:46,798 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:25:46,845 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-07-23 10:25:46,846 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-23 10:25:46,849 [ scc.git] DEBUG Check current status
2024-07-23 10:25:46,849 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-23 10:25:46,853 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-07-23 10:25:46,853 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-23 10:25:46,897 [ scc.config] DEBUG Found remote.origin.url
2024-07-23 10:25:47,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-07-23 10:25:47,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-23 10:25:48,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-23 10:25:48,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-23 10:25:49,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-23 10:25:49,078 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:25:49,117 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-23 10:25:49,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-07-23 10:25:49,118 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-23 10:25:49,121 [ scc.git] DEBUG Check current status
2024-07-23 10:25:49,122 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-23 10:25:49,125 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-07-23 10:25:49,126 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-23 10:25:49,167 [ scc.config] DEBUG Found remote.origin.url
2024-07-23 10:25:49,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-07-23 10:25:50,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-23 10:25:50,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-23 10:25:50,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-23 10:25:51,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-23 10:25:51,336 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:25:51,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-23 10:25:51,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-07-23 10:25:51,378 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-23 10:25:51,382 [ scc.git] DEBUG Check current status
2024-07-23 10:25:51,382 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-23 10:25:51,386 [ scc.git] DEBUG 749a68ac Bump version: 5.19.4 → 5.19.5.dev0
2024-07-23 10:25:51,386 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-23 10:25:51,430 [ scc.config] DEBUG Found remote.origin.url
2024-07-23 10:25:51,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-07-23 10:25:52,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-23 10:25:52,761 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-23 10:25:53,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-23 10:25:53,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-23 10:25:53,623 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:25:53,663 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-23 10:25:53,664 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-07-23 10:25:53,664 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-23 10:25:53,668 [ scc.git] DEBUG Check current status
2024-07-23 10:25:53,668 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-23 10:25:53,672 [ scc.git] DEBUG c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-23 10:25:53,672 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-23 10:25:53,714 [ scc.config] DEBUG Found remote.origin.url
2024-07-23 10:25:53,715 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-07-23 10:25:54,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-07-23 10:25:54,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-23 10:25:55,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-23 10:25:55,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-23 10:25:55,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-23 10:25:55,923 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:25:55,963 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-23 10:25:55,964 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-07-23 10:25:55,964 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-23 10:25:55,969 [ scc.git] DEBUG Check current status
2024-07-23 10:25:55,969 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-23 10:25:55,973 [ scc.git] DEBUG ba8c7e23c Merge pull request #563 from chris-allan/batch-by-max-download-rows
2024-07-23 10:25:55,973 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-23 10:25:56,019 [ scc.config] DEBUG Found remote.origin.url
2024-07-23 10:25:56,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-07-23 10:25:56,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-23 10:25:57,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-23 10:25:57,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-23 10:25:58,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-23 10:25:58,291 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:25:58,339 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-23 10:25:58,340 [ scc.git] DEBUG Resetting...
2024-07-23 10:25:58,340 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-07-23 10:25:58,348 [ scc.git] DEBUG HEAD is now at 0a51eb1 merge master -Dorg -Snone
2024-07-23 10:25:58,348 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-07-23 10:25:58,415 [ scc.git] DEBUG Check current status
2024-07-23 10:25:58,415 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-23 10:25:58,419 [ scc.git] DEBUG 0a51eb1 merge master -Dorg -Snone
2024-07-23 10:25:58,419 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-23 10:25:58,460 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-23 10:25:58,463 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-23 10:25:58,466 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-23 10:25:58,470 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-23 10:25:58,475 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-07-23 10:25:58,476 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-07-23 10:25:58,476 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-07-23 10:25:58,476 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-07-23 10:25:58,476 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-07-23 10:25:58,476 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-07-23 10:25:58,476 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-07-23 10:25:58,476 [ scc.repo] DEBUG ## PRs found:
2024-07-23 10:25:58,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-07-23 10:25:58,727 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:25:58,728 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:25:58,728 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:25:58,732 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-23 10:25:58,735 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:25:58,736 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-23 10:25:58,739 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-23 10:25:58,743 [ scc.git] DEBUG Already up to date.
2024-07-23 10:25:58,743 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:25:58,744 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:25:58,744 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:25:58,747 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:25:58,786 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:25:58,786 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:25:58,791 [ scc.repo] DEBUG ## PRs found:
2024-07-23 10:25:59,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-07-23 10:25:59,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-07-23 10:26:00,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-07-23 10:26:00,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-07-23 10:26:01,261 [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-07-23 10:26:01,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-07-23 10:26:02,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:26:02,151 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-07-23 10:26:02,152 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:26:02,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-07-23 10:26:02,152 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:26:02,152 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:26:02,156 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-23 10:26:02,160 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:26:02,160 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-23 10:26:02,165 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-23 10:26:02,171 [ scc.git] DEBUG Already up to date.
2024-07-23 10:26:02,171 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-07-23 10:26:02,545 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-07-23 10:26:02,545 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-07-23 10:26:02,549 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:26:02,549 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:26:02,550 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:26:02,555 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-07-23 10:26:02,561 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:26:02,568 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-07-23 10:26:02,735 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-07-23 10:26:02,735 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-07-23 10:26:02,735 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-07-23 10:26:02,735 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-07-23 10:26:02,735 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-07-23 10:26:02,736 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-07-23 10:26:02,736 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-07-23 10:26:02,736 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-07-23 10:26:02,736 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-07-23 10:26:02,736 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:26:02,741 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-07-23 10:26:02,741 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-07-23 10:26:02,741 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-07-23 10:26:02,741 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-07-23 10:26:02,741 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-07-23 10:26:02,741 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-07-23 10:26:02,741 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-07-23 10:26:02,741 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-07-23 10:26:02,743 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-07-23 10:26:02,743 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-07-23 10:26:02,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:26:02,909 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:26:02,946 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:26:02,946 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:26:02,950 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:26:02,985 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:26:02,990 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3f4635eb0> has no local changes
2024-07-23 10:26:02,991 [ 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#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/124/)'
2024-07-23 10:26:02,998 [ scc.git] DEBUG [detached HEAD 05ad0dc] merge master -Dorg -Ssuccess-only
2024-07-23 10:26:02,998 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-23 10:26:02,998 [ scc.repo] DEBUG ## PRs found:
2024-07-23 10:26:03,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-07-23 10:26:03,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-07-23 10:26:04,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-07-23 10:26:05,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-07-23 10:26:05,522 [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-07-23 10:26:06,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-07-23 10:26:06,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:26:06,466 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-07-23 10:26:06,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-07-23 10:26:07,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-07-23 10:26:07,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-07-23 10:26:08,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-07-23 10:26:08,402 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:26:08,402 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-07-23 10:26:08,402 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:26:08,402 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:26:08,406 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-23 10:26:08,410 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:26:08,410 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-23 10:26:08,414 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-23 10:26:08,419 [ scc.git] DEBUG Already up to date.
2024-07-23 10:26:08,419 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-07-23 10:26:08,819 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-07-23 10:26:08,820 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-07-23 10:26:08,824 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:26:08,825 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:26:08,825 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:26:08,829 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-07-23 10:26:08,835 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:26:08,839 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-07-23 10:26:08,850 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-07-23 10:26:08,850 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:26:08,854 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-07-23 10:26:08,854 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-07-23 10:26:08,854 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-07-23 10:26:09,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:26:09,031 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:26:09,073 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:26:09,073 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:26:09,077 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:26:09,117 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:26:09,125 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3f350f460> has no local changes
2024-07-23 10:26:09,125 [ 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#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/124/)'
2024-07-23 10:26:09,134 [ scc.git] DEBUG [detached HEAD 709da53] merge master -Dorg -Ssuccess-only
2024-07-23 10:26:09,135 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-23 10:26:09,135 [ scc.repo] DEBUG ## PRs found:
2024-07-23 10:26:09,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-07-23 10:26:10,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-07-23 10:26:10,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-07-23 10:26:11,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-07-23 10:26:11,748 [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-07-23 10:26:12,251 [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-07-23 10:26:12,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-07-23 10:26:13,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None
2024-07-23 10:26:13,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-07-23 10:26:14,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-07-23 10:26:14,093 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-07-23 10:26:14,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-07-23 10:26:15,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-07-23 10:26:15,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-07-23 10:26:16,090 [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-07-23 10:26:16,566 [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-07-23 10:26:17,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-07-23 10:26:17,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-07-23 10:26:18,122 [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-07-23 10:26:18,625 [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-07-23 10:26:19,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-07-23 10:26:19,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-07-23 10:26:20,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-07-23 10:26:20,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-07-23 10:26:20,475 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-07-23 10:26:20,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-07-23 10:26:20,952 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-07-23 10:26:21,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-07-23 10:26:21,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-07-23 10:26:22,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-07-23 10:26:22,961 [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-07-23 10:26:23,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-07-23 10:26:23,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:26:23,861 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-07-23 10:26:24,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-07-23 10:26:24,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-07-23 10:26:25,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-07-23 10:26:25,824 [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-07-23 10:26:26,377 [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-07-23 10:26:26,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-07-23 10:26:27,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-07-23 10:26:27,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-07-23 10:26:28,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-07-23 10:26:28,237 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-07-23 10:26:28,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-07-23 10:26:29,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-07-23 10:26:29,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-07-23 10:26:30,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-07-23 10:26:30,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-07-23 10:26:31,308 [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-07-23 10:26:31,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-07-23 10:26:32,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:26:32,192 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-07-23 10:26:32,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-07-23 10:26:33,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-07-23 10:26:33,675 [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-07-23 10:26:34,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-07-23 10:26:34,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:26:34,566 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-07-23 10:26:35,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-07-23 10:26:35,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-07-23 10:26:36,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-07-23 10:26:36,622 [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-07-23 10:26:37,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-07-23 10:26:37,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:26:37,613 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-07-23 10:26:38,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-07-23 10:26:38,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-07-23 10:26:39,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-07-23 10:26:39,599 [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-07-23 10:26:40,132 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-07-23 10:26:40,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:26:40,550 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-07-23 10:26:41,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-07-23 10:26:41,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-07-23 10:26:41,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-07-23 10:26:42,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-07-23 10:26:42,519 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:26:42,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-07-23 10:26:42,519 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:26:42,519 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:26:42,524 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-23 10:26:42,529 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:26:42,529 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-23 10:26:42,534 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-23 10:26:42,539 [ scc.git] DEBUG Already up to date.
2024-07-23 10:26:42,539 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-07-23 10:26:43,279 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-23 10:26:43,279 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-07-23 10:26:43,284 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-07-23 10:26:43,640 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-23 10:26:43,641 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-07-23 10:26:43,646 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-07-23 10:26:44,002 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-23 10:26:44,003 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-07-23 10:26:44,007 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-07-23 10:26:44,400 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-23 10:26:44,401 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-07-23 10:26:44,406 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-07-23 10:26:45,014 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-23 10:26:45,014 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-07-23 10:26:45,022 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-07-23 10:26:45,361 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-23 10:26:45,361 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-07-23 10:26:45,365 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-07-23 10:26:45,710 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-23 10:26:45,710 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-07-23 10:26:45,715 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-07-23 10:26:46,109 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-23 10:26:46,109 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-07-23 10:26:46,113 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:26:46,113 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:26:46,113 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:26:46,117 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-07-23 10:26:46,127 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:26:46,131 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-07-23 10:26:46,192 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-07-23 10:26:46,192 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-07-23 10:26:46,194 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:26:46,198 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-07-23 10:26:46,198 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-07-23 10:26:46,198 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-07-23 10:26:46,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:26:46,384 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-07-23 10:26:46,396 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:26:46,400 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-07-23 10:26:46,509 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-07-23 10:26:46,509 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-07-23 10:26:46,510 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:26:46,517 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-07-23 10:26:46,517 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-07-23 10:26:46,517 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-07-23 10:26:46,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:26:46,794 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-07-23 10:26:46,805 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:26:46,811 [ 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-07-23 10:26:46,883 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-07-23 10:26:46,884 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:26:46,887 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-07-23 10:26:46,887 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-07-23 10:26:47,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:26:47,208 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-07-23 10:26:47,221 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:26:47,227 [ 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-07-23 10:26:47,294 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-07-23 10:26:47,294 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-07-23 10:26:47,295 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:26:47,299 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-07-23 10:26:47,299 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-07-23 10:26:47,299 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-07-23 10:26:47,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:26:47,630 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-07-23 10:26:47,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:26:47,645 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-07-23 10:26:47,682 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:26:47,685 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-07-23 10:26:47,685 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-07-23 10:26:47,685 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-07-23 10:26:47,685 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-07-23 10:26:47,685 [ scc.git] DEBUG create mode 100644 connect.py
2024-07-23 10:26:48,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:26:48,051 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-07-23 10:26:48,063 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:26:48,067 [ 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-07-23 10:26:48,122 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-07-23 10:26:48,123 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:26:48,126 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-07-23 10:26:48,126 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-07-23 10:26:48,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:26:48,471 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-07-23 10:26:48,482 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:26:48,486 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-07-23 10:26:48,565 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-07-23 10:26:48,566 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:26:48,570 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-07-23 10:26:48,570 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-07-23 10:26:48,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:26:48,884 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-07-23 10:26:48,896 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:26:48,901 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-07-23 10:26:48,950 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-07-23 10:26:48,951 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:26:48,959 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-07-23 10:26:48,959 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-07-23 10:26:49,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:26:49,294 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:26:49,338 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:26:49,339 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:26:49,343 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:26:49,386 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:26:49,395 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3f3567f10> has no local changes
2024-07-23 10:26:49,395 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-py
Excluded PRs:
- 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'
Generated by OMERO-python-superbuild-push#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/124/)'
2024-07-23 10:26:49,404 [ scc.git] DEBUG [detached HEAD f4fe4c26] merge master -Dorg -Ssuccess-only
2024-07-23 10:26:49,404 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-23 10:26:49,404 [ scc.git] INFO Overriding base-branch from master to develop
2024-07-23 10:26:49,405 [ scc.repo] DEBUG ## PRs found:
2024-07-23 10:26:50,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-07-23 10:26:50,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-07-23 10:26:51,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-07-23 10:26:51,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-07-23 10:26:52,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-07-23 10:26:52,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-07-23 10:26:52,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-07-23 10:26:53,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-23 10:26:54,029 [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-07-23 10:26:54,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-23 10:26:54,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-07-23 10:26:54,958 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-23 10:26:55,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-07-23 10:26:56,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-07-23 10:26:56,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-07-23 10:26:57,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-07-23 10:26:57,125 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:26:57,125 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-07-23 10:26:57,126 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:26:57,126 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:26:57,130 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-07-23 10:26:57,133 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:26:57,134 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-07-23 10:26:57,138 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-07-23 10:26:57,142 [ scc.git] DEBUG Already up to date.
2024-07-23 10:26:57,142 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-07-23 10:26:57,591 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-07-23 10:26:57,592 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-07-23 10:26:57,596 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:26:57,596 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:26:57,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:26:57,600 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-23 10:26:57,606 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:26:57,610 [ 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-07-23 10:26:57,642 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-07-23 10:26:57,642 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-07-23 10:26:57,643 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-23 10:26:57,643 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-23 10:26:57,648 [ scc.git] DEBUG Calling 'git reset --hard c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-23 10:26:57,653 [ scc.git] DEBUG HEAD is now at c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-23 10:26:57,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:26:57,840 [ scc.git] DEBUG Calling 'git merge-base c20d2734b711c659cecea83db6e2ebd7b7013636 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-23 10:26:57,846 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-23 10:26:57,850 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#124](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/124/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/124/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-07-23 10:26:57,854 [ scc.config] DEBUG Found github.token
2024-07-23 10:26:57,854 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-07-23 10:26:57,854 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:26:57,889 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:26:57,889 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:26:57,893 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:26:57,929 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:26:57,934 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3f351d640> has no local changes
2024-07-23 10:26:57,934 [ 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#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/124/)'
2024-07-23 10:26:57,942 [ scc.git] DEBUG [detached HEAD 019a2ce] merge master -Dorg -Ssuccess-only
2024-07-23 10:26:57,942 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-23 10:26:57,942 [ scc.repo] DEBUG ## PRs found:
2024-07-23 10:26:58,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-07-23 10:26:58,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568 HTTP/1.1" 200 None
2024-07-23 10:26:59,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/564 HTTP/1.1" 200 None
2024-07-23 10:26:59,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/564/comments HTTP/1.1" 200 None
2024-07-23 10:27:00,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde HTTP/1.1" 200 None
2024-07-23 10:27:00,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-23 10:27:01,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-23 10:27:02,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde HTTP/1.1" 200 None
2024-07-23 10:27:02,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/091e5fc2d35212271ac71fd66b42c611299d6fde?per_page=1 HTTP/1.1" 200 None
2024-07-23 10:27:02,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde HTTP/1.1" 200 None
2024-07-23 10:27:03,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/091e5fc2d35212271ac71fd66b42c611299d6fde/status HTTP/1.1" 200 None
2024-07-23 10:27:03,431 [ scc.repo] DEBUG - PR 564 knabar 'New table API endpoints for lower level table access'
2024-07-23 10:27:03,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/555 HTTP/1.1" 200 None
2024-07-23 10:27:04,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/555/comments HTTP/1.1" 200 None
2024-07-23 10:27:05,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e HTTP/1.1" 200 None
2024-07-23 10:27:05,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-23 10:27:06,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-23 10:27:06,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e HTTP/1.1" 200 None
2024-07-23 10:27:07,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/97e479b717e34179eceea2507d3e69a04b2fec1e?per_page=1 HTTP/1.1" 200 None
2024-07-23 10:27:07,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e HTTP/1.1" 200 None
2024-07-23 10:27:08,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e/status HTTP/1.1" 200 None
2024-07-23 10:27:08,204 [ scc.repo] DEBUG - PR 555 chris-allan 'Archive status'
2024-07-23 10:27:08,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-07-23 10:27:09,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-07-23 10:27:09,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-07-23 10:27:10,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-07-23 10:27:10,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-07-23 10:27:11,239 [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-07-23 10:27:11,718 [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-07-23 10:27:12,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-07-23 10:27:12,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-07-23 10:27:13,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-07-23 10:27:13,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-07-23 10:27:13,567 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-07-23 10:27:14,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-07-23 10:27:14,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-07-23 10:27:15,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-07-23 10:27:15,612 [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-07-23 10:27:16,113 [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-07-23 10:27:16,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-07-23 10:27:17,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-07-23 10:27:17,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-07-23 10:27:17,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-07-23 10:27:17,950 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-07-23 10:27:18,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-07-23 10:27:18,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-07-23 10:27:19,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-07-23 10:27:19,977 [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-07-23 10:27:20,493 [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-07-23 10:27:20,495 [ scc.repo] DEBUG ## Branches found:
2024-07-23 10:27:20,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-07-23 10:27:20,496 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:27:20,496 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:27:20,500 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-23 10:27:20,504 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-23 10:27:20,504 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-23 10:27:20,509 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-23 10:27:20,514 [ scc.git] DEBUG Already up to date.
2024-07-23 10:27:20,514 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-07-23 10:27:20,961 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-23 10:27:20,962 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-07-23 10:27:20,967 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-07-23 10:27:21,372 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-23 10:27:21,372 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-07-23 10:27:21,378 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-07-23 10:27:22,100 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-23 10:27:22,100 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-07-23 10:27:22,105 [ scc.git] DEBUG Calling 'git fetch origin pull/564/head'
2024-07-23 10:27:22,444 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-23 10:27:22,444 [ scc.git] DEBUG * branch refs/pull/564/head -> FETCH_HEAD
2024-07-23 10:27:22,449 [ scc.git] DEBUG ## Unique users: []
2024-07-23 10:27:22,449 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:27:22,449 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:27:22,455 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-07-23 10:27:22,463 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:27:22,468 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 527 (Add some initial CSP settings to test) 5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-07-23 10:27:22,569 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-07-23 10:27:22,570 [ scc.git] DEBUG Auto-merging setup.py
2024-07-23 10:27:22,571 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:27:22,575 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-07-23 10:27:22,576 [ scc.git] DEBUG setup.py | 1 +
2024-07-23 10:27:22,576 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-07-23 10:27:22,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:27:22,759 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-07-23 10:27:22,767 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:27:22,772 [ 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-07-23 10:27:22,857 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-07-23 10:27:22,857 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-07-23 10:27:22,858 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:27:22,862 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-07-23 10:27:22,862 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-07-23 10:27:22,862 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-07-23 10:27:23,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:27:23,228 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97e479b717e34179eceea2507d3e69a04b2fec1e'
2024-07-23 10:27:23,236 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:27:23,241 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Archive status) 97e479b717e34179eceea2507d3e69a04b2fec1e'
2024-07-23 10:27:23,333 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-07-23 10:27:23,334 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:27:23,340 [ scc.git] DEBUG omeroweb/webclient/static/webclient/javascript/ome.tree.js | 3 +++
2024-07-23 10:27:23,340 [ scc.git] DEBUG .../webclient/annotations/includes/core_metadata.html | 6 ++++++
2024-07-23 10:27:23,340 [ scc.git] DEBUG omeroweb/webclient/tree.py | 10 ++++++++--
2024-07-23 10:27:23,340 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 1 +
2024-07-23 10:27:23,340 [ scc.git] DEBUG 4 files changed, 18 insertions(+), 2 deletions(-)
2024-07-23 10:27:23,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:27:23,637 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...091e5fc2d35212271ac71fd66b42c611299d6fde'
2024-07-23 10:27:23,645 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:27:23,650 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 564 (New table API endpoints for lower level table access) 091e5fc2d35212271ac71fd66b42c611299d6fde'
2024-07-23 10:27:23,682 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-07-23 10:27:23,682 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/views.py
2024-07-23 10:27:23,683 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-23 10:27:23,688 [ scc.git] DEBUG omeroweb/settings.py | 7 ++
2024-07-23 10:27:23,688 [ scc.git] DEBUG omeroweb/webgateway/urls.py | 29 +++++++
2024-07-23 10:27:23,688 [ scc.git] DEBUG omeroweb/webgateway/views.py | 175 ++++++++++++++++++++++++++++++++++++++++++-
2024-07-23 10:27:23,688 [ scc.git] DEBUG 3 files changed, 210 insertions(+), 1 deletion(-)
2024-07-23 10:27:24,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:27:24,068 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-23 10:27:24,114 [ scc.git] DEBUG Get sha1 of %s
2024-07-23 10:27:24,114 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-23 10:27:24,119 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:27:24,159 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:27:24,170 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3f35314f0> has no local changes
2024-07-23 10:27:24,171 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 555 chris-allan 'Archive status'
- PR 564 knabar 'New table API endpoints for lower level table access'
Generated by OMERO-python-superbuild-push#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/124/)'
2024-07-23 10:27:24,185 [ scc.git] DEBUG [detached HEAD 34e506e9b] merge master -Dorg -Ssuccess-only
2024-07-23 10:27:24,186 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-23 10:27:24,187 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-23 10:27:24,248 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-07-23 10:27:24,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:27:24,487 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-07-23 10:27:24,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:27:24,958 [ scc.config] DEBUG Found submodule.omero-py.url
2024-07-23 10:27:25,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:27:25,379 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-07-23 10:27:25,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:27:25,794 [ scc.config] DEBUG Found submodule.omero-web.url
2024-07-23 10:27:26,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-23 10:27:26,228 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-23 10:27:26,254 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa3f46298e0> has local changes
2024-07-23 10:27:26,254 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-python-superbuild
Already up to date.
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 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'
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Repository: ome/omero-web
Excluded PRs:
- PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 555 chris-allan 'Archive status'
- PR 564 knabar 'New table API endpoints for lower level table access'
Generated by OMERO-python-superbuild-push#124 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/124/)'
2024-07-23 10:27:26,263 [ scc.git] DEBUG [detached HEAD 46f6c94] merge master -Dorg -Ssuccess-only
2024-07-23 10:27:26,264 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-07-23 10:27:26,264 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-07-23 10:27:26,264 [ scc.merge] INFO Already up to date.
2024-07-23 10:27:26,264 [ scc.merge] INFO
2024-07-23 10:27:26,264 [ scc.merge] INFO
2024-07-23 10:27:26,264 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-07-23 10:27:26,264 [ scc.merge] INFO Already up to date.
2024-07-23 10:27:26,264 [ scc.merge] INFO
2024-07-23 10:27:26,264 [ scc.merge] INFO Merged PRs:
2024-07-23 10:27:26,264 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-07-23 10:27:26,264 [ scc.merge] INFO
2024-07-23 10:27:26,264 [ scc.merge] INFO Repository: ome/omero-marshal
2024-07-23 10:27:26,264 [ scc.merge] INFO Excluded PRs:
2024-07-23 10:27:26,264 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-07-23 10:27:26,264 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-07-23 10:27:26,264 [ scc.merge] INFO Already up to date.
2024-07-23 10:27:26,264 [ scc.merge] INFO
2024-07-23 10:27:26,264 [ scc.merge] INFO Merged PRs:
2024-07-23 10:27:26,264 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-07-23 10:27:26,265 [ scc.merge] INFO
2024-07-23 10:27:26,265 [ scc.merge] INFO Repository: ome/omero-py
2024-07-23 10:27:26,265 [ scc.merge] INFO Excluded PRs:
2024-07-23 10:27:26,265 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-07-23 10:27:26,265 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-07-23 10:27:26,265 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-07-23 10:27:26,265 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-07-23 10:27:26,265 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-07-23 10:27:26,265 [ scc.merge] INFO Already up to date.
2024-07-23 10:27:26,265 [ scc.merge] INFO
2024-07-23 10:27:26,265 [ scc.merge] INFO Merged PRs:
2024-07-23 10:27:26,265 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-07-23 10:27:26,265 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-07-23 10:27:26,265 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-07-23 10:27:26,265 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-07-23 10:27:26,265 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-07-23 10:27:26,265 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-07-23 10:27:26,265 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-07-23 10:27:26,265 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-07-23 10:27:26,265 [ scc.merge] INFO
2024-07-23 10:27:26,265 [ scc.merge] INFO Repository: ome/omero-scripts
2024-07-23 10:27:26,265 [ scc.merge] INFO Excluded PRs:
2024-07-23 10:27:26,265 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-07-23 10:27:26,265 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-07-23 10:27:26,265 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-07-23 10:27:26,265 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-07-23 10:27:26,265 [ scc.merge] INFO Already up to date.
2024-07-23 10:27:26,265 [ scc.merge] INFO
2024-07-23 10:27:26,265 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-23 10:27:26,265 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-23 10:27:26,265 [ scc.merge] INFO
2024-07-23 10:27:26,265 [ scc.merge] INFO Repository: ome/omero-web
2024-07-23 10:27:26,265 [ scc.merge] INFO Excluded PRs:
2024-07-23 10:27:26,265 [ scc.merge] INFO - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
2024-07-23 10:27:26,266 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-07-23 10:27:26,266 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-07-23 10:27:26,266 [ scc.merge] INFO Already up to date.
2024-07-23 10:27:26,266 [ scc.merge] INFO
2024-07-23 10:27:26,266 [ scc.merge] INFO Merged PRs:
2024-07-23 10:27:26,266 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-07-23 10:27:26,266 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-07-23 10:27:26,266 [ scc.merge] INFO - PR 555 chris-allan 'Archive status'
2024-07-23 10:27:26,266 [ scc.merge] INFO - PR 564 knabar 'New table API endpoints for lower level table access'
2024-07-23 10:27:26,266 [ scc.merge] INFO
2024-07-23 10:27:26,266 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-23 10:27:26,266 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:27:26,270 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-07-23 10:27:26,270 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:27:26,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-23 10:27:26,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-07-23 10:27:26,274 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:27:26,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-23 10:27:26,278 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-07-23 10:27:26,278 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:27:26,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-23 10:27:26,282 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-07-23 10:27:26,282 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:27:26,286 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-23 10:27:26,286 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-07-23 10:27:26,286 [ scc.git] DEBUG Calling 'git remote'
2024-07-23 10:27:26,289 [ 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 c20d273
nothing to commit, working tree clean
Entering 'omero-web'
HEAD detached from ba8c7e23c
nothing to commit, working tree clean
HEAD detached from 508496f
nothing to commit, working tree clean
2024-07-23 10:27:57,194 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/b04263cd/images/svgs/logo.svg){kind=logo}
