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-06-06 08:08:50,869 [ scc.config] DEBUG Found github.token
2024-06-06 08:08:50,872 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-06-06 08:08:51,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:08:51,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:08:51,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-06-06 08:08:51,934 [ scc.gh] DEBUG 4308 remaining from 5000 (Reset at 08:06
2024-06-06 08:08:51,934 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-06-06 08:08:51,939 [ scc.git] DEBUG Check current status
2024-06-06 08:08:51,939 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-06 08:08:51,944 [ scc.git] DEBUG 05f561e Merge pull request #282 from ome/dependabot/submodules/omero-py-d3a6542
2024-06-06 08:08:51,944 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-06 08:08:51,993 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-06-06 08:08:51,997 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-06-06 08:08:52,094 [ scc.git] DEBUG d3a65421944d94d69c3d8aa63ebdebed8f4ddb29 omero-py (v5.19.2-10-gd3a65421)
2024-06-06 08:08:52,099 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-06-06 08:08:52,103 [ scc.git] DEBUG 9c94fd493eb94588de8432247e084be57d7ea928 omero-web (v5.26.0-1-g9c94fd493)
2024-06-06 08:08:52,109 [ scc.config] DEBUG Found remote.origin.url
2024-06-06 08:08:52,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-06-06 08:08:52,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-06-06 08:08:53,332 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-06-06 08:08:53,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-06-06 08:08:54,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-06-06 08:08:54,154 [ scc.git] DEBUG Resetting...
2024-06-06 08:08:54,154 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-06-06 08:08:54,161 [ scc.git] DEBUG HEAD is now at 05f561e Merge pull request #282 from ome/dependabot/submodules/omero-py-d3a6542
2024-06-06 08:08:54,161 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-06-06 08:08:54,219 [ scc.git] DEBUG Check current status
2024-06-06 08:08:54,219 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-06 08:08:54,224 [ scc.git] DEBUG 05f561e Merge pull request #282 from ome/dependabot/submodules/omero-py-d3a6542
2024-06-06 08:08:54,224 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-06 08:08:54,271 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-06-06 08:08:54,274 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-06-06 08:08:54,278 [ scc.git] DEBUG d3a65421944d94d69c3d8aa63ebdebed8f4ddb29 omero-py (v5.19.2-10-gd3a65421)
2024-06-06 08:08:54,283 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-06-06 08:08:54,287 [ scc.git] DEBUG 9c94fd493eb94588de8432247e084be57d7ea928 omero-web (v5.26.0-1-g9c94fd493)
2024-06-06 08:08:54,288 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-06-06 08:08:54,288 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-06-06 08:08:54,288 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-06-06 08:08:54,288 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-06-06 08:08:54,288 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-06-06 08:08:54,288 [ scc.repo] DEBUG ## PRs found:
2024-06-06 08:08:54,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-06-06 08:08:54,601 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:08:54,601 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:08:54,601 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:08:54,605 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 08:08:54,608 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:08:54,609 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 08:08:54,613 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 08:08:54,618 [ scc.git] DEBUG Already up to date.
2024-06-06 08:08:54,618 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:08:54,618 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:08:54,618 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:08:54,622 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:08:54,665 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:08:54,665 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:08:54,669 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:08:54,884 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb6cf24e850> has no local changes
2024-06-06 08:08:54,884 [ 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#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/82/)'
2024-06-06 08:08:54,915 [ scc.git] DEBUG [detached HEAD e69a857] merge master -Dorg -Snone
2024-06-06 08:08:54,915 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-06-06 08:08:54,915 [ scc.merge] INFO Already up to date.
2024-06-06 08:08:54,915 [ scc.merge] INFO
2024-06-06 08:08:54,915 [ scc.merge] INFO
2024-06-06 08:08:54,915 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-06-06 08:08:54,915 [ 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-06-06 08:08:57,568 [ scc.config] DEBUG Found github.token
2024-06-06 08:08:57,571 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-06-06 08:08:57,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:08:58,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:08:58,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-06-06 08:08:58,581 [ scc.gh] DEBUG 4300 remaining from 5000 (Reset at 08:06
2024-06-06 08:08:58,583 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-06-06 08:08:58,589 [ scc.git] DEBUG Check current status
2024-06-06 08:08:58,589 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-06 08:08:58,594 [ scc.git] DEBUG e69a857 merge master -Dorg -Snone
2024-06-06 08:08:58,595 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-06 08:08:58,645 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-06-06 08:08:58,649 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-06-06 08:08:58,654 [ scc.git] DEBUG d3a65421944d94d69c3d8aa63ebdebed8f4ddb29 omero-py (v5.19.2-10-gd3a65421)
2024-06-06 08:08:58,658 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-06-06 08:08:58,662 [ scc.git] DEBUG 9c94fd493eb94588de8432247e084be57d7ea928 omero-web (v5.26.0-1-g9c94fd493)
2024-06-06 08:08:58,668 [ scc.config] DEBUG Found remote.origin.url
2024-06-06 08:08:58,668 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-06-06 08:08:58,670 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-06-06 08:08:59,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-06-06 08:08:59,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-06-06 08:08:59,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-06-06 08:09:00,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-06-06 08:09:00,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-06-06 08:09:00,780 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:09:00,835 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-06-06 08:09:00,835 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-06-06 08:09:00,839 [ scc.git] DEBUG Check current status
2024-06-06 08:09:00,839 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-06 08:09:00,844 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-06-06 08:09:00,844 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-06 08:09:00,889 [ scc.config] DEBUG Found remote.origin.url
2024-06-06 08:09:01,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-06-06 08:09:01,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-06-06 08:09:02,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-06-06 08:09:02,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-06-06 08:09:03,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-06-06 08:09:03,041 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:09:03,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-06 08:09:03,091 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-06-06 08:09:03,091 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-06-06 08:09:03,097 [ scc.git] DEBUG Check current status
2024-06-06 08:09:03,097 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-06 08:09:03,103 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-06-06 08:09:03,103 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-06 08:09:03,156 [ scc.config] DEBUG Found remote.origin.url
2024-06-06 08:09:03,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-06-06 08:09:03,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-06-06 08:09:04,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-06-06 08:09:04,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-06-06 08:09:05,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-06-06 08:09:05,249 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:09:05,292 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-06 08:09:05,293 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-06-06 08:09:05,293 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-06-06 08:09:05,298 [ scc.git] DEBUG Check current status
2024-06-06 08:09:05,298 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-06 08:09:05,314 [ scc.git] DEBUG d3a65421 Merge pull request #410 from jburel/python_wheel
2024-06-06 08:09:05,314 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-06 08:09:05,368 [ scc.config] DEBUG Found remote.origin.url
2024-06-06 08:09:05,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-06-06 08:09:06,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-06-06 08:09:06,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-06-06 08:09:07,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-06-06 08:09:07,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-06-06 08:09:07,546 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:09:07,597 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-06 08:09:07,598 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-06-06 08:09:07,599 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-06-06 08:09:07,605 [ scc.git] DEBUG Check current status
2024-06-06 08:09:07,605 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-06 08:09:07,624 [ scc.git] DEBUG 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-06-06 08:09:07,627 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-06 08:09:07,688 [ scc.config] DEBUG Found remote.origin.url
2024-06-06 08:09:07,689 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-06-06 08:09:08,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-06-06 08:09:08,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-06-06 08:09:08,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-06-06 08:09:09,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-06-06 08:09:09,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-06-06 08:09:09,790 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:09:09,842 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-06 08:09:09,843 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-06-06 08:09:09,843 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-06-06 08:09:09,849 [ scc.git] DEBUG Check current status
2024-06-06 08:09:09,849 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-06 08:09:09,877 [ scc.git] DEBUG 9c94fd493 Bump version: 5.26.0 → 5.26.1.dev0
2024-06-06 08:09:09,877 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-06 08:09:09,930 [ scc.config] DEBUG Found remote.origin.url
2024-06-06 08:09:10,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-06-06 08:09:10,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-06-06 08:09:11,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-06-06 08:09:11,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-06-06 08:09:12,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-06-06 08:09:12,052 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:09:12,102 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-06 08:09:12,103 [ scc.git] DEBUG Resetting...
2024-06-06 08:09:12,103 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-06-06 08:09:12,111 [ scc.git] DEBUG HEAD is now at e69a857 merge master -Dorg -Snone
2024-06-06 08:09:12,111 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-06-06 08:09:12,171 [ scc.git] DEBUG Check current status
2024-06-06 08:09:12,172 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-06 08:09:12,179 [ scc.git] DEBUG e69a857 merge master -Dorg -Snone
2024-06-06 08:09:12,179 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-06 08:09:12,229 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-06-06 08:09:12,232 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-06-06 08:09:12,236 [ scc.git] DEBUG d3a65421944d94d69c3d8aa63ebdebed8f4ddb29 omero-py (v5.19.2-10-gd3a65421)
2024-06-06 08:09:12,240 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-06-06 08:09:12,244 [ scc.git] DEBUG 9c94fd493eb94588de8432247e084be57d7ea928 omero-web (v5.26.0-1-g9c94fd493)
2024-06-06 08:09:12,245 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-06-06 08:09:12,245 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-06-06 08:09:12,245 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-06-06 08:09:12,245 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-06-06 08:09:12,245 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-06-06 08:09:12,245 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-06-06 08:09:12,246 [ scc.repo] DEBUG ## PRs found:
2024-06-06 08:09:12,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-06-06 08:09:12,503 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:09:12,504 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:09:12,504 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:09:12,510 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 08:09:12,514 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:09:12,515 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 08:09:12,519 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 08:09:12,525 [ scc.git] DEBUG Already up to date.
2024-06-06 08:09:12,526 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:09:12,526 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:09:12,526 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:09:12,531 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:09:12,577 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:09:12,577 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:09:12,583 [ scc.repo] DEBUG ## PRs found:
2024-06-06 08:09:13,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-06-06 08:09:13,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-06-06 08:09:14,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-06-06 08:09:14,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-06-06 08:09:15,170 [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-06-06 08:09:15,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-06-06 08:09:16,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:09:16,151 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-06-06 08:09:16,152 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:09:16,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-06-06 08:09:16,152 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:09:16,152 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:09:16,158 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 08:09:16,164 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:09:16,164 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 08:09:16,170 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 08:09:16,176 [ scc.git] DEBUG Already up to date.
2024-06-06 08:09:16,176 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-06-06 08:09:16,580 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-06-06 08:09:16,581 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-06-06 08:09:16,586 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:09:16,586 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:09:16,586 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:09:16,591 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-06-06 08:09:16,598 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:09:16,604 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-06-06 08:09:16,712 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-06-06 08:09:16,712 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-06-06 08:09:16,712 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-06-06 08:09:16,712 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-06-06 08:09:16,712 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-06-06 08:09:16,712 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-06-06 08:09:16,712 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-06-06 08:09:16,712 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-06-06 08:09:16,713 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-06-06 08:09:16,715 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:09:16,720 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-06-06 08:09:16,721 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-06-06 08:09:16,721 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-06-06 08:09:16,721 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-06-06 08:09:16,721 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-06-06 08:09:16,721 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-06-06 08:09:16,721 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-06-06 08:09:16,721 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-06-06 08:09:16,721 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-06-06 08:09:16,721 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-06-06 08:09:16,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:09:16,903 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:09:16,955 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:09:16,956 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:09:16,961 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:09:17,007 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:09:17,015 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe1b8ddbdc0> has no local changes
2024-06-06 08:09:17,015 [ 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#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/82/)'
2024-06-06 08:09:17,025 [ scc.git] DEBUG [detached HEAD 276e01a] merge master -Dorg -Ssuccess-only
2024-06-06 08:09:17,026 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-06 08:09:17,026 [ scc.repo] DEBUG ## PRs found:
2024-06-06 08:09:17,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-06-06 08:09:17,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-06-06 08:09:18,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-06-06 08:09:18,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-06-06 08:09:19,437 [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-06-06 08:09:19,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-06 08:09:20,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-06-06 08:09:20,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:09:20,886 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-06-06 08:09:21,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-06-06 08:09:21,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-06-06 08:09:22,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-06-06 08:09:22,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-06-06 08:09:22,750 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:09:22,750 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-06-06 08:09:22,750 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:09:22,750 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:09:22,756 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 08:09:22,761 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:09:22,761 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 08:09:22,766 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 08:09:22,773 [ scc.git] DEBUG Already up to date.
2024-06-06 08:09:22,773 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-06-06 08:09:23,257 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-06-06 08:09:23,257 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-06-06 08:09:23,263 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:09:23,263 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:09:23,263 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:09:23,269 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-06-06 08:09:23,275 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:09:23,280 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-06-06 08:09:23,292 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-06-06 08:09:23,293 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:09:23,296 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-06-06 08:09:23,297 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-06-06 08:09:23,297 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-06-06 08:09:23,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:09:23,485 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:09:23,529 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:09:23,529 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:09:23,534 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:09:23,576 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:09:23,582 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe1b8586c40> has no local changes
2024-06-06 08:09:23,583 [ 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#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/82/)'
2024-06-06 08:09:23,593 [ scc.git] DEBUG [detached HEAD ec06b9b] merge master -Dorg -Ssuccess-only
2024-06-06 08:09:23,593 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-06 08:09:23,593 [ scc.repo] DEBUG ## PRs found:
2024-06-06 08:09:24,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-06-06 08:09:24,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-06-06 08:09:25,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-06-06 08:09:25,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-06-06 08:09:26,178 [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-06-06 08:09:26,629 [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-06-06 08:09:27,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-06-06 08:09:27,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None
2024-06-06 08:09:27,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-06-06 08:09:28,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-06-06 08:09:28,357 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-06-06 08:09:28,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-06-06 08:09:29,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-06-06 08:09:29,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-06-06 08:09:30,259 [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-06-06 08:09:30,791 [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-06-06 08:09:31,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-06-06 08:09:31,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-06-06 08:09:32,316 [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-06-06 08:09:32,791 [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-06-06 08:09:33,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-06-06 08:09:33,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-06-06 08:09:34,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-06-06 08:09:34,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-06-06 08:09:34,673 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-06-06 08:09:35,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-06-06 08:09:35,126 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-06-06 08:09:35,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378 HTTP/1.1" 200 None
2024-06-06 08:09:36,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378/comments HTTP/1.1" 200 None
2024-06-06 08:09:36,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-06-06 08:09:36,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-06-06 08:09:37,448 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-06-06 08:09:37,921 [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-06-06 08:09:38,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-06-06 08:09:38,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:09:38,854 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-06-06 08:09:39,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-06-06 08:09:39,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-06-06 08:09:40,267 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-06-06 08:09:40,784 [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-06-06 08:09:41,302 [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-06-06 08:09:41,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-06-06 08:09:42,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-06-06 08:09:42,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-06-06 08:09:43,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-06-06 08:09:43,154 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-06-06 08:09:43,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-06-06 08:09:44,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-06-06 08:09:44,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-06-06 08:09:45,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-06-06 08:09:45,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-06-06 08:09:46,044 [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-06-06 08:09:46,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-06-06 08:09:46,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:09:46,957 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-06-06 08:09:47,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-06-06 08:09:47,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-06-06 08:09:48,356 [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-06-06 08:09:48,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-06-06 08:09:49,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:09:49,287 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-06-06 08:09:49,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-06-06 08:09:50,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-06-06 08:09:50,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-06-06 08:09:51,215 [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-06-06 08:09:51,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-06-06 08:09:52,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:09:52,082 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-06-06 08:09:52,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-06-06 08:09:53,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-06-06 08:09:53,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-06-06 08:09:54,070 [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-06-06 08:09:54,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-06-06 08:09:54,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:09:54,931 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-06-06 08:09:55,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-06-06 08:09:55,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-06-06 08:09:56,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-06-06 08:09:56,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-06-06 08:09:56,801 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:09:56,801 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-06-06 08:09:56,802 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:09:56,802 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:09:56,810 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 08:09:56,815 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:09:56,815 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 08:09:56,820 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 08:09:56,825 [ scc.git] DEBUG Already up to date.
2024-06-06 08:09:56,825 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-06-06 08:09:57,402 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-06-06 08:09:57,402 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-06-06 08:09:57,408 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-06-06 08:09:57,822 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-06-06 08:09:57,822 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-06-06 08:09:57,828 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-06-06 08:09:58,219 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-06-06 08:09:58,219 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-06-06 08:09:58,226 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-06-06 08:09:58,601 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-06-06 08:09:58,602 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-06-06 08:09:58,607 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-06-06 08:09:59,053 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-06-06 08:09:59,053 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-06-06 08:09:59,058 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-06-06 08:09:59,446 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-06-06 08:09:59,447 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-06-06 08:09:59,452 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-06-06 08:09:59,822 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-06-06 08:09:59,822 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-06-06 08:09:59,828 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-06-06 08:10:00,287 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-06-06 08:10:00,288 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-06-06 08:10:00,293 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:10:00,293 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:10:00,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:10:00,300 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-06-06 08:10:00,315 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:10:00,320 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-06-06 08:10:00,370 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-06-06 08:10:00,370 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-06-06 08:10:00,372 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:10:00,377 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-06-06 08:10:00,377 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-06-06 08:10:00,377 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-06-06 08:10:00,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:10:00,538 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-06-06 08:10:00,552 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:10:00,558 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-06-06 08:10:00,702 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-06-06 08:10:00,703 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-06-06 08:10:00,703 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:10:00,711 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-06-06 08:10:00,712 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-06-06 08:10:00,712 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-06-06 08:10:00,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:10:00,964 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-06-06 08:10:00,978 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:10:00,983 [ 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-06-06 08:10:01,065 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-06-06 08:10:01,066 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:10:01,069 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-06-06 08:10:01,069 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-06-06 08:10:01,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:10:01,386 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-06-06 08:10:01,400 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:10:01,404 [ 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-06-06 08:10:01,461 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-06-06 08:10:01,462 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-06-06 08:10:01,463 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:10:01,467 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-06-06 08:10:01,468 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-06-06 08:10:01,468 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-06-06 08:10:01,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:10:01,803 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-06-06 08:10:01,814 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:10:01,819 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-06-06 08:10:01,851 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:10:01,855 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-06-06 08:10:01,855 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-06-06 08:10:01,855 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-06-06 08:10:01,855 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-06-06 08:10:01,855 [ scc.git] DEBUG create mode 100644 connect.py
2024-06-06 08:10:02,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:10:02,230 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-06-06 08:10:02,242 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:10:02,248 [ 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-06-06 08:10:02,332 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-06-06 08:10:02,335 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:10:02,339 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-06-06 08:10:02,339 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-06-06 08:10:02,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:10:02,650 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-06-06 08:10:02,663 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:10:02,669 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-06-06 08:10:02,734 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-06-06 08:10:02,735 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:10:02,739 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-06-06 08:10:02,740 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-06-06 08:10:03,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:10:03,075 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-06-06 08:10:03,091 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:10:03,098 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-06-06 08:10:03,163 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-06-06 08:10:03,164 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:10:03,172 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-06-06 08:10:03,172 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-06-06 08:10:03,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:10:03,490 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:10:03,539 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:10:03,539 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:10:03,545 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:10:03,587 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:10:03,596 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe1b906ebe0> has no local changes
2024-06-06 08:10:03,597 [ 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 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
- 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#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/82/)'
2024-06-06 08:10:03,609 [ scc.git] DEBUG [detached HEAD 51162796] merge master -Dorg -Ssuccess-only
2024-06-06 08:10:03,609 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-06 08:10:03,610 [ scc.git] INFO Overriding base-branch from master to develop
2024-06-06 08:10:03,610 [ scc.repo] DEBUG ## PRs found:
2024-06-06 08:10:04,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-06-06 08:10:04,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-06-06 08:10:05,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-06-06 08:10:05,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-06-06 08:10:06,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-06-06 08:10:06,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-06-06 08:10:07,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-06-06 08:10:07,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-06 08:10:08,047 [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-06-06 08:10:08,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-06 08:10:08,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-06-06 08:10:08,934 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-06 08:10:09,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-06-06 08:10:09,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-06-06 08:10:10,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-06-06 08:10:10,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-06-06 08:10:10,980 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:10:10,980 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-06-06 08:10:10,980 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:10:10,980 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:10:10,987 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-06-06 08:10:10,992 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:10:10,992 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-06-06 08:10:10,996 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-06-06 08:10:11,001 [ scc.git] DEBUG Already up to date.
2024-06-06 08:10:11,001 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-06-06 08:10:11,486 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-06-06 08:10:11,487 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-06-06 08:10:11,492 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:10:11,492 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:10:11,492 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:10:11,497 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-06 08:10:11,504 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:10:11,508 [ 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-06-06 08:10:11,552 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-06-06 08:10:11,552 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-06-06 08:10:11,552 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-06 08:10:11,553 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-06 08:10:11,559 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-06 08:10:11,564 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-06-06 08:10:11,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:10:11,765 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-06 08:10:11,771 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-06 08:10:11,776 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#82](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/82/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/82/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-06-06 08:10:11,780 [ scc.config] DEBUG Found github.token
2024-06-06 08:10:11,780 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-06-06 08:10:11,780 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:10:11,821 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:10:11,821 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:10:11,825 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:10:11,868 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:10:11,874 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe1b8562640> has no local changes
2024-06-06 08:10:11,874 [ 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#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/82/)'
2024-06-06 08:10:11,882 [ scc.git] DEBUG [detached HEAD 12e754e] merge master -Dorg -Ssuccess-only
2024-06-06 08:10:11,882 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-06 08:10:11,882 [ scc.repo] DEBUG ## PRs found:
2024-06-06 08:10:12,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-06-06 08:10:12,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/558 HTTP/1.1" 200 None
2024-06-06 08:10:13,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/575f7bbc72aad997963937297f08156ca6f7dd5e HTTP/1.1" 200 None
2024-06-06 08:10:13,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/575f7bbc72aad997963937297f08156ca6f7dd5e/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-06 08:10:14,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/575f7bbc72aad997963937297f08156ca6f7dd5e/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-06 08:10:14,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/575f7bbc72aad997963937297f08156ca6f7dd5e HTTP/1.1" 200 None
2024-06-06 08:10:15,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/575f7bbc72aad997963937297f08156ca6f7dd5e?per_page=1 HTTP/1.1" 200 None
2024-06-06 08:10:15,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/575f7bbc72aad997963937297f08156ca6f7dd5e HTTP/1.1" 200 None
2024-06-06 08:10:16,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/575f7bbc72aad997963937297f08156ca6f7dd5e/status HTTP/1.1" 200 None
2024-06-06 08:10:16,169 [ scc.repo] DEBUG - PR 558 jburel 'Update readme'
2024-06-06 08:10:16,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/555 HTTP/1.1" 200 None
2024-06-06 08:10:17,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/555/comments HTTP/1.1" 200 None
2024-06-06 08:10:17,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/59392ac61e24b2ee642c3cdcae6d3f8dd514394f HTTP/1.1" 200 None
2024-06-06 08:10:18,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/59392ac61e24b2ee642c3cdcae6d3f8dd514394f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-06-06 08:10:18,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/59392ac61e24b2ee642c3cdcae6d3f8dd514394f/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-06 08:10:19,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/59392ac61e24b2ee642c3cdcae6d3f8dd514394f HTTP/1.1" 200 None
2024-06-06 08:10:19,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/59392ac61e24b2ee642c3cdcae6d3f8dd514394f?per_page=1 HTTP/1.1" 200 None
2024-06-06 08:10:20,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/59392ac61e24b2ee642c3cdcae6d3f8dd514394f HTTP/1.1" 200 None
2024-06-06 08:10:20,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/59392ac61e24b2ee642c3cdcae6d3f8dd514394f/status HTTP/1.1" 200 None
2024-06-06 08:10:20,542 [ scc.repo] DEBUG - PR 555 chris-allan 'Archive status'
2024-06-06 08:10:21,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/554 HTTP/1.1" 200 None
2024-06-06 08:10:21,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-06-06 08:10:21,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-06-06 08:10:22,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-06-06 08:10:22,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-06-06 08:10:23,447 [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-06-06 08:10:23,927 [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-06-06 08:10:24,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-06-06 08:10:24,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-06-06 08:10:25,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-06-06 08:10:25,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-06-06 08:10:25,846 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-06-06 08:10:26,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-06-06 08:10:26,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-06-06 08:10:27,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-06-06 08:10:27,782 [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-06-06 08:10:28,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-06-06 08:10:28,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-06-06 08:10:29,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-06-06 08:10:29,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-06-06 08:10:30,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-06-06 08:10:30,161 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-06-06 08:10:30,625 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-06-06 08:10:31,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-06-06 08:10:31,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-06-06 08:10:32,113 [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-06-06 08:10:32,678 [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-06-06 08:10:32,681 [ scc.repo] DEBUG ## Branches found:
2024-06-06 08:10:32,682 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-06-06 08:10:32,682 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:10:32,682 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:10:32,688 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-06 08:10:32,694 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-06 08:10:32,694 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-06 08:10:32,706 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-06 08:10:32,713 [ scc.git] DEBUG Already up to date.
2024-06-06 08:10:32,714 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-06-06 08:10:33,377 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-06-06 08:10:33,377 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-06-06 08:10:33,382 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-06-06 08:10:33,804 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-06-06 08:10:33,804 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-06-06 08:10:33,809 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-06-06 08:10:34,695 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-06-06 08:10:34,696 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-06-06 08:10:34,701 [ scc.git] DEBUG Calling 'git fetch origin pull/558/head'
2024-06-06 08:10:35,156 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-06-06 08:10:35,157 [ scc.git] DEBUG * branch refs/pull/558/head -> FETCH_HEAD
2024-06-06 08:10:35,161 [ scc.git] DEBUG ## Unique users: []
2024-06-06 08:10:35,162 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:10:35,162 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:10:35,168 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-06-06 08:10:35,175 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:10:35,180 [ 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-06-06 08:10:35,246 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-06-06 08:10:35,246 [ scc.git] DEBUG Auto-merging setup.py
2024-06-06 08:10:35,247 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:10:35,252 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-06-06 08:10:35,252 [ scc.git] DEBUG setup.py | 1 +
2024-06-06 08:10:35,252 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-06-06 08:10:35,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:10:35,478 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-06-06 08:10:35,486 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:10:35,491 [ 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-06-06 08:10:35,609 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-06-06 08:10:35,609 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-06-06 08:10:35,610 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:10:35,614 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-06-06 08:10:35,614 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-06-06 08:10:35,615 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-06-06 08:10:35,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:10:35,888 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...59392ac61e24b2ee642c3cdcae6d3f8dd514394f'
2024-06-06 08:10:35,897 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:10:35,903 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Archive status) 59392ac61e24b2ee642c3cdcae6d3f8dd514394f'
2024-06-06 08:10:36,036 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-06-06 08:10:36,038 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:10:36,044 [ scc.git] DEBUG omeroweb/webclient/static/webclient/javascript/ome.tree.js | 3 +++
2024-06-06 08:10:36,044 [ scc.git] DEBUG .../templates/webclient/annotations/includes/core_metadata.html | 6 ++++++
2024-06-06 08:10:36,044 [ scc.git] DEBUG omeroweb/webclient/tree.py | 7 +++++--
2024-06-06 08:10:36,044 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 1 +
2024-06-06 08:10:36,044 [ scc.git] DEBUG 4 files changed, 15 insertions(+), 2 deletions(-)
2024-06-06 08:10:36,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:10:36,299 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...575f7bbc72aad997963937297f08156ca6f7dd5e'
2024-06-06 08:10:36,308 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:10:36,312 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 558 (Update readme) 575f7bbc72aad997963937297f08156ca6f7dd5e'
2024-06-06 08:10:36,341 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-06 08:10:36,344 [ scc.git] DEBUG README.rst | 42 +++++++++++++++++++++---------------------
2024-06-06 08:10:36,345 [ scc.git] DEBUG 1 file changed, 21 insertions(+), 21 deletions(-)
2024-06-06 08:10:36,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:10:36,719 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-06 08:10:36,764 [ scc.git] DEBUG Get sha1 of %s
2024-06-06 08:10:36,765 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-06 08:10:36,770 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:10:36,817 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:10:36,827 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe1b84f13d0> has no local changes
2024-06-06 08:10:36,827 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 554 chris-allan 'Optimize obj_id_bitmask by using its own query' (stage: draft)
- 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 558 jburel 'Update readme'
Generated by OMERO-python-superbuild-push#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/82/)'
2024-06-06 08:10:36,841 [ scc.git] DEBUG [detached HEAD 43c2e03f3] merge master -Dorg -Ssuccess-only
2024-06-06 08:10:36,841 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-06 08:10:36,842 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-06 08:10:36,897 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-06-06 08:10:37,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:10:37,147 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-06-06 08:10:37,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:10:37,563 [ scc.config] DEBUG Found submodule.omero-py.url
2024-06-06 08:10:37,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:10:37,964 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-06-06 08:10:38,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:10:38,422 [ scc.config] DEBUG Found submodule.omero-web.url
2024-06-06 08:10:38,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-06 08:10:38,848 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-06 08:10:38,881 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe1b8e5a850> has local changes
2024-06-06 08:10:38,881 [ 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 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
- 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 554 chris-allan 'Optimize obj_id_bitmask by using its own query' (stage: draft)
- 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 558 jburel 'Update readme'
Generated by OMERO-python-superbuild-push#82 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/82/)'
2024-06-06 08:10:38,892 [ scc.git] DEBUG [detached HEAD 0436ca1] merge master -Dorg -Ssuccess-only
2024-06-06 08:10:38,892 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-06-06 08:10:38,892 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-06-06 08:10:38,892 [ scc.merge] INFO Already up to date.
2024-06-06 08:10:38,893 [ scc.merge] INFO
2024-06-06 08:10:38,893 [ scc.merge] INFO
2024-06-06 08:10:38,893 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-06-06 08:10:38,893 [ scc.merge] INFO Already up to date.
2024-06-06 08:10:38,893 [ scc.merge] INFO
2024-06-06 08:10:38,893 [ scc.merge] INFO Merged PRs:
2024-06-06 08:10:38,893 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-06-06 08:10:38,893 [ scc.merge] INFO
2024-06-06 08:10:38,893 [ scc.merge] INFO Repository: ome/omero-marshal
2024-06-06 08:10:38,893 [ scc.merge] INFO Excluded PRs:
2024-06-06 08:10:38,893 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-06-06 08:10:38,893 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-06-06 08:10:38,893 [ scc.merge] INFO Already up to date.
2024-06-06 08:10:38,893 [ scc.merge] INFO
2024-06-06 08:10:38,893 [ scc.merge] INFO Merged PRs:
2024-06-06 08:10:38,893 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-06-06 08:10:38,893 [ scc.merge] INFO
2024-06-06 08:10:38,893 [ scc.merge] INFO Repository: ome/omero-py
2024-06-06 08:10:38,893 [ scc.merge] INFO Excluded PRs:
2024-06-06 08:10:38,893 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-06-06 08:10:38,893 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-06-06 08:10:38,893 [ scc.merge] INFO - PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
2024-06-06 08:10:38,893 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-06-06 08:10:38,893 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-06-06 08:10:38,893 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-06-06 08:10:38,893 [ scc.merge] INFO Already up to date.
2024-06-06 08:10:38,893 [ scc.merge] INFO
2024-06-06 08:10:38,893 [ scc.merge] INFO Merged PRs:
2024-06-06 08:10:38,893 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-06-06 08:10:38,893 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-06-06 08:10:38,893 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-06-06 08:10:38,893 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-06-06 08:10:38,893 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-06-06 08:10:38,894 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-06-06 08:10:38,894 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-06-06 08:10:38,894 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-06-06 08:10:38,894 [ scc.merge] INFO
2024-06-06 08:10:38,894 [ scc.merge] INFO Repository: ome/omero-scripts
2024-06-06 08:10:38,894 [ scc.merge] INFO Excluded PRs:
2024-06-06 08:10:38,894 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-06-06 08:10:38,894 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-06-06 08:10:38,894 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-06-06 08:10:38,894 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-06-06 08:10:38,894 [ scc.merge] INFO Already up to date.
2024-06-06 08:10:38,894 [ scc.merge] INFO
2024-06-06 08:10:38,894 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-06 08:10:38,894 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-06 08:10:38,894 [ scc.merge] INFO
2024-06-06 08:10:38,894 [ scc.merge] INFO Repository: ome/omero-web
2024-06-06 08:10:38,894 [ scc.merge] INFO Excluded PRs:
2024-06-06 08:10:38,894 [ scc.merge] INFO - PR 554 chris-allan 'Optimize obj_id_bitmask by using its own query' (stage: draft)
2024-06-06 08:10:38,894 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-06-06 08:10:38,894 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-06-06 08:10:38,894 [ scc.merge] INFO Already up to date.
2024-06-06 08:10:38,894 [ scc.merge] INFO
2024-06-06 08:10:38,894 [ scc.merge] INFO Merged PRs:
2024-06-06 08:10:38,894 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-06-06 08:10:38,894 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-06-06 08:10:38,894 [ scc.merge] INFO - PR 555 chris-allan 'Archive status'
2024-06-06 08:10:38,894 [ scc.merge] INFO - PR 558 jburel 'Update readme'
2024-06-06 08:10:38,894 [ scc.merge] INFO
2024-06-06 08:10:38,894 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-06-06 08:10:38,894 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:10:38,900 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-06-06 08:10:38,900 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:10:38,905 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-06 08:10:38,905 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-06-06 08:10:38,905 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:10:38,909 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-06 08:10:38,910 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-06-06 08:10:38,910 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:10:38,914 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-06 08:10:38,914 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-06-06 08:10:38,914 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:10:38,918 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-06 08:10:38,919 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-06-06 08:10:38,919 [ scc.git] DEBUG Calling 'git remote'
2024-06-06 08:10:38,923 [ 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 d3a65421
nothing to commit, working tree clean
Entering 'omero-scripts'
HEAD detached from 5a90893
nothing to commit, working tree clean
Entering 'omero-web'
HEAD detached from 9c94fd493
nothing to commit, working tree clean
HEAD detached from 05f561e
nothing to commit, working tree clean
2024-06-06 08:11:09,325 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/d0200910/images/svgs/logo.svg){kind=logo}
