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-24 08:49:15,320 [ scc.config] DEBUG Found github.token
2024-07-24 08:49:15,322 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-07-24 08:49:15,541 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 08:49:15,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 08:49:16,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-07-24 08:49:16,364 [ scc.gh] DEBUG 4986 remaining from 5000 (Reset at 09:07
2024-07-24 08:49:16,364 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-24 08:49:16,368 [ scc.git] DEBUG Check current status
2024-07-24 08:49:16,368 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-24 08:49:16,371 [ scc.git] DEBUG 508496f Merge pull request #288 from ome/dependabot/submodules/omero-web-ba8c7e2
2024-07-24 08:49:16,371 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-24 08:49:16,406 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-24 08:49:16,409 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-24 08:49:16,412 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-24 08:49:16,416 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-24 08:49:16,863 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-07-24 08:49:16,866 [ scc.config] DEBUG Found remote.origin.url
2024-07-24 08:49:17,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-07-24 08:49:17,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-24 08:49:17,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-24 08:49:18,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-24 08:49:18,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-24 08:49:18,849 [ scc.git] DEBUG Resetting...
2024-07-24 08:49:18,849 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-07-24 08:49:18,854 [ scc.git] DEBUG HEAD is now at 508496f Merge pull request #288 from ome/dependabot/submodules/omero-web-ba8c7e2
2024-07-24 08:49:18,854 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-07-24 08:49:18,899 [ scc.git] DEBUG Check current status
2024-07-24 08:49:18,900 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-24 08:49:18,903 [ scc.git] DEBUG 508496f Merge pull request #288 from ome/dependabot/submodules/omero-web-ba8c7e2
2024-07-24 08:49:18,903 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-24 08:49:18,937 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-24 08:49:18,939 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-24 08:49:18,943 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-24 08:49:18,946 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-24 08:49:18,950 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-07-24 08:49:18,951 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-07-24 08:49:18,951 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-07-24 08:49:18,951 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-07-24 08:49:18,951 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-07-24 08:49:18,951 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-07-24 08:49:18,951 [ scc.repo] DEBUG ## PRs found:
2024-07-24 08:49:19,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-07-24 08:49:19,283 [ scc.repo] DEBUG ## Branches found:
2024-07-24 08:49:19,283 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 08:49:19,283 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:49:19,286 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 08:49:19,289 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 08:49:19,290 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 08:49:19,293 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 08:49:19,296 [ scc.git] DEBUG Already up to date.
2024-07-24 08:49:19,296 [ scc.git] DEBUG ## Unique users: []
2024-07-24 08:49:19,296 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 08:49:19,296 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:49:19,299 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 08:49:19,335 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 08:49:19,335 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:49:19,338 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 08:49:20,002 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f00b59ef8e0> has no local changes
2024-07-24 08:49:20,003 [ 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#126 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/126/)'
2024-07-24 08:49:20,024 [ scc.git] DEBUG [detached HEAD d259b4e] merge master -Dorg -Snone
2024-07-24 08:49:20,024 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-07-24 08:49:20,024 [ scc.merge] INFO Already up to date.
2024-07-24 08:49:20,024 [ scc.merge] INFO
2024-07-24 08:49:20,024 [ scc.merge] INFO
2024-07-24 08:49:20,024 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-24 08:49:20,025 [ 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-24 08:49:23,687 [ scc.config] DEBUG Found github.token
2024-07-24 08:49:23,689 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-07-24 08:49:23,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 08:49:24,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 08:49:24,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-07-24 08:49:24,739 [ scc.gh] DEBUG 4978 remaining from 5000 (Reset at 09:07
2024-07-24 08:49:24,739 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-24 08:49:24,742 [ scc.git] DEBUG Check current status
2024-07-24 08:49:24,742 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-24 08:49:24,746 [ scc.git] DEBUG d259b4e merge master -Dorg -Snone
2024-07-24 08:49:24,746 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-24 08:49:24,781 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-24 08:49:24,784 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-24 08:49:24,787 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-24 08:49:24,790 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-24 08:49:24,795 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-07-24 08:49:24,798 [ scc.config] DEBUG Found remote.origin.url
2024-07-24 08:49:24,798 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-07-24 08:49:24,800 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-07-24 08:49:25,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-07-24 08:49:25,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-24 08:49:26,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-24 08:49:26,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-24 08:49:27,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-24 08:49:27,001 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 08:49:27,041 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-07-24 08:49:27,041 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-24 08:49:27,044 [ scc.git] DEBUG Check current status
2024-07-24 08:49:27,044 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-24 08:49:27,048 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-07-24 08:49:27,048 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-24 08:49:27,084 [ scc.config] DEBUG Found remote.origin.url
2024-07-24 08:49:27,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-07-24 08:49:27,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-24 08:49:28,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-24 08:49:28,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-24 08:49:29,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-24 08:49:29,215 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 08:49:29,249 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 08:49:29,249 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-07-24 08:49:29,249 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-24 08:49:29,253 [ scc.git] DEBUG Check current status
2024-07-24 08:49:29,253 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-24 08:49:29,256 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-07-24 08:49:29,256 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-24 08:49:29,292 [ scc.config] DEBUG Found remote.origin.url
2024-07-24 08:49:29,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-07-24 08:49:30,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-24 08:49:30,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-24 08:49:31,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-24 08:49:31,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-24 08:49:31,544 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 08:49:31,577 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 08:49:31,578 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-07-24 08:49:31,578 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-24 08:49:31,581 [ scc.git] DEBUG Check current status
2024-07-24 08:49:31,581 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-24 08:49:31,650 [ scc.git] DEBUG 749a68ac Bump version: 5.19.4 → 5.19.5.dev0
2024-07-24 08:49:31,650 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-24 08:49:31,686 [ scc.config] DEBUG Found remote.origin.url
2024-07-24 08:49:32,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-07-24 08:49:32,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-24 08:49:32,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-24 08:49:33,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-24 08:49:33,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-24 08:49:33,824 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 08:49:33,858 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 08:49:33,859 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-07-24 08:49:33,859 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-24 08:49:33,862 [ scc.git] DEBUG Check current status
2024-07-24 08:49:33,862 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-24 08:49:33,876 [ scc.git] DEBUG c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-24 08:49:33,876 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-24 08:49:33,912 [ scc.config] DEBUG Found remote.origin.url
2024-07-24 08:49:33,913 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-07-24 08:49:34,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-07-24 08:49:34,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-24 08:49:35,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-24 08:49:35,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-24 08:49:36,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-24 08:49:36,083 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 08:49:36,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 08:49:36,119 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-07-24 08:49:36,119 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-07-24 08:49:36,122 [ scc.git] DEBUG Check current status
2024-07-24 08:49:36,122 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-24 08:49:36,179 [ scc.git] DEBUG ba8c7e23c Merge pull request #563 from chris-allan/batch-by-max-download-rows
2024-07-24 08:49:36,179 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-24 08:49:36,216 [ scc.config] DEBUG Found remote.origin.url
2024-07-24 08:49:36,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-07-24 08:49:37,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-07-24 08:49:37,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-07-24 08:49:37,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-07-24 08:49:38,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-07-24 08:49:38,364 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 08:49:38,398 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 08:49:38,398 [ scc.git] DEBUG Resetting...
2024-07-24 08:49:38,398 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-07-24 08:49:38,403 [ scc.git] DEBUG HEAD is now at d259b4e merge master -Dorg -Snone
2024-07-24 08:49:38,403 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-07-24 08:49:38,448 [ scc.git] DEBUG Check current status
2024-07-24 08:49:38,448 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-07-24 08:49:38,451 [ scc.git] DEBUG d259b4e merge master -Dorg -Snone
2024-07-24 08:49:38,452 [ scc.git] DEBUG Calling 'git submodule status'
2024-07-24 08:49:38,486 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-07-24 08:49:38,488 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-07-24 08:49:38,491 [ scc.git] DEBUG 749a68acfc7b1851c165ae75f2c118743d8b1e0d omero-py (v5.19.4-1-g749a68ac)
2024-07-24 08:49:38,495 [ scc.git] DEBUG c20d2734b711c659cecea83db6e2ebd7b7013636 omero-scripts (v5.8.2-3-gc20d273)
2024-07-24 08:49:38,499 [ scc.git] DEBUG ba8c7e23c5d3343992812b7579e8d2cf30eb5374 omero-web (v5.26.0-28-gba8c7e23c)
2024-07-24 08:49:38,500 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-07-24 08:49:38,500 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-07-24 08:49:38,500 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-07-24 08:49:38,500 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-07-24 08:49:38,500 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-07-24 08:49:38,500 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-07-24 08:49:38,500 [ scc.repo] DEBUG ## PRs found:
2024-07-24 08:49:38,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-07-24 08:49:38,794 [ scc.repo] DEBUG ## Branches found:
2024-07-24 08:49:38,794 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 08:49:38,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:49:38,797 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 08:49:38,801 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 08:49:38,801 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 08:49:38,804 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 08:49:38,808 [ scc.git] DEBUG Already up to date.
2024-07-24 08:49:38,808 [ scc.git] DEBUG ## Unique users: []
2024-07-24 08:49:38,808 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 08:49:38,808 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:49:38,812 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 08:49:38,847 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 08:49:38,847 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:49:38,850 [ scc.repo] DEBUG ## PRs found:
2024-07-24 08:49:39,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-07-24 08:49:39,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-07-24 08:49:40,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-07-24 08:49:40,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-07-24 08:49:41,305 [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-24 08:49:41,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-07-24 08:49:42,165 [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-24 08:49:42,165 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-07-24 08:49:42,165 [ scc.repo] DEBUG ## Branches found:
2024-07-24 08:49:42,165 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-07-24 08:49:42,166 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 08:49:42,166 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:49:42,169 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 08:49:42,173 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 08:49:42,173 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 08:49:42,177 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 08:49:42,181 [ scc.git] DEBUG Already up to date.
2024-07-24 08:49:42,181 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-07-24 08:49:42,642 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-07-24 08:49:42,642 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-07-24 08:49:42,645 [ scc.git] DEBUG ## Unique users: []
2024-07-24 08:49:42,645 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 08:49:42,645 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:49:42,649 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-07-24 08:49:42,653 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:49:42,656 [ 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-24 08:49:42,911 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-07-24 08:49:42,911 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-07-24 08:49:42,911 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-07-24 08:49:42,911 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-07-24 08:49:42,911 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-07-24 08:49:42,911 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-07-24 08:49:42,911 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-07-24 08:49:42,911 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-07-24 08:49:42,911 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-07-24 08:49:42,911 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 08:49:42,915 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-07-24 08:49:42,915 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-07-24 08:49:42,915 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-07-24 08:49:42,915 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-07-24 08:49:42,915 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-07-24 08:49:42,915 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-07-24 08:49:42,915 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-07-24 08:49:42,915 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-07-24 08:49:42,915 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-07-24 08:49:42,916 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-07-24 08:49:43,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 08:49:43,072 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 08:49:43,106 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 08:49:43,107 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:49:43,110 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 08:49:43,143 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 08:49:43,148 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb069d4deb0> has no local changes
2024-07-24 08:49:43,148 [ 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#126 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/126/)'
2024-07-24 08:49:43,155 [ scc.git] DEBUG [detached HEAD beaa197] merge master -Dorg -Ssuccess-only
2024-07-24 08:49:43,155 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 08:49:43,155 [ scc.repo] DEBUG ## PRs found:
2024-07-24 08:49:43,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-07-24 08:49:44,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-07-24 08:49:44,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-07-24 08:49:45,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-07-24 08:49:45,995 [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-24 08:49:46,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-07-24 08:49:46,865 [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-24 08:49:46,865 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-07-24 08:49:47,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-07-24 08:49:47,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-07-24 08:49:48,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-07-24 08:49:48,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-07-24 08:49:48,782 [ scc.repo] DEBUG ## Branches found:
2024-07-24 08:49:48,782 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-07-24 08:49:48,782 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 08:49:48,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:49:48,786 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 08:49:48,790 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 08:49:48,790 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 08:49:48,794 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 08:49:48,797 [ scc.git] DEBUG Already up to date.
2024-07-24 08:49:48,798 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-07-24 08:49:49,380 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-07-24 08:49:49,380 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-07-24 08:49:49,383 [ scc.git] DEBUG ## Unique users: []
2024-07-24 08:49:49,383 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 08:49:49,383 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:49:49,387 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-07-24 08:49:49,391 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:49:49,395 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-07-24 08:49:49,405 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-07-24 08:49:49,405 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 08:49:49,408 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-07-24 08:49:49,408 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-07-24 08:49:49,408 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-07-24 08:49:49,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 08:49:49,576 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 08:49:49,610 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 08:49:49,610 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:49:49,613 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 08:49:49,647 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 08:49:49,651 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb069f5ebe0> has no local changes
2024-07-24 08:49:49,651 [ 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#126 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/126/)'
2024-07-24 08:49:49,658 [ scc.git] DEBUG [detached HEAD c6c4594] merge master -Dorg -Ssuccess-only
2024-07-24 08:49:49,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 08:49:49,659 [ scc.repo] DEBUG ## PRs found:
2024-07-24 08:49:50,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-07-24 08:49:50,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-07-24 08:49:51,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-07-24 08:49:51,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-07-24 08:49:52,373 [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-24 08:49:52,876 [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-24 08:49:53,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-07-24 08:49:53,786 [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-24 08:49:54,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-07-24 08:49:54,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-07-24 08:49:54,750 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-07-24 08:49:55,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-07-24 08:49:55,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-07-24 08:49:56,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-07-24 08:49:56,716 [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-24 08:49:57,217 [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-24 08:49:57,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-07-24 08:49:58,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-07-24 08:49:58,743 [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-24 08:49:59,211 [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-24 08:49:59,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-07-24 08:50:00,092 [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-24 08:50:00,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-07-24 08:50:00,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-07-24 08:50:00,962 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-07-24 08:50:01,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-07-24 08:50:01,447 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-07-24 08:50:01,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-07-24 08:50:02,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-07-24 08:50:02,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-07-24 08:50:03,450 [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-24 08:50:03,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-07-24 08:50:04,330 [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-24 08:50:04,330 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-07-24 08:50:04,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-07-24 08:50:05,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-07-24 08:50:05,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-07-24 08:50:06,262 [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-24 08:50:06,755 [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-24 08:50:07,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-07-24 08:50:07,705 [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-24 08:50:08,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-07-24 08:50:08,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-07-24 08:50:08,742 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-07-24 08:50:09,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-07-24 08:50:09,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-07-24 08:50:10,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-07-24 08:50:10,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-07-24 08:50:11,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-07-24 08:50:11,678 [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-24 08:50:12,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-07-24 08:50:12,531 [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-24 08:50:12,531 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-07-24 08:50:13,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-07-24 08:50:13,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-07-24 08:50:14,003 [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-24 08:50:14,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-07-24 08:50:14,882 [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-24 08:50:14,882 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-07-24 08:50:15,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-07-24 08:50:15,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-07-24 08:50:16,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-07-24 08:50:16,985 [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-24 08:50:17,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-07-24 08:50:17,876 [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-24 08:50:17,876 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-07-24 08:50:18,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-07-24 08:50:18,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-07-24 08:50:19,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-07-24 08:50:19,785 [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-24 08:50:20,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-07-24 08:50:20,664 [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-24 08:50:20,664 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-07-24 08:50:21,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-07-24 08:50:21,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-07-24 08:50:22,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-07-24 08:50:22,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-07-24 08:50:22,730 [ scc.repo] DEBUG ## Branches found:
2024-07-24 08:50:22,730 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-07-24 08:50:22,730 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 08:50:22,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:50:22,734 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 08:50:22,738 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 08:50:22,738 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 08:50:22,742 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 08:50:22,746 [ scc.git] DEBUG Already up to date.
2024-07-24 08:50:22,747 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-07-24 08:50:23,195 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-24 08:50:23,195 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-07-24 08:50:23,199 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-07-24 08:50:23,561 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-24 08:50:23,561 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-07-24 08:50:23,565 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-07-24 08:50:23,906 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-24 08:50:23,906 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-07-24 08:50:23,910 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-07-24 08:50:24,279 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-24 08:50:24,279 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-07-24 08:50:24,282 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-07-24 08:50:24,638 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-24 08:50:24,638 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-07-24 08:50:24,641 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-07-24 08:50:24,980 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-24 08:50:24,980 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-07-24 08:50:24,984 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-07-24 08:50:25,319 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-24 08:50:25,320 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-07-24 08:50:25,323 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-07-24 08:50:25,790 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-07-24 08:50:25,790 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-07-24 08:50:25,793 [ scc.git] DEBUG ## Unique users: []
2024-07-24 08:50:25,793 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 08:50:25,793 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:50:25,797 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-07-24 08:50:25,807 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:50:25,810 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-07-24 08:50:25,963 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-07-24 08:50:25,963 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-07-24 08:50:25,964 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 08:50:25,967 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-07-24 08:50:25,967 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-07-24 08:50:25,967 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-07-24 08:50:26,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 08:50:26,154 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-07-24 08:50:26,164 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:50:26,167 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-07-24 08:50:26,419 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-07-24 08:50:26,419 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-07-24 08:50:26,419 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 08:50:26,425 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-07-24 08:50:26,426 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-07-24 08:50:26,426 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-07-24 08:50:26,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 08:50:26,597 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-07-24 08:50:26,607 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:50:26,610 [ 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-24 08:50:26,719 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-07-24 08:50:26,720 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 08:50:26,723 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-07-24 08:50:26,723 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-07-24 08:50:27,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 08:50:27,019 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-07-24 08:50:27,030 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:50:27,034 [ 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-24 08:50:27,240 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-07-24 08:50:27,240 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-07-24 08:50:27,241 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 08:50:27,244 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-07-24 08:50:27,244 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-07-24 08:50:27,244 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-07-24 08:50:27,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 08:50:27,448 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-07-24 08:50:27,458 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:50:27,462 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-07-24 08:50:27,518 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 08:50:27,520 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-07-24 08:50:27,520 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-07-24 08:50:27,520 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-07-24 08:50:27,520 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-07-24 08:50:27,520 [ scc.git] DEBUG create mode 100644 connect.py
2024-07-24 08:50:27,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 08:50:27,872 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-07-24 08:50:27,882 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:50:27,886 [ 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-24 08:50:27,987 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-07-24 08:50:28,041 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 08:50:28,043 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-07-24 08:50:28,043 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-07-24 08:50:28,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 08:50:28,306 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-07-24 08:50:28,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:50:28,321 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-07-24 08:50:28,689 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-07-24 08:50:28,690 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 08:50:28,693 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-07-24 08:50:28,693 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-07-24 08:50:28,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 08:50:28,858 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-07-24 08:50:28,868 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:50:28,872 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-07-24 08:50:28,972 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-07-24 08:50:28,972 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 08:50:28,979 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-07-24 08:50:28,979 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-07-24 08:50:29,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 08:50:29,269 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 08:50:29,304 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 08:50:29,304 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:50:29,308 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 08:50:29,343 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 08:50:29,351 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb068c7eee0> has no local changes
2024-07-24 08:50:29,351 [ 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#126 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/126/)'
2024-07-24 08:50:29,358 [ scc.git] DEBUG [detached HEAD a8c734eb] merge master -Dorg -Ssuccess-only
2024-07-24 08:50:29,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 08:50:29,358 [ scc.git] INFO Overriding base-branch from master to develop
2024-07-24 08:50:29,359 [ scc.repo] DEBUG ## PRs found:
2024-07-24 08:50:29,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-07-24 08:50:30,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-07-24 08:50:31,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-07-24 08:50:31,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-07-24 08:50:32,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-07-24 08:50:32,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-07-24 08:50:32,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-07-24 08:50:33,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-24 08:50:33,986 [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-24 08:50:34,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-07-24 08:50:34,919 [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-24 08:50:34,919 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-24 08:50:35,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-07-24 08:50:36,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-07-24 08:50:36,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-07-24 08:50:37,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-07-24 08:50:37,071 [ scc.repo] DEBUG ## Branches found:
2024-07-24 08:50:37,071 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-07-24 08:50:37,071 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 08:50:37,071 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:50:37,075 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-07-24 08:50:37,079 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 08:50:37,079 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-07-24 08:50:37,083 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-07-24 08:50:37,087 [ scc.git] DEBUG Already up to date.
2024-07-24 08:50:37,087 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-07-24 08:50:37,574 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-07-24 08:50:37,574 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-07-24 08:50:37,578 [ scc.git] DEBUG ## Unique users: []
2024-07-24 08:50:37,578 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 08:50:37,578 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:50:37,583 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-24 08:50:37,588 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:50:37,592 [ 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-24 08:50:37,702 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-07-24 08:50:37,702 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-07-24 08:50:37,702 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-07-24 08:50:37,703 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-07-24 08:50:37,707 [ scc.git] DEBUG Calling 'git reset --hard c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-24 08:50:37,711 [ scc.git] DEBUG HEAD is now at c20d273 Merge pull request #221 from imcf/fix-typechecking
2024-07-24 08:50:37,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 08:50:37,870 [ scc.git] DEBUG Calling 'git merge-base c20d2734b711c659cecea83db6e2ebd7b7013636 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-07-24 08:50:37,875 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..c20d2734b711c659cecea83db6e2ebd7b7013636'
2024-07-24 08:50:37,879 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#126](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/126/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/126/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-07-24 08:50:37,883 [ scc.config] DEBUG Found github.token
2024-07-24 08:50:37,883 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-07-24 08:50:37,883 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 08:50:37,917 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 08:50:37,917 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:50:37,920 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 08:50:37,953 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 08:50:37,958 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb068c35610> has no local changes
2024-07-24 08:50:37,958 [ 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#126 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/126/)'
2024-07-24 08:50:37,965 [ scc.git] DEBUG [detached HEAD 520e7f6] merge master -Dorg -Ssuccess-only
2024-07-24 08:50:37,965 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 08:50:37,965 [ scc.repo] DEBUG ## PRs found:
2024-07-24 08:50:38,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-07-24 08:50:38,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568 HTTP/1.1" 200 None
2024-07-24 08:50:39,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/568/comments HTTP/1.1" 200 None
2024-07-24 08:50:39,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/564 HTTP/1.1" 200 None
2024-07-24 08:50:40,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/564/comments HTTP/1.1" 200 None
2024-07-24 08:50:40,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/c5815868107e99b7c63281ade90611c45db5bd72 HTTP/1.1" 200 None
2024-07-24 08:50:41,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/c5815868107e99b7c63281ade90611c45db5bd72/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-07-24 08:50:41,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/c5815868107e99b7c63281ade90611c45db5bd72/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-07-24 08:50:42,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/c5815868107e99b7c63281ade90611c45db5bd72 HTTP/1.1" 200 None
2024-07-24 08:50:42,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/c5815868107e99b7c63281ade90611c45db5bd72?per_page=1 HTTP/1.1" 200 None
2024-07-24 08:50:43,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/c5815868107e99b7c63281ade90611c45db5bd72 HTTP/1.1" 200 None
2024-07-24 08:50:43,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/c5815868107e99b7c63281ade90611c45db5bd72/status HTTP/1.1" 200 None
2024-07-24 08:50:43,634 [ scc.repo] DEBUG - PR 564 knabar 'New table API endpoints for lower level table access'
2024-07-24 08:50:44,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/555 HTTP/1.1" 200 None
2024-07-24 08:50:44,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/555/comments HTTP/1.1" 200 None
2024-07-24 08:50:45,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e HTTP/1.1" 200 None
2024-07-24 08:50:45,822 [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-24 08:50:46,308 [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-24 08:50:46,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e HTTP/1.1" 200 None
2024-07-24 08:50:47,190 [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-24 08:50:47,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e HTTP/1.1" 200 None
2024-07-24 08:50:48,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e/status HTTP/1.1" 200 None
2024-07-24 08:50:48,079 [ scc.repo] DEBUG - PR 555 chris-allan 'Archive status'
2024-07-24 08:50:48,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-07-24 08:50:49,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535/comments HTTP/1.1" 200 None
2024-07-24 08:50:49,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-07-24 08:50:50,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-07-24 08:50:50,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-07-24 08:50:51,089 [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-24 08:50:51,547 [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-24 08:50:52,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-07-24 08:50:52,499 [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-24 08:50:52,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-07-24 08:50:53,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-07-24 08:50:53,395 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-07-24 08:50:53,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-07-24 08:50:54,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-07-24 08:50:54,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-07-24 08:50:55,381 [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-24 08:50:55,885 [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-24 08:50:56,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-07-24 08:50:56,782 [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-24 08:50:57,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-07-24 08:50:57,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-07-24 08:50:57,666 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-07-24 08:50:58,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-07-24 08:50:58,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-07-24 08:50:59,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-07-24 08:50:59,716 [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-24 08:51:00,236 [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-24 08:51:00,241 [ scc.repo] DEBUG ## Branches found:
2024-07-24 08:51:00,242 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-07-24 08:51:00,242 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 08:51:00,242 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:51:00,247 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-07-24 08:51:00,251 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-07-24 08:51:00,251 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-07-24 08:51:00,255 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-07-24 08:51:00,260 [ scc.git] DEBUG Already up to date.
2024-07-24 08:51:00,260 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-07-24 08:51:00,721 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-24 08:51:00,721 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-07-24 08:51:00,725 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-07-24 08:51:01,113 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-24 08:51:01,113 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-07-24 08:51:01,117 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-07-24 08:51:02,619 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-24 08:51:02,620 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-07-24 08:51:02,624 [ scc.git] DEBUG Calling 'git fetch origin pull/564/head'
2024-07-24 08:51:03,282 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-07-24 08:51:03,282 [ scc.git] DEBUG * branch refs/pull/564/head -> FETCH_HEAD
2024-07-24 08:51:03,284 [ scc.git] DEBUG ## Unique users: []
2024-07-24 08:51:03,284 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 08:51:03,284 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:51:03,288 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-07-24 08:51:03,294 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:51:03,298 [ 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-24 08:51:03,312 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-07-24 08:51:03,312 [ scc.git] DEBUG Auto-merging setup.py
2024-07-24 08:51:03,314 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 08:51:03,317 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-07-24 08:51:03,317 [ scc.git] DEBUG setup.py | 1 +
2024-07-24 08:51:03,317 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-07-24 08:51:03,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 08:51:03,503 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-07-24 08:51:03,509 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:51:03,512 [ 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-24 08:51:03,530 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-07-24 08:51:03,530 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-07-24 08:51:03,531 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 08:51:03,534 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-07-24 08:51:03,534 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-07-24 08:51:03,534 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-07-24 08:51:03,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 08:51:03,911 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97e479b717e34179eceea2507d3e69a04b2fec1e'
2024-07-24 08:51:03,917 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:51:03,921 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Archive status) 97e479b717e34179eceea2507d3e69a04b2fec1e'
2024-07-24 08:51:04,142 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-07-24 08:51:04,201 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 08:51:04,205 [ scc.git] DEBUG omeroweb/webclient/static/webclient/javascript/ome.tree.js | 3 +++
2024-07-24 08:51:04,205 [ scc.git] DEBUG .../webclient/annotations/includes/core_metadata.html | 6 ++++++
2024-07-24 08:51:04,205 [ scc.git] DEBUG omeroweb/webclient/tree.py | 10 ++++++++--
2024-07-24 08:51:04,205 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 1 +
2024-07-24 08:51:04,205 [ scc.git] DEBUG 4 files changed, 18 insertions(+), 2 deletions(-)
2024-07-24 08:51:04,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 08:51:04,377 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c5815868107e99b7c63281ade90611c45db5bd72'
2024-07-24 08:51:04,383 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:51:04,387 [ 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) c5815868107e99b7c63281ade90611c45db5bd72'
2024-07-24 08:51:04,530 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-07-24 08:51:04,530 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/views.py
2024-07-24 08:51:04,531 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-07-24 08:51:04,535 [ scc.git] DEBUG omeroweb/settings.py | 7 ++
2024-07-24 08:51:04,535 [ scc.git] DEBUG omeroweb/webgateway/urls.py | 29 +++++++
2024-07-24 08:51:04,535 [ scc.git] DEBUG omeroweb/webgateway/views.py | 178 ++++++++++++++++++++++++++++++++++++++++++-
2024-07-24 08:51:04,535 [ scc.git] DEBUG 3 files changed, 213 insertions(+), 1 deletion(-)
2024-07-24 08:51:04,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 08:51:04,793 [ scc.git] DEBUG Calling 'git submodule update'
2024-07-24 08:51:04,828 [ scc.git] DEBUG Get sha1 of %s
2024-07-24 08:51:04,828 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-07-24 08:51:04,831 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 08:51:04,866 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 08:51:04,876 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb068c49460> has no local changes
2024-07-24 08:51:04,876 [ 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#126 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/126/)'
2024-07-24 08:51:04,887 [ scc.git] DEBUG [detached HEAD 7e393dd7c] merge master -Dorg -Ssuccess-only
2024-07-24 08:51:04,887 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 08:51:04,887 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-07-24 08:51:04,930 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-07-24 08:51:05,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 08:51:05,216 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-07-24 08:51:05,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 08:51:05,644 [ scc.config] DEBUG Found submodule.omero-py.url
2024-07-24 08:51:06,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 08:51:06,082 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-07-24 08:51:06,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 08:51:06,507 [ scc.config] DEBUG Found submodule.omero-web.url
2024-07-24 08:51:06,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-07-24 08:51:06,950 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-07-24 08:51:06,976 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb069d418e0> has local changes
2024-07-24 08:51:06,976 [ 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#126 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/126/)'
2024-07-24 08:51:06,983 [ scc.git] DEBUG [detached HEAD c33dcbf] merge master -Dorg -Ssuccess-only
2024-07-24 08:51:06,984 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-07-24 08:51:06,984 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-07-24 08:51:06,984 [ scc.merge] INFO Already up to date.
2024-07-24 08:51:06,984 [ scc.merge] INFO
2024-07-24 08:51:06,984 [ scc.merge] INFO
2024-07-24 08:51:06,984 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-07-24 08:51:06,984 [ scc.merge] INFO Already up to date.
2024-07-24 08:51:06,984 [ scc.merge] INFO
2024-07-24 08:51:06,984 [ scc.merge] INFO Merged PRs:
2024-07-24 08:51:06,984 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-07-24 08:51:06,984 [ scc.merge] INFO
2024-07-24 08:51:06,984 [ scc.merge] INFO Repository: ome/omero-marshal
2024-07-24 08:51:06,984 [ scc.merge] INFO Excluded PRs:
2024-07-24 08:51:06,984 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-07-24 08:51:06,984 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-07-24 08:51:06,984 [ scc.merge] INFO Already up to date.
2024-07-24 08:51:06,984 [ scc.merge] INFO
2024-07-24 08:51:06,984 [ scc.merge] INFO Merged PRs:
2024-07-24 08:51:06,984 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-07-24 08:51:06,984 [ scc.merge] INFO
2024-07-24 08:51:06,984 [ scc.merge] INFO Repository: ome/omero-py
2024-07-24 08:51:06,984 [ scc.merge] INFO Excluded PRs:
2024-07-24 08:51:06,984 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-07-24 08:51:06,984 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-07-24 08:51:06,985 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-07-24 08:51:06,985 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-07-24 08:51:06,985 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-07-24 08:51:06,985 [ scc.merge] INFO Already up to date.
2024-07-24 08:51:06,985 [ scc.merge] INFO
2024-07-24 08:51:06,985 [ scc.merge] INFO Merged PRs:
2024-07-24 08:51:06,985 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-07-24 08:51:06,985 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-07-24 08:51:06,985 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-07-24 08:51:06,985 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-07-24 08:51:06,985 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-07-24 08:51:06,985 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-07-24 08:51:06,985 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-07-24 08:51:06,985 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-07-24 08:51:06,985 [ scc.merge] INFO
2024-07-24 08:51:06,985 [ scc.merge] INFO Repository: ome/omero-scripts
2024-07-24 08:51:06,985 [ scc.merge] INFO Excluded PRs:
2024-07-24 08:51:06,985 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-07-24 08:51:06,985 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-07-24 08:51:06,985 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-07-24 08:51:06,985 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-07-24 08:51:06,985 [ scc.merge] INFO Already up to date.
2024-07-24 08:51:06,985 [ scc.merge] INFO
2024-07-24 08:51:06,985 [ scc.merge] INFO Conflicting PRs (not included):
2024-07-24 08:51:06,985 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-07-24 08:51:06,985 [ scc.merge] INFO
2024-07-24 08:51:06,985 [ scc.merge] INFO Repository: ome/omero-web
2024-07-24 08:51:06,985 [ scc.merge] INFO Excluded PRs:
2024-07-24 08:51:06,985 [ scc.merge] INFO - PR 568 Tom-TBT 'Perceptibly uniform luts for OMERO.web' (user: Tom-TBT)
2024-07-24 08:51:06,985 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-07-24 08:51:06,985 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-07-24 08:51:06,985 [ scc.merge] INFO Already up to date.
2024-07-24 08:51:06,985 [ scc.merge] INFO
2024-07-24 08:51:06,985 [ scc.merge] INFO Merged PRs:
2024-07-24 08:51:06,985 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-07-24 08:51:06,985 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-07-24 08:51:06,985 [ scc.merge] INFO - PR 555 chris-allan 'Archive status'
2024-07-24 08:51:06,985 [ scc.merge] INFO - PR 564 knabar 'New table API endpoints for lower level table access'
2024-07-24 08:51:06,986 [ scc.merge] INFO
2024-07-24 08:51:06,986 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-07-24 08:51:06,986 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 08:51:06,989 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-07-24 08:51:06,989 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 08:51:06,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 08:51:06,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-07-24 08:51:06,994 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 08:51:06,997 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 08:51:06,997 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-07-24 08:51:06,998 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 08:51:07,001 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 08:51:07,001 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-07-24 08:51:07,002 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 08:51:07,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-07-24 08:51:07,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-07-24 08:51:07,005 [ scc.git] DEBUG Calling 'git remote'
2024-07-24 08:51:07,009 [ 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-24 08:51:38,466 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci