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-08 00:33:48,953 [ scc.config] DEBUG Found github.token
2024-06-08 00:33:48,957 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-06-08 00:33:49,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-08 00:33:49,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-08 00:33:49,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-06-08 00:33:49,967 [ scc.gh] DEBUG 4312 remaining from 5000 (Reset at 00:06
2024-06-08 00:33:49,968 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-06-08 00:33:49,972 [ scc.git] DEBUG Check current status
2024-06-08 00:33:49,972 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-08 00:33:49,976 [ scc.git] DEBUG 05f561e Merge pull request #282 from ome/dependabot/submodules/omero-py-d3a6542
2024-06-08 00:33:49,976 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-08 00:33:50,018 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-06-08 00:33:50,021 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-06-08 00:33:50,025 [ scc.git] DEBUG d3a65421944d94d69c3d8aa63ebdebed8f4ddb29 omero-py (v5.19.2-10-gd3a65421)
2024-06-08 00:33:50,030 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-06-08 00:33:50,033 [ scc.git] DEBUG 9c94fd493eb94588de8432247e084be57d7ea928 omero-web (v5.26.0-1-g9c94fd493)
2024-06-08 00:33:50,038 [ scc.config] DEBUG Found remote.origin.url
2024-06-08 00:33:50,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-06-08 00:33:50,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-06-08 00:33:51,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-06-08 00:33:51,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-06-08 00:33:52,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-06-08 00:33:52,165 [ scc.git] DEBUG Resetting...
2024-06-08 00:33:52,165 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-06-08 00:33:52,172 [ scc.git] DEBUG HEAD is now at 05f561e Merge pull request #282 from ome/dependabot/submodules/omero-py-d3a6542
2024-06-08 00:33:52,172 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-06-08 00:33:52,231 [ scc.git] DEBUG Check current status
2024-06-08 00:33:52,231 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-08 00:33:52,236 [ scc.git] DEBUG 05f561e Merge pull request #282 from ome/dependabot/submodules/omero-py-d3a6542
2024-06-08 00:33:52,236 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-08 00:33:52,281 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-06-08 00:33:52,284 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-06-08 00:33:52,288 [ scc.git] DEBUG d3a65421944d94d69c3d8aa63ebdebed8f4ddb29 omero-py (v5.19.2-10-gd3a65421)
2024-06-08 00:33:52,292 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-06-08 00:33:52,295 [ scc.git] DEBUG 9c94fd493eb94588de8432247e084be57d7ea928 omero-web (v5.26.0-1-g9c94fd493)
2024-06-08 00:33:52,296 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-06-08 00:33:52,296 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-06-08 00:33:52,297 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-06-08 00:33:52,297 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-06-08 00:33:52,297 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-06-08 00:33:52,297 [ scc.repo] DEBUG ## PRs found:
2024-06-08 00:33:52,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-06-08 00:33:52,592 [ scc.repo] DEBUG ## Branches found:
2024-06-08 00:33:52,592 [ scc.git] DEBUG Get sha1 of %s
2024-06-08 00:33:52,592 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:33:52,597 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-08 00:33:52,601 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-08 00:33:52,601 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-08 00:33:52,606 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-08 00:33:52,611 [ scc.git] DEBUG Already up to date.
2024-06-08 00:33:52,611 [ scc.git] DEBUG ## Unique users: []
2024-06-08 00:33:52,611 [ scc.git] DEBUG Get sha1 of %s
2024-06-08 00:33:52,611 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:33:52,615 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-08 00:33:52,659 [ scc.git] DEBUG Get sha1 of %s
2024-06-08 00:33:52,659 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:33:52,663 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-08 00:33:52,800 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f017d9bfc40> has no local changes
2024-06-08 00:33:52,801 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/84/)'
2024-06-08 00:33:52,832 [ scc.git] DEBUG [detached HEAD 598b0f6] merge master -Dorg -Snone
2024-06-08 00:33:52,832 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-06-08 00:33:52,833 [ scc.merge] INFO Already up to date.
2024-06-08 00:33:52,833 [ scc.merge] INFO
2024-06-08 00:33:52,833 [ scc.merge] INFO
2024-06-08 00:33:52,833 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-06-08 00:33:52,833 [ 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-08 00:33:55,317 [ scc.config] DEBUG Found github.token
2024-06-08 00:33:55,320 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-06-08 00:33:55,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-08 00:33:55,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-08 00:33:56,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-06-08 00:33:56,329 [ scc.gh] DEBUG 4304 remaining from 5000 (Reset at 00:06
2024-06-08 00:33:56,330 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-06-08 00:33:56,334 [ scc.git] DEBUG Check current status
2024-06-08 00:33:56,334 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-08 00:33:56,337 [ scc.git] DEBUG 598b0f6 merge master -Dorg -Snone
2024-06-08 00:33:56,338 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-08 00:33:56,380 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-06-08 00:33:56,383 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-06-08 00:33:56,387 [ scc.git] DEBUG d3a65421944d94d69c3d8aa63ebdebed8f4ddb29 omero-py (v5.19.2-10-gd3a65421)
2024-06-08 00:33:56,391 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-06-08 00:33:56,394 [ scc.git] DEBUG 9c94fd493eb94588de8432247e084be57d7ea928 omero-web (v5.26.0-1-g9c94fd493)
2024-06-08 00:33:56,400 [ scc.config] DEBUG Found remote.origin.url
2024-06-08 00:33:56,400 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-06-08 00:33:56,402 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-06-08 00:33:56,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-06-08 00:33:57,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-06-08 00:33:57,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-06-08 00:33:58,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-06-08 00:33:58,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-06-08 00:33:58,535 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-08 00:33:58,584 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-06-08 00:33:58,584 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-06-08 00:33:58,588 [ scc.git] DEBUG Check current status
2024-06-08 00:33:58,589 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-08 00:33:58,592 [ scc.git] DEBUG a4307f4 Bump version: 5.7.0 → 5.7.1.dev0
2024-06-08 00:33:58,593 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-08 00:33:58,638 [ scc.config] DEBUG Found remote.origin.url
2024-06-08 00:33:59,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-06-08 00:33:59,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-06-08 00:33:59,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-06-08 00:34:00,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-06-08 00:34:00,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-06-08 00:34:00,756 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-08 00:34:00,801 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-08 00:34:00,802 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-06-08 00:34:00,802 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-06-08 00:34:00,807 [ scc.git] DEBUG Check current status
2024-06-08 00:34:00,808 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-08 00:34:00,813 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-06-08 00:34:00,813 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-08 00:34:00,861 [ scc.config] DEBUG Found remote.origin.url
2024-06-08 00:34:01,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-06-08 00:34:01,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-06-08 00:34:02,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-06-08 00:34:02,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-06-08 00:34:03,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-06-08 00:34:03,042 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-08 00:34:03,081 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-08 00:34:03,082 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-06-08 00:34:03,082 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-06-08 00:34:03,087 [ scc.git] DEBUG Check current status
2024-06-08 00:34:03,087 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-08 00:34:03,102 [ scc.git] DEBUG d3a65421 Merge pull request #410 from jburel/python_wheel
2024-06-08 00:34:03,102 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-08 00:34:03,145 [ scc.config] DEBUG Found remote.origin.url
2024-06-08 00:34:03,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-06-08 00:34:04,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-06-08 00:34:04,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-06-08 00:34:04,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-06-08 00:34:05,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-06-08 00:34:05,288 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-08 00:34:05,329 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-08 00:34:05,331 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-06-08 00:34:05,332 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-06-08 00:34:05,337 [ scc.git] DEBUG Check current status
2024-06-08 00:34:05,338 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-08 00:34:05,354 [ scc.git] DEBUG 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-06-08 00:34:05,354 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-08 00:34:05,401 [ scc.config] DEBUG Found remote.origin.url
2024-06-08 00:34:05,402 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-06-08 00:34:05,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-06-08 00:34:06,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-06-08 00:34:06,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-06-08 00:34:07,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-06-08 00:34:07,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-06-08 00:34:07,567 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-08 00:34:07,606 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-08 00:34:07,607 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-06-08 00:34:07,607 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-06-08 00:34:07,612 [ scc.git] DEBUG Check current status
2024-06-08 00:34:07,612 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-08 00:34:07,628 [ scc.git] DEBUG 9c94fd493 Bump version: 5.26.0 → 5.26.1.dev0
2024-06-08 00:34:07,629 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-08 00:34:07,672 [ scc.config] DEBUG Found remote.origin.url
2024-06-08 00:34:08,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-06-08 00:34:08,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-06-08 00:34:08,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-06-08 00:34:09,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-06-08 00:34:09,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-06-08 00:34:09,757 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-08 00:34:09,799 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-08 00:34:09,799 [ scc.git] DEBUG Resetting...
2024-06-08 00:34:09,799 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-06-08 00:34:09,806 [ scc.git] DEBUG HEAD is now at 598b0f6 merge master -Dorg -Snone
2024-06-08 00:34:09,806 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-06-08 00:34:09,858 [ scc.git] DEBUG Check current status
2024-06-08 00:34:09,858 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-06-08 00:34:09,862 [ scc.git] DEBUG 598b0f6 merge master -Dorg -Snone
2024-06-08 00:34:09,863 [ scc.git] DEBUG Calling 'git submodule status'
2024-06-08 00:34:09,904 [ scc.git] DEBUG a4307f475a2690c4aa4f287864bad9d6d97ebb8f omero-dropbox (v5.7.0-1-ga4307f4)
2024-06-08 00:34:09,907 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-06-08 00:34:09,911 [ scc.git] DEBUG d3a65421944d94d69c3d8aa63ebdebed8f4ddb29 omero-py (v5.19.2-10-gd3a65421)
2024-06-08 00:34:09,915 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-06-08 00:34:09,918 [ scc.git] DEBUG 9c94fd493eb94588de8432247e084be57d7ea928 omero-web (v5.26.0-1-g9c94fd493)
2024-06-08 00:34:09,919 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-06-08 00:34:09,919 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-06-08 00:34:09,919 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-06-08 00:34:09,919 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-06-08 00:34:09,919 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-06-08 00:34:09,919 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-06-08 00:34:09,920 [ scc.repo] DEBUG ## PRs found:
2024-06-08 00:34:10,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-06-08 00:34:10,191 [ scc.repo] DEBUG ## Branches found:
2024-06-08 00:34:10,191 [ scc.git] DEBUG Get sha1 of %s
2024-06-08 00:34:10,191 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:34:10,196 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-08 00:34:10,200 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-08 00:34:10,201 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-08 00:34:10,206 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-08 00:34:10,211 [ scc.git] DEBUG Already up to date.
2024-06-08 00:34:10,211 [ scc.git] DEBUG ## Unique users: []
2024-06-08 00:34:10,211 [ scc.git] DEBUG Get sha1 of %s
2024-06-08 00:34:10,211 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:34:10,216 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-08 00:34:10,261 [ scc.git] DEBUG Get sha1 of %s
2024-06-08 00:34:10,262 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:34:10,266 [ scc.repo] DEBUG ## PRs found:
2024-06-08 00:34:10,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-06-08 00:34:11,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-06-08 00:34:11,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-06-08 00:34:12,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-06-08 00:34:12,705 [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-08 00:34:13,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-06-08 00:34:13,617 [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-08 00:34:13,618 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-06-08 00:34:13,618 [ scc.repo] DEBUG ## Branches found:
2024-06-08 00:34:13,618 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-06-08 00:34:13,618 [ scc.git] DEBUG Get sha1 of %s
2024-06-08 00:34:13,618 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:34:13,623 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-08 00:34:13,628 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-08 00:34:13,628 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-08 00:34:13,632 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-08 00:34:13,637 [ scc.git] DEBUG Already up to date.
2024-06-08 00:34:13,637 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-06-08 00:34:13,996 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-06-08 00:34:13,996 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-06-08 00:34:14,001 [ scc.git] DEBUG ## Unique users: []
2024-06-08 00:34:14,001 [ scc.git] DEBUG Get sha1 of %s
2024-06-08 00:34:14,001 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:34:14,006 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-06-08 00:34:14,011 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:34:14,015 [ 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-08 00:34:14,106 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-06-08 00:34:14,106 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-06-08 00:34:14,106 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-06-08 00:34:14,106 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-06-08 00:34:14,106 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-06-08 00:34:14,106 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-06-08 00:34:14,106 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-06-08 00:34:14,106 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-06-08 00:34:14,106 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-06-08 00:34:14,107 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-08 00:34:14,111 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-06-08 00:34:14,111 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-06-08 00:34:14,112 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-06-08 00:34:14,112 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-06-08 00:34:14,112 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-06-08 00:34:14,112 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-06-08 00:34:14,112 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-06-08 00:34:14,112 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-06-08 00:34:14,112 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-06-08 00:34:14,112 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-06-08 00:34:14,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-08 00:34:14,283 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-08 00:34:14,324 [ scc.git] DEBUG Get sha1 of %s
2024-06-08 00:34:14,325 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:34:14,329 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-08 00:34:14,367 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-08 00:34:14,374 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdad4a2ed60> has no local changes
2024-06-08 00:34:14,374 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/84/)'
2024-06-08 00:34:14,383 [ scc.git] DEBUG [detached HEAD ea0fdfb] merge master -Dorg -Ssuccess-only
2024-06-08 00:34:14,383 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-08 00:34:14,383 [ scc.repo] DEBUG ## PRs found:
2024-06-08 00:34:14,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-06-08 00:34:15,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-06-08 00:34:15,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-06-08 00:34:16,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-06-08 00:34:16,749 [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-08 00:34:17,193 [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-08 00:34:17,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-06-08 00:34:18,194 [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-08 00:34:18,195 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-06-08 00:34:18,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-06-08 00:34:19,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-06-08 00:34:19,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-06-08 00:34:20,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-06-08 00:34:20,060 [ scc.repo] DEBUG ## Branches found:
2024-06-08 00:34:20,060 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-06-08 00:34:20,060 [ scc.git] DEBUG Get sha1 of %s
2024-06-08 00:34:20,061 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:34:20,065 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-08 00:34:20,070 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-08 00:34:20,071 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-08 00:34:20,076 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-08 00:34:20,082 [ scc.git] DEBUG Already up to date.
2024-06-08 00:34:20,082 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-06-08 00:34:20,469 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-06-08 00:34:20,469 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-06-08 00:34:20,474 [ scc.git] DEBUG ## Unique users: []
2024-06-08 00:34:20,475 [ scc.git] DEBUG Get sha1 of %s
2024-06-08 00:34:20,475 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:34:20,480 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-06-08 00:34:20,485 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:34:20,490 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-06-08 00:34:20,500 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-06-08 00:34:20,501 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-08 00:34:20,504 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-06-08 00:34:20,504 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-06-08 00:34:20,504 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-06-08 00:34:20,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-08 00:34:20,662 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-08 00:34:20,708 [ scc.git] DEBUG Get sha1 of %s
2024-06-08 00:34:20,708 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:34:20,713 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-08 00:34:20,752 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-08 00:34:20,761 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdad4a33d90> has no local changes
2024-06-08 00:34:20,761 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/84/)'
2024-06-08 00:34:20,770 [ scc.git] DEBUG [detached HEAD b9a677a] merge master -Dorg -Ssuccess-only
2024-06-08 00:34:20,770 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-08 00:34:20,771 [ scc.repo] DEBUG ## PRs found:
2024-06-08 00:34:21,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-06-08 00:34:21,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-06-08 00:34:22,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-06-08 00:34:22,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-06-08 00:34:23,313 [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-08 00:34:23,818 [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-08 00:34:24,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-06-08 00:34:24,806 [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-08 00:34:25,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-06-08 00:34:25,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-06-08 00:34:25,674 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-06-08 00:34:26,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-06-08 00:34:26,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-06-08 00:34:27,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-06-08 00:34:27,564 [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-08 00:34:28,038 [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-08 00:34:28,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-06-08 00:34:29,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-06-08 00:34:29,542 [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-08 00:34:30,021 [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-08 00:34:30,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-06-08 00:34:30,958 [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-08 00:34:31,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-06-08 00:34:31,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-06-08 00:34:31,846 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-06-08 00:34:32,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-06-08 00:34:32,282 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-06-08 00:34:32,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378 HTTP/1.1" 200 None
2024-06-08 00:34:33,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378/comments HTTP/1.1" 200 None
2024-06-08 00:34:33,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-06-08 00:34:34,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-06-08 00:34:34,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-06-08 00:34:35,218 [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-08 00:34:35,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-06-08 00:34:36,113 [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-08 00:34:36,114 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-06-08 00:34:36,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-06-08 00:34:37,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-06-08 00:34:37,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-06-08 00:34:38,042 [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-08 00:34:38,530 [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-08 00:34:39,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-06-08 00:34:39,468 [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-08 00:34:39,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-06-08 00:34:40,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-06-08 00:34:40,336 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-06-08 00:34:40,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-06-08 00:34:41,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-06-08 00:34:41,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-06-08 00:34:42,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-06-08 00:34:42,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-06-08 00:34:43,212 [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-08 00:34:43,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-06-08 00:34:44,154 [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-08 00:34:44,155 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-06-08 00:34:44,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-06-08 00:34:45,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-06-08 00:34:45,544 [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-08 00:34:46,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-06-08 00:34:46,459 [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-08 00:34:46,460 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-06-08 00:34:46,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-06-08 00:34:47,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-06-08 00:34:47,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-06-08 00:34:48,412 [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-08 00:34:48,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-06-08 00:34:49,354 [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-08 00:34:49,355 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-06-08 00:34:49,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-06-08 00:34:50,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-06-08 00:34:50,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-06-08 00:34:51,258 [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-08 00:34:51,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-06-08 00:34:52,095 [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-08 00:34:52,096 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-06-08 00:34:52,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-06-08 00:34:53,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-06-08 00:34:53,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-06-08 00:34:54,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-06-08 00:34:54,049 [ scc.repo] DEBUG ## Branches found:
2024-06-08 00:34:54,049 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-06-08 00:34:54,049 [ scc.git] DEBUG Get sha1 of %s
2024-06-08 00:34:54,049 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:34:54,055 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-08 00:34:54,061 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-08 00:34:54,062 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-08 00:34:54,070 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-08 00:34:54,076 [ scc.git] DEBUG Already up to date.
2024-06-08 00:34:54,077 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-06-08 00:34:54,496 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-06-08 00:34:54,496 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-06-08 00:34:54,503 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-06-08 00:34:54,892 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-06-08 00:34:54,892 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-06-08 00:34:54,898 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-06-08 00:34:55,334 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-06-08 00:34:55,334 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-06-08 00:34:55,339 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-06-08 00:34:55,716 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-06-08 00:34:55,716 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-06-08 00:34:55,721 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-06-08 00:34:56,174 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-06-08 00:34:56,174 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-06-08 00:34:56,180 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-06-08 00:34:56,552 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-06-08 00:34:56,553 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-06-08 00:34:56,558 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-06-08 00:34:56,955 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-06-08 00:34:56,956 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-06-08 00:34:56,961 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-06-08 00:34:57,419 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-06-08 00:34:57,419 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-06-08 00:34:57,424 [ scc.git] DEBUG ## Unique users: []
2024-06-08 00:34:57,424 [ scc.git] DEBUG Get sha1 of %s
2024-06-08 00:34:57,425 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:34:57,429 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-06-08 00:34:57,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:34:57,445 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-06-08 00:34:57,515 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-06-08 00:34:57,515 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-06-08 00:34:57,517 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-08 00:34:57,521 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-06-08 00:34:57,521 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-06-08 00:34:57,521 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-06-08 00:34:57,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-08 00:34:57,681 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-06-08 00:34:57,706 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:34:57,713 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-06-08 00:34:57,827 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-06-08 00:34:57,827 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-06-08 00:34:57,827 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-08 00:34:57,835 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-06-08 00:34:57,836 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-06-08 00:34:57,836 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-06-08 00:34:58,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-08 00:34:58,090 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-06-08 00:34:58,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:34:58,108 [ 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-08 00:34:58,131 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-06-08 00:34:58,132 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-08 00:34:58,135 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-06-08 00:34:58,135 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-06-08 00:34:58,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-08 00:34:58,510 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-06-08 00:34:58,521 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:34:58,526 [ 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-08 00:34:58,547 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-06-08 00:34:58,548 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-06-08 00:34:58,551 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-08 00:34:58,556 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-06-08 00:34:58,556 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-06-08 00:34:58,556 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-06-08 00:34:58,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-08 00:34:58,926 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-06-08 00:34:58,943 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:34:58,949 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-06-08 00:34:58,970 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-08 00:34:58,973 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-06-08 00:34:58,973 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-06-08 00:34:58,973 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-06-08 00:34:58,973 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-06-08 00:34:58,973 [ scc.git] DEBUG create mode 100644 connect.py
2024-06-08 00:34:59,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-08 00:34:59,343 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-06-08 00:34:59,355 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:34:59,360 [ 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-08 00:34:59,457 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-06-08 00:34:59,459 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-08 00:34:59,463 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-06-08 00:34:59,464 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-06-08 00:34:59,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-08 00:34:59,754 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-06-08 00:34:59,766 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:34:59,771 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-06-08 00:34:59,842 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-06-08 00:34:59,843 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-08 00:34:59,848 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-06-08 00:34:59,848 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-06-08 00:35:00,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-08 00:35:00,163 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-06-08 00:35:00,175 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:35:00,179 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-06-08 00:35:00,238 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-06-08 00:35:00,239 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-08 00:35:00,247 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-06-08 00:35:00,247 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-06-08 00:35:00,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-08 00:35:00,592 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-08 00:35:00,642 [ scc.git] DEBUG Get sha1 of %s
2024-06-08 00:35:00,642 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:35:00,648 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-08 00:35:00,717 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-08 00:35:00,729 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdad4a9f490> has no local changes
2024-06-08 00:35:00,729 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/84/)'
2024-06-08 00:35:00,742 [ scc.git] DEBUG [detached HEAD 17639e81] merge master -Dorg -Ssuccess-only
2024-06-08 00:35:00,742 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-08 00:35:00,742 [ scc.git] INFO Overriding base-branch from master to develop
2024-06-08 00:35:00,742 [ scc.repo] DEBUG ## PRs found:
2024-06-08 00:35:01,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-06-08 00:35:01,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-06-08 00:35:02,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-06-08 00:35:02,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-06-08 00:35:03,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-06-08 00:35:03,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-06-08 00:35:04,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-06-08 00:35:04,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-08 00:35:05,219 [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-08 00:35:05,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-06-08 00:35:06,095 [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-08 00:35:06,096 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-08 00:35:06,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-06-08 00:35:07,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-06-08 00:35:07,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-06-08 00:35:08,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-06-08 00:35:08,068 [ scc.repo] DEBUG ## Branches found:
2024-06-08 00:35:08,068 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-06-08 00:35:08,068 [ scc.git] DEBUG Get sha1 of %s
2024-06-08 00:35:08,068 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:35:08,074 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-06-08 00:35:08,079 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-08 00:35:08,079 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-06-08 00:35:08,085 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-06-08 00:35:08,091 [ scc.git] DEBUG Already up to date.
2024-06-08 00:35:08,092 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-06-08 00:35:08,465 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-06-08 00:35:08,465 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-06-08 00:35:08,471 [ scc.git] DEBUG ## Unique users: []
2024-06-08 00:35:08,471 [ scc.git] DEBUG Get sha1 of %s
2024-06-08 00:35:08,471 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:35:08,477 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-08 00:35:08,485 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:35:08,491 [ 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-08 00:35:08,542 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-06-08 00:35:08,542 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-06-08 00:35:08,542 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-06-08 00:35:08,543 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-06-08 00:35:08,548 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-08 00:35:08,553 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-06-08 00:35:08,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-08 00:35:08,719 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-06-08 00:35:08,728 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-06-08 00:35:08,737 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#84](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/84/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/84/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-06-08 00:35:08,743 [ scc.config] DEBUG Found github.token
2024-06-08 00:35:08,743 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-06-08 00:35:08,743 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-08 00:35:08,785 [ scc.git] DEBUG Get sha1 of %s
2024-06-08 00:35:08,786 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:35:08,790 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-08 00:35:08,833 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-08 00:35:08,840 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdad41b65e0> has no local changes
2024-06-08 00:35:08,840 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/84/)'
2024-06-08 00:35:08,850 [ scc.git] DEBUG [detached HEAD 1efd7fb] merge master -Dorg -Ssuccess-only
2024-06-08 00:35:08,850 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-08 00:35:08,850 [ scc.repo] DEBUG ## PRs found:
2024-06-08 00:35:09,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-06-08 00:35:09,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/558 HTTP/1.1" 200 None
2024-06-08 00:35:10,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/575f7bbc72aad997963937297f08156ca6f7dd5e HTTP/1.1" 200 None
2024-06-08 00:35:10,723 [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-08 00:35:11,402 [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-08 00:35:11,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/575f7bbc72aad997963937297f08156ca6f7dd5e HTTP/1.1" 200 None
2024-06-08 00:35:12,268 [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-08 00:35:12,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/575f7bbc72aad997963937297f08156ca6f7dd5e HTTP/1.1" 200 None
2024-06-08 00:35:13,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/575f7bbc72aad997963937297f08156ca6f7dd5e/status HTTP/1.1" 200 None
2024-06-08 00:35:13,224 [ scc.repo] DEBUG - PR 558 jburel 'Update readme'
2024-06-08 00:35:13,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/555 HTTP/1.1" 200 None
2024-06-08 00:35:14,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/555/comments HTTP/1.1" 200 None
2024-06-08 00:35:14,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e HTTP/1.1" 200 None
2024-06-08 00:35:15,131 [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-06-08 00:35:15,626 [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-06-08 00:35:16,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e HTTP/1.1" 200 None
2024-06-08 00:35:16,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/97e479b717e34179eceea2507d3e69a04b2fec1e?per_page=1 HTTP/1.1" 200 None
2024-06-08 00:35:17,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e HTTP/1.1" 200 None
2024-06-08 00:35:17,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/97e479b717e34179eceea2507d3e69a04b2fec1e/status HTTP/1.1" 200 None
2024-06-08 00:35:17,480 [ scc.repo] DEBUG - PR 555 chris-allan 'Archive status'
2024-06-08 00:35:17,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/554 HTTP/1.1" 200 None
2024-06-08 00:35:18,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-06-08 00:35:18,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-06-08 00:35:19,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-06-08 00:35:19,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-06-08 00:35:20,357 [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-08 00:35:20,863 [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-08 00:35:21,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-06-08 00:35:21,788 [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-08 00:35:22,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-06-08 00:35:22,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-06-08 00:35:22,762 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-06-08 00:35:23,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-06-08 00:35:23,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-06-08 00:35:24,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-06-08 00:35:24,686 [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-08 00:35:25,273 [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-08 00:35:25,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-06-08 00:35:26,163 [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-08 00:35:26,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-06-08 00:35:27,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-06-08 00:35:27,037 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-06-08 00:35:27,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-06-08 00:35:27,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-06-08 00:35:28,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-06-08 00:35:28,985 [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-08 00:35:29,458 [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-08 00:35:29,460 [ scc.repo] DEBUG ## Branches found:
2024-06-08 00:35:29,460 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-06-08 00:35:29,460 [ scc.git] DEBUG Get sha1 of %s
2024-06-08 00:35:29,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:35:29,465 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-06-08 00:35:29,469 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-06-08 00:35:29,469 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-06-08 00:35:29,476 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-06-08 00:35:29,481 [ scc.git] DEBUG Already up to date.
2024-06-08 00:35:29,482 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-06-08 00:35:30,128 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-06-08 00:35:30,128 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-06-08 00:35:30,133 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-06-08 00:35:30,558 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-06-08 00:35:30,559 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-06-08 00:35:30,565 [ scc.git] DEBUG Calling 'git fetch origin pull/555/head'
2024-06-08 00:35:31,361 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-06-08 00:35:31,362 [ scc.git] DEBUG * branch refs/pull/555/head -> FETCH_HEAD
2024-06-08 00:35:31,367 [ scc.git] DEBUG Calling 'git fetch origin pull/558/head'
2024-06-08 00:35:31,825 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-06-08 00:35:31,825 [ scc.git] DEBUG * branch refs/pull/558/head -> FETCH_HEAD
2024-06-08 00:35:31,831 [ scc.git] DEBUG ## Unique users: []
2024-06-08 00:35:31,831 [ scc.git] DEBUG Get sha1 of %s
2024-06-08 00:35:31,831 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:35:31,836 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-06-08 00:35:31,844 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:35:31,850 [ 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-08 00:35:31,935 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-06-08 00:35:31,935 [ scc.git] DEBUG Auto-merging setup.py
2024-06-08 00:35:31,937 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-08 00:35:31,941 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-06-08 00:35:31,941 [ scc.git] DEBUG setup.py | 1 +
2024-06-08 00:35:31,941 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-06-08 00:35:32,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-08 00:35:32,099 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-06-08 00:35:32,107 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:35:32,112 [ 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-08 00:35:32,133 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-06-08 00:35:32,133 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-06-08 00:35:32,134 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-08 00:35:32,138 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-06-08 00:35:32,138 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-06-08 00:35:32,138 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-06-08 00:35:32,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-08 00:35:32,511 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...97e479b717e34179eceea2507d3e69a04b2fec1e'
2024-06-08 00:35:32,520 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:35:32,526 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 555 (Archive status) 97e479b717e34179eceea2507d3e69a04b2fec1e'
2024-06-08 00:35:32,564 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-06-08 00:35:32,565 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-08 00:35:32,571 [ scc.git] DEBUG omeroweb/webclient/static/webclient/javascript/ome.tree.js | 3 +++
2024-06-08 00:35:32,571 [ scc.git] DEBUG .../webclient/annotations/includes/core_metadata.html | 6 ++++++
2024-06-08 00:35:32,571 [ scc.git] DEBUG omeroweb/webclient/tree.py | 10 ++++++++--
2024-06-08 00:35:32,571 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 1 +
2024-06-08 00:35:32,571 [ scc.git] DEBUG 4 files changed, 18 insertions(+), 2 deletions(-)
2024-06-08 00:35:32,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-08 00:35:32,930 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...575f7bbc72aad997963937297f08156ca6f7dd5e'
2024-06-08 00:35:32,937 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:35:32,943 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 558 (Update readme) 575f7bbc72aad997963937297f08156ca6f7dd5e'
2024-06-08 00:35:32,963 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-06-08 00:35:32,966 [ scc.git] DEBUG README.rst | 42 +++++++++++++++++++++---------------------
2024-06-08 00:35:32,966 [ scc.git] DEBUG 1 file changed, 21 insertions(+), 21 deletions(-)
2024-06-08 00:35:33,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-08 00:35:33,344 [ scc.git] DEBUG Calling 'git submodule update'
2024-06-08 00:35:33,390 [ scc.git] DEBUG Get sha1 of %s
2024-06-08 00:35:33,390 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-06-08 00:35:33,395 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-08 00:35:33,438 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-08 00:35:33,450 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdad4140940> has no local changes
2024-06-08 00:35:33,450 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/84/)'
2024-06-08 00:35:33,462 [ scc.git] DEBUG [detached HEAD b904afb6e] merge master -Dorg -Ssuccess-only
2024-06-08 00:35:33,463 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-08 00:35:33,463 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-06-08 00:35:33,517 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-06-08 00:35:33,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-08 00:35:33,771 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-06-08 00:35:34,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-08 00:35:34,177 [ scc.config] DEBUG Found submodule.omero-py.url
2024-06-08 00:35:34,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-08 00:35:34,596 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-06-08 00:35:34,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-08 00:35:35,017 [ scc.config] DEBUG Found submodule.omero-web.url
2024-06-08 00:35:35,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-06-08 00:35:35,427 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-06-08 00:35:35,463 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fdad4aadc40> has local changes
2024-06-08 00:35:35,463 [ 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#84 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/84/)'
2024-06-08 00:35:35,474 [ scc.git] DEBUG [detached HEAD 32eeeba] merge master -Dorg -Ssuccess-only
2024-06-08 00:35:35,474 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-06-08 00:35:35,474 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-06-08 00:35:35,474 [ scc.merge] INFO Already up to date.
2024-06-08 00:35:35,474 [ scc.merge] INFO
2024-06-08 00:35:35,475 [ scc.merge] INFO
2024-06-08 00:35:35,475 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-06-08 00:35:35,475 [ scc.merge] INFO Already up to date.
2024-06-08 00:35:35,475 [ scc.merge] INFO
2024-06-08 00:35:35,475 [ scc.merge] INFO Merged PRs:
2024-06-08 00:35:35,475 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-06-08 00:35:35,475 [ scc.merge] INFO
2024-06-08 00:35:35,475 [ scc.merge] INFO Repository: ome/omero-marshal
2024-06-08 00:35:35,475 [ scc.merge] INFO Excluded PRs:
2024-06-08 00:35:35,475 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-06-08 00:35:35,475 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-06-08 00:35:35,475 [ scc.merge] INFO Already up to date.
2024-06-08 00:35:35,475 [ scc.merge] INFO
2024-06-08 00:35:35,475 [ scc.merge] INFO Merged PRs:
2024-06-08 00:35:35,475 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-06-08 00:35:35,475 [ scc.merge] INFO
2024-06-08 00:35:35,475 [ scc.merge] INFO Repository: ome/omero-py
2024-06-08 00:35:35,475 [ scc.merge] INFO Excluded PRs:
2024-06-08 00:35:35,475 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-06-08 00:35:35,475 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-06-08 00:35:35,475 [ scc.merge] INFO - PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
2024-06-08 00:35:35,475 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-06-08 00:35:35,476 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-06-08 00:35:35,476 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-06-08 00:35:35,476 [ scc.merge] INFO Already up to date.
2024-06-08 00:35:35,476 [ scc.merge] INFO
2024-06-08 00:35:35,476 [ scc.merge] INFO Merged PRs:
2024-06-08 00:35:35,476 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-06-08 00:35:35,476 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-06-08 00:35:35,476 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-06-08 00:35:35,476 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-06-08 00:35:35,476 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-06-08 00:35:35,476 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-06-08 00:35:35,476 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-06-08 00:35:35,476 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-06-08 00:35:35,476 [ scc.merge] INFO
2024-06-08 00:35:35,476 [ scc.merge] INFO Repository: ome/omero-scripts
2024-06-08 00:35:35,476 [ scc.merge] INFO Excluded PRs:
2024-06-08 00:35:35,476 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-06-08 00:35:35,476 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-06-08 00:35:35,476 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-06-08 00:35:35,476 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-06-08 00:35:35,476 [ scc.merge] INFO Already up to date.
2024-06-08 00:35:35,476 [ scc.merge] INFO
2024-06-08 00:35:35,477 [ scc.merge] INFO Conflicting PRs (not included):
2024-06-08 00:35:35,477 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-06-08 00:35:35,477 [ scc.merge] INFO
2024-06-08 00:35:35,477 [ scc.merge] INFO Repository: ome/omero-web
2024-06-08 00:35:35,477 [ scc.merge] INFO Excluded PRs:
2024-06-08 00:35:35,477 [ scc.merge] INFO - PR 554 chris-allan 'Optimize obj_id_bitmask by using its own query' (stage: draft)
2024-06-08 00:35:35,477 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-06-08 00:35:35,477 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-06-08 00:35:35,477 [ scc.merge] INFO Already up to date.
2024-06-08 00:35:35,477 [ scc.merge] INFO
2024-06-08 00:35:35,477 [ scc.merge] INFO Merged PRs:
2024-06-08 00:35:35,477 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-06-08 00:35:35,477 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-06-08 00:35:35,477 [ scc.merge] INFO - PR 555 chris-allan 'Archive status'
2024-06-08 00:35:35,477 [ scc.merge] INFO - PR 558 jburel 'Update readme'
2024-06-08 00:35:35,477 [ scc.merge] INFO
2024-06-08 00:35:35,477 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-06-08 00:35:35,477 [ scc.git] DEBUG Calling 'git remote'
2024-06-08 00:35:35,483 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-06-08 00:35:35,484 [ scc.git] DEBUG Calling 'git remote'
2024-06-08 00:35:35,489 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-08 00:35:35,489 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-06-08 00:35:35,490 [ scc.git] DEBUG Calling 'git remote'
2024-06-08 00:35:35,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-08 00:35:35,495 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-06-08 00:35:35,495 [ scc.git] DEBUG Calling 'git remote'
2024-06-08 00:35:35,500 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-08 00:35:35,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-06-08 00:35:35,501 [ scc.git] DEBUG Calling 'git remote'
2024-06-08 00:35:35,506 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-06-08 00:35:35,506 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-06-08 00:35:35,506 [ scc.git] DEBUG Calling 'git remote'
2024-06-08 00:35:35,511 [ 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-08 00:36:05,398 [ 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}
