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-04-29 00:34:39,780 [ scc.config] DEBUG Found github.token
2024-04-29 00:34:39,783 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-04-29 00:34:40,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:34:40,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:34:40,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-04-29 00:34:40,826 [ scc.gh] DEBUG 4302 remaining from 5000 (Reset at 00:04
2024-04-29 00:34:40,827 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-29 00:34:40,831 [ scc.git] DEBUG Check current status
2024-04-29 00:34:40,832 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-29 00:34:40,836 [ scc.git] DEBUG 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-04-29 00:34:40,836 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-29 00:34:40,884 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-04-29 00:34:40,887 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-04-29 00:34:40,902 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-04-29 00:34:40,906 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-04-29 00:34:41,061 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-04-29 00:34:41,065 [ scc.config] DEBUG Found remote.origin.url
2024-04-29 00:34:41,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-04-29 00:34:41,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-29 00:34:42,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-29 00:34:42,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-29 00:34:43,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-29 00:34:43,043 [ scc.git] DEBUG Resetting...
2024-04-29 00:34:43,043 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-04-29 00:34:43,049 [ scc.git] DEBUG HEAD is now at 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-04-29 00:34:43,049 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-04-29 00:34:43,100 [ scc.git] DEBUG Check current status
2024-04-29 00:34:43,100 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-29 00:34:43,105 [ scc.git] DEBUG 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-04-29 00:34:43,105 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-29 00:34:43,145 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-04-29 00:34:43,148 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-04-29 00:34:43,151 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-04-29 00:34:43,154 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-04-29 00:34:43,158 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-04-29 00:34:43,159 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-04-29 00:34:43,159 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-04-29 00:34:43,159 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-04-29 00:34:43,159 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-04-29 00:34:43,159 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-04-29 00:34:43,160 [ scc.repo] DEBUG ## PRs found:
2024-04-29 00:34:43,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-04-29 00:34:43,475 [ scc.repo] DEBUG ## Branches found:
2024-04-29 00:34:43,475 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:34:43,475 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:34:43,480 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-29 00:34:43,483 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-29 00:34:43,484 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-29 00:34:43,487 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-29 00:34:43,492 [ scc.git] DEBUG Already up to date.
2024-04-29 00:34:43,492 [ scc.git] DEBUG ## Unique users: []
2024-04-29 00:34:43,492 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:34:43,492 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:34:43,496 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:34:43,540 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:34:43,541 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:34:43,545 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:34:43,735 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fda5b24be80> has no local changes
2024-04-29 00:34:43,736 [ 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#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/46/)'
2024-04-29 00:34:43,759 [ scc.git] DEBUG [detached HEAD cead313] merge master -Dorg -Snone
2024-04-29 00:34:43,760 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-04-29 00:34:43,760 [ scc.merge] INFO Already up to date.
2024-04-29 00:34:43,760 [ scc.merge] INFO
2024-04-29 00:34:43,760 [ scc.merge] INFO
2024-04-29 00:34:43,760 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-29 00:34:43,760 [ 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-04-29 00:34:46,147 [ scc.config] DEBUG Found github.token
2024-04-29 00:34:46,150 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-04-29 00:34:46,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:34:46,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:34:47,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-04-29 00:34:47,199 [ scc.gh] DEBUG 4294 remaining from 5000 (Reset at 00:04
2024-04-29 00:34:47,200 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-29 00:34:47,204 [ scc.git] DEBUG Check current status
2024-04-29 00:34:47,204 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-29 00:34:47,208 [ scc.git] DEBUG cead313 merge master -Dorg -Snone
2024-04-29 00:34:47,209 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-29 00:34:47,255 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-04-29 00:34:47,258 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-04-29 00:34:47,261 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-04-29 00:34:47,265 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-04-29 00:34:47,269 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-04-29 00:34:47,273 [ scc.config] DEBUG Found remote.origin.url
2024-04-29 00:34:47,273 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-04-29 00:34:47,275 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-04-29 00:34:47,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-04-29 00:34:48,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-29 00:34:48,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-29 00:34:48,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-29 00:34:49,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-29 00:34:49,402 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:34:49,446 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-04-29 00:34:49,447 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-29 00:34:49,450 [ scc.git] DEBUG Check current status
2024-04-29 00:34:49,450 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-29 00:34:49,454 [ scc.git] DEBUG 5863350 Merge pull request #22 from sbesson/python311
2024-04-29 00:34:49,454 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-29 00:34:49,494 [ scc.config] DEBUG Found remote.origin.url
2024-04-29 00:34:49,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-04-29 00:34:50,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-29 00:34:50,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-29 00:34:51,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-29 00:34:51,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-29 00:34:51,591 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:34:51,628 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-29 00:34:51,629 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-04-29 00:34:51,629 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-29 00:34:51,633 [ scc.git] DEBUG Check current status
2024-04-29 00:34:51,633 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-29 00:34:51,636 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-04-29 00:34:51,636 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-29 00:34:51,677 [ scc.config] DEBUG Found remote.origin.url
2024-04-29 00:34:52,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-04-29 00:34:52,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-29 00:34:52,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-29 00:34:53,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-29 00:34:53,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-29 00:34:53,802 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:34:53,840 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-29 00:34:53,841 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-04-29 00:34:53,841 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-29 00:34:53,844 [ scc.git] DEBUG Check current status
2024-04-29 00:34:53,845 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-29 00:34:53,879 [ scc.git] DEBUG 52d9a6f4 Bump version: 5.19.2 → 5.19.3.dev0
2024-04-29 00:34:53,879 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-29 00:34:53,920 [ scc.config] DEBUG Found remote.origin.url
2024-04-29 00:34:54,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-04-29 00:34:54,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-29 00:34:55,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-29 00:34:55,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-29 00:34:56,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-29 00:34:56,003 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:34:56,041 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-29 00:34:56,042 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-04-29 00:34:56,042 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-29 00:34:56,045 [ scc.git] DEBUG Check current status
2024-04-29 00:34:56,046 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-29 00:34:56,058 [ scc.git] DEBUG 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-04-29 00:34:56,058 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-29 00:34:56,097 [ scc.config] DEBUG Found remote.origin.url
2024-04-29 00:34:56,098 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-04-29 00:34:56,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-04-29 00:34:56,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-29 00:34:57,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-29 00:34:57,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-29 00:34:58,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-29 00:34:58,219 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:34:58,260 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-29 00:34:58,261 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-04-29 00:34:58,261 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-29 00:34:58,265 [ scc.git] DEBUG Check current status
2024-04-29 00:34:58,265 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-29 00:34:58,282 [ scc.git] DEBUG e1b1355eb Merge pull request #540 from will-moore/django_template_context_processors_request
2024-04-29 00:34:58,282 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-29 00:34:58,327 [ scc.config] DEBUG Found remote.origin.url
2024-04-29 00:34:58,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-04-29 00:34:59,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-29 00:34:59,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-29 00:35:00,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-29 00:35:00,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-29 00:35:00,509 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:35:00,550 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-29 00:35:00,550 [ scc.git] DEBUG Resetting...
2024-04-29 00:35:00,550 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-04-29 00:35:00,556 [ scc.git] DEBUG HEAD is now at cead313 merge master -Dorg -Snone
2024-04-29 00:35:00,556 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-04-29 00:35:00,611 [ scc.git] DEBUG Check current status
2024-04-29 00:35:00,611 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-29 00:35:00,615 [ scc.git] DEBUG cead313 merge master -Dorg -Snone
2024-04-29 00:35:00,615 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-29 00:35:00,656 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-04-29 00:35:00,659 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-04-29 00:35:00,662 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-04-29 00:35:00,666 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-04-29 00:35:00,669 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-04-29 00:35:00,670 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-04-29 00:35:00,670 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-04-29 00:35:00,670 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-04-29 00:35:00,670 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-04-29 00:35:00,670 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-04-29 00:35:00,670 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-04-29 00:35:00,670 [ scc.repo] DEBUG ## PRs found:
2024-04-29 00:35:00,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-04-29 00:35:00,953 [ scc.repo] DEBUG ## Branches found:
2024-04-29 00:35:00,954 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:35:00,954 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:00,958 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-29 00:35:00,962 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-29 00:35:00,962 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-29 00:35:00,966 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-29 00:35:00,971 [ scc.git] DEBUG Already up to date.
2024-04-29 00:35:00,971 [ scc.git] DEBUG ## Unique users: []
2024-04-29 00:35:00,971 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:35:00,971 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:00,975 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:35:01,015 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:35:01,015 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:01,019 [ scc.repo] DEBUG ## PRs found:
2024-04-29 00:35:01,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-04-29 00:35:01,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23 HTTP/1.1" 200 None
2024-04-29 00:35:02,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23/comments HTTP/1.1" 200 None
2024-04-29 00:35:02,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None
2024-04-29 00:35:03,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-29 00:35:03,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-29 00:35:04,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None
2024-04-29 00:35:04,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:35:04,890 [ scc.repo] DEBUG - PR 23 sbesson 'Remove python-future compatibility code'
2024-04-29 00:35:05,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-04-29 00:35:05,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-04-29 00:35:06,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-04-29 00:35:06,770 [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-04-29 00:35:07,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-04-29 00:35:07,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:35:07,717 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-04-29 00:35:07,717 [ scc.repo] DEBUG ## Branches found:
2024-04-29 00:35:07,718 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-04-29 00:35:07,718 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:35:07,718 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:07,722 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-29 00:35:07,726 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-29 00:35:07,726 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-29 00:35:07,730 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-29 00:35:07,734 [ scc.git] DEBUG Already up to date.
2024-04-29 00:35:07,735 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-04-29 00:35:08,159 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-04-29 00:35:08,159 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-04-29 00:35:08,165 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head'
2024-04-29 00:35:08,557 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-04-29 00:35:08,557 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD
2024-04-29 00:35:08,562 [ scc.git] DEBUG ## Unique users: []
2024-04-29 00:35:08,562 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:35:08,562 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:08,566 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-04-29 00:35:08,570 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:08,573 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-04-29 00:35:08,651 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:35:08,655 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-04-29 00:35:08,655 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-04-29 00:35:08,655 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-04-29 00:35:08,655 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-04-29 00:35:08,655 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-04-29 00:35:08,655 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-04-29 00:35:08,657 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-04-29 00:35:08,657 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-04-29 00:35:08,657 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-04-29 00:35:08,657 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-04-29 00:35:08,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:35:08,824 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8'
2024-04-29 00:35:08,831 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:08,836 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 23 (Remove python-future compatibility code) 9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8'
2024-04-29 00:35:08,929 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-04-29 00:35:08,929 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-04-29 00:35:08,929 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-04-29 00:35:08,929 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-04-29 00:35:08,929 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-04-29 00:35:08,929 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-04-29 00:35:08,929 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-04-29 00:35:08,929 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-04-29 00:35:08,929 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-04-29 00:35:08,930 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:35:08,935 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-04-29 00:35:08,935 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++--
2024-04-29 00:35:08,935 [ scc.git] DEBUG .github/workflows/tox.yml | 5 ++--
2024-04-29 00:35:08,935 [ scc.git] DEBUG Dockerfile | 32 ----------------------
2024-04-29 00:35:08,935 [ scc.git] DEBUG setup.py | 2 +-
2024-04-29 00:35:08,935 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 1 -
2024-04-29 00:35:08,936 [ scc.git] DEBUG src/fsDirectory.py | 8 +-----
2024-04-29 00:35:08,936 [ scc.git] DEBUG src/fsDropBox.py | 8 +-----
2024-04-29 00:35:08,936 [ scc.git] DEBUG src/fsDropBoxMonitorClient.py | 11 +-------
2024-04-29 00:35:08,936 [ scc.git] DEBUG src/fsFileServer.py | 12 ++-------
2024-04-29 00:35:08,936 [ scc.git] DEBUG src/fsLists.py | 2 --
2024-04-29 00:35:08,936 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 9 +------
2024-04-29 00:35:08,936 [ scc.git] DEBUG src/fsMonitor.py | 2 --
2024-04-29 00:35:08,936 [ scc.git] DEBUG src/fsMonitorServer.py | 8 +++---
2024-04-29 00:35:08,936 [ scc.git] DEBUG src/fsNotificationScheduler.py | 3 ---
2024-04-29 00:35:08,936 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 21 +++++----------
2024-04-29 00:35:08,936 [ scc.git] DEBUG src/fsUtil.py | 9 +++----
2024-04-29 00:35:08,936 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 8 +-----
2024-04-29 00:35:08,936 [ scc.git] DEBUG test/conftest.py | 2 --
2024-04-29 00:35:08,936 [ scc.git] DEBUG test/drivers.py | 17 +++---------
2024-04-29 00:35:08,936 [ scc.git] DEBUG test/unit/test_drivers.py | 55 ++++++++++++++++----------------------
2024-04-29 00:35:08,936 [ scc.git] DEBUG test/unit/test_monitor.py | 2 --
2024-04-29 00:35:08,936 [ scc.git] DEBUG test/unit/test_replay.py | 8 +-----
2024-04-29 00:35:08,936 [ scc.git] DEBUG test/unit/test_state.py | 1 -
2024-04-29 00:35:08,936 [ scc.git] DEBUG tox.ini | 3 ++-
2024-04-29 00:35:08,936 [ scc.git] DEBUG 25 files changed, 59 insertions(+), 178 deletions(-)
2024-04-29 00:35:08,937 [ scc.git] DEBUG delete mode 100644 Dockerfile
2024-04-29 00:35:09,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:35:09,239 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:35:09,277 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:35:09,278 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:09,283 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:35:09,332 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:35:09,340 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f48a6fb73d0> has no local changes
2024-04-29 00:35:09,341 [ 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'
- PR 23 sbesson 'Remove python-future compatibility code'
Generated by OMERO-python-superbuild-push#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/46/)'
2024-04-29 00:35:09,359 [ scc.git] DEBUG [detached HEAD 2e25e29] merge master -Dorg -Ssuccess-only
2024-04-29 00:35:09,359 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-29 00:35:09,359 [ scc.repo] DEBUG ## PRs found:
2024-04-29 00:35:09,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-04-29 00:35:10,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-04-29 00:35:10,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-04-29 00:35:11,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-04-29 00:35:11,788 [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-04-29 00:35:12,309 [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-04-29 00:35:12,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-04-29 00:35:13,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:35:13,250 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-04-29 00:35:13,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-04-29 00:35:14,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-04-29 00:35:14,632 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-04-29 00:35:15,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-04-29 00:35:15,075 [ scc.repo] DEBUG ## Branches found:
2024-04-29 00:35:15,076 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-04-29 00:35:15,076 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:35:15,076 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:15,080 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-29 00:35:15,084 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-29 00:35:15,084 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-29 00:35:15,087 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-29 00:35:15,091 [ scc.git] DEBUG Already up to date.
2024-04-29 00:35:15,092 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-04-29 00:35:15,497 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-04-29 00:35:15,497 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-04-29 00:35:15,502 [ scc.git] DEBUG ## Unique users: []
2024-04-29 00:35:15,502 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:35:15,502 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:15,506 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-04-29 00:35:15,511 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:15,515 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-04-29 00:35:15,532 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-04-29 00:35:15,532 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:35:15,535 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-04-29 00:35:15,535 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-04-29 00:35:15,535 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-04-29 00:35:15,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:35:15,743 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:35:15,783 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:35:15,784 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:15,789 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:35:15,829 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:35:15,835 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f48a6f4ff10> has no local changes
2024-04-29 00:35:15,836 [ 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#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/46/)'
2024-04-29 00:35:15,844 [ scc.git] DEBUG [detached HEAD 4d5fd3d] merge master -Dorg -Ssuccess-only
2024-04-29 00:35:15,844 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-29 00:35:15,844 [ scc.repo] DEBUG ## PRs found:
2024-04-29 00:35:16,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-04-29 00:35:16,964 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-04-29 00:35:17,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-04-29 00:35:17,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-04-29 00:35:18,400 [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-04-29 00:35:18,880 [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-04-29 00:35:19,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-04-29 00:35:19,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-04-29 00:35:20,309 [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-04-29 00:35:20,805 [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-04-29 00:35:21,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-04-29 00:35:21,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-04-29 00:35:22,167 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-04-29 00:35:22,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-04-29 00:35:22,604 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-04-29 00:35:23,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-04-29 00:35:23,121 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-04-29 00:35:23,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378 HTTP/1.1" 200 None
2024-04-29 00:35:24,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378/comments HTTP/1.1" 200 None
2024-04-29 00:35:24,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-04-29 00:35:24,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-04-29 00:35:25,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-04-29 00:35:25,934 [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-04-29 00:35:26,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-04-29 00:35:26,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:35:26,909 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-04-29 00:35:27,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-04-29 00:35:27,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-04-29 00:35:28,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-04-29 00:35:28,818 [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-04-29 00:35:29,280 [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-04-29 00:35:29,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-04-29 00:35:30,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-04-29 00:35:30,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-04-29 00:35:31,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-04-29 00:35:31,148 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-04-29 00:35:31,599 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-04-29 00:35:32,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-04-29 00:35:32,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-04-29 00:35:33,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-04-29 00:35:33,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-04-29 00:35:34,008 [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-04-29 00:35:34,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-04-29 00:35:34,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:35:34,959 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-04-29 00:35:35,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-04-29 00:35:35,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-04-29 00:35:36,352 [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-04-29 00:35:36,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-04-29 00:35:37,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:35:37,282 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-04-29 00:35:37,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-04-29 00:35:38,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-04-29 00:35:38,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-04-29 00:35:39,259 [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-04-29 00:35:39,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-04-29 00:35:40,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:35:40,206 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-04-29 00:35:40,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-04-29 00:35:41,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-04-29 00:35:41,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-04-29 00:35:42,140 [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-04-29 00:35:42,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-04-29 00:35:43,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:35:43,134 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-04-29 00:35:43,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-04-29 00:35:44,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-04-29 00:35:44,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-04-29 00:35:44,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-04-29 00:35:44,995 [ scc.repo] DEBUG ## Branches found:
2024-04-29 00:35:44,995 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-04-29 00:35:44,995 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:35:44,996 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:45,027 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-29 00:35:45,031 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-29 00:35:45,031 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-29 00:35:45,036 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-29 00:35:45,040 [ scc.git] DEBUG Already up to date.
2024-04-29 00:35:45,041 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-04-29 00:35:45,808 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-29 00:35:45,808 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-04-29 00:35:45,813 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-04-29 00:35:46,290 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-29 00:35:46,291 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-04-29 00:35:46,296 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-04-29 00:35:46,726 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-29 00:35:46,727 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-04-29 00:35:46,734 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-04-29 00:35:47,163 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-29 00:35:47,163 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-04-29 00:35:47,169 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-04-29 00:35:47,662 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-29 00:35:47,662 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-04-29 00:35:47,667 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-04-29 00:35:48,039 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-29 00:35:48,040 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-04-29 00:35:48,045 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-04-29 00:35:48,443 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-29 00:35:48,443 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-04-29 00:35:48,449 [ scc.git] DEBUG ## Unique users: []
2024-04-29 00:35:48,449 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:35:48,449 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:48,454 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-04-29 00:35:48,467 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:48,471 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-04-29 00:35:48,575 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-04-29 00:35:48,575 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-04-29 00:35:48,577 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:35:48,582 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-04-29 00:35:48,582 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-04-29 00:35:48,582 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-04-29 00:35:48,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:35:48,747 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-04-29 00:35:48,759 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:48,763 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-04-29 00:35:48,909 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-04-29 00:35:48,909 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-04-29 00:35:48,910 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:35:48,920 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-04-29 00:35:48,921 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-04-29 00:35:48,921 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-04-29 00:35:49,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:35:49,153 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-04-29 00:35:49,164 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:49,168 [ 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-04-29 00:35:49,247 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-04-29 00:35:49,249 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:35:49,253 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-04-29 00:35:49,253 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-04-29 00:35:49,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:35:49,580 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-04-29 00:35:49,591 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:49,595 [ 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-04-29 00:35:49,714 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-04-29 00:35:49,715 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-04-29 00:35:49,716 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:35:49,719 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-04-29 00:35:49,719 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-04-29 00:35:49,719 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-04-29 00:35:49,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:35:49,989 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-04-29 00:35:50,000 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:50,004 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-04-29 00:35:50,026 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:35:50,029 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-04-29 00:35:50,029 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-04-29 00:35:50,029 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-04-29 00:35:50,029 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-04-29 00:35:50,029 [ scc.git] DEBUG create mode 100644 connect.py
2024-04-29 00:35:50,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:35:50,387 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-04-29 00:35:50,398 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:50,404 [ 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-04-29 00:35:50,455 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-04-29 00:35:50,457 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:35:50,460 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-04-29 00:35:50,460 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-29 00:35:50,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:35:50,798 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-04-29 00:35:50,809 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:50,814 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-04-29 00:35:50,843 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-04-29 00:35:50,845 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:35:50,849 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-04-29 00:35:50,849 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-04-29 00:35:51,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:35:51,209 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:35:51,257 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:35:51,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:51,262 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:35:51,301 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:35:51,308 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f48a5ef3760> has no local changes
2024-04-29 00:35:51,308 [ 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'
Generated by OMERO-python-superbuild-push#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/46/)'
2024-04-29 00:35:51,317 [ scc.git] DEBUG [detached HEAD 5a564e6d] merge master -Dorg -Ssuccess-only
2024-04-29 00:35:51,317 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-29 00:35:51,317 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-29 00:35:51,317 [ scc.repo] DEBUG ## PRs found:
2024-04-29 00:35:51,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-29 00:35:52,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-29 00:35:52,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-29 00:35:53,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-29 00:35:53,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-29 00:35:54,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-29 00:35:54,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-29 00:35:55,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-29 00:35:55,577 [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-04-29 00:35:56,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-29 00:35:56,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:35:56,483 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-29 00:35:56,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-29 00:35:57,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-29 00:35:57,987 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-29 00:35:58,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-29 00:35:58,487 [ scc.repo] DEBUG ## Branches found:
2024-04-29 00:35:58,487 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-04-29 00:35:58,487 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:35:58,487 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:58,492 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-29 00:35:58,496 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-29 00:35:58,497 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-29 00:35:58,501 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-29 00:35:58,506 [ scc.git] DEBUG Already up to date.
2024-04-29 00:35:58,507 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-29 00:35:58,975 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-04-29 00:35:58,975 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-29 00:35:58,980 [ scc.git] DEBUG ## Unique users: []
2024-04-29 00:35:58,981 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:35:58,981 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:58,986 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-29 00:35:58,992 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:58,997 [ 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-04-29 00:35:59,081 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-29 00:35:59,081 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-29 00:35:59,081 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-29 00:35:59,082 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-29 00:35:59,087 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-29 00:35:59,093 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-04-29 00:35:59,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:35:59,242 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-29 00:35:59,248 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-29 00:35:59,253 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#46](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/46/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/46/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-29 00:35:59,257 [ scc.config] DEBUG Found github.token
2024-04-29 00:35:59,257 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-29 00:35:59,257 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:35:59,294 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:35:59,295 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:35:59,298 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:35:59,333 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:35:59,339 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f48a5ed8640> has no local changes
2024-04-29 00:35:59,339 [ 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#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/46/)'
2024-04-29 00:35:59,347 [ scc.git] DEBUG [detached HEAD 35ccfa2] merge master -Dorg -Ssuccess-only
2024-04-29 00:35:59,347 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-29 00:35:59,347 [ scc.repo] DEBUG ## PRs found:
2024-04-29 00:35:59,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-04-29 00:36:00,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549 HTTP/1.1" 200 None
2024-04-29 00:36:00,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549/comments HTTP/1.1" 200 None
2024-04-29 00:36:01,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ade7fa1b5839e9b17878c38efd4f6404a5857712 HTTP/1.1" 200 None
2024-04-29 00:36:01,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ade7fa1b5839e9b17878c38efd4f6404a5857712/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-29 00:36:02,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ade7fa1b5839e9b17878c38efd4f6404a5857712/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-29 00:36:02,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543 HTTP/1.1" 200 None
2024-04-29 00:36:03,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543/comments HTTP/1.1" 200 None
2024-04-29 00:36:03,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-04-29 00:36:04,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-29 00:36:04,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-29 00:36:05,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-04-29 00:36:05,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4?per_page=1 HTTP/1.1" 200 None
2024-04-29 00:36:06,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-04-29 00:36:06,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/status HTTP/1.1" 200 None
2024-04-29 00:36:06,521 [ scc.repo] DEBUG - PR 543 knabar 'Block UI for some long running tasks'
2024-04-29 00:36:06,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542 HTTP/1.1" 200 None
2024-04-29 00:36:07,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542/comments HTTP/1.1" 200 None
2024-04-29 00:36:07,515 [ scc.repo] DEBUG # ... Include label: include
2024-04-29 00:36:07,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-04-29 00:36:08,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-29 00:36:08,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-29 00:36:09,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-04-29 00:36:09,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/977f7b65169e6dee479197a9156993bbadd2d2e2?per_page=1 HTTP/1.1" 200 None
2024-04-29 00:36:10,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-04-29 00:36:10,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/status HTTP/1.1" 200 None
2024-04-29 00:36:10,839 [ scc.repo] DEBUG - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-04-29 00:36:11,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/536 HTTP/1.1" 200 None
2024-04-29 00:36:11,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/536/comments HTTP/1.1" 200 None
2024-04-29 00:36:12,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2 HTTP/1.1" 200 None
2024-04-29 00:36:12,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-29 00:36:13,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-29 00:36:13,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2 HTTP/1.1" 200 None
2024-04-29 00:36:14,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/412fa66a52477fb77319a35147313a6f3cf481a2?per_page=1 HTTP/1.1" 200 None
2024-04-29 00:36:14,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2 HTTP/1.1" 200 None
2024-04-29 00:36:15,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2/status HTTP/1.1" 200 None
2024-04-29 00:36:15,149 [ scc.repo] DEBUG - PR 536 will-moore 'imgData JSON with no stateful services'
2024-04-29 00:36:15,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-04-29 00:36:16,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-04-29 00:36:16,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-04-29 00:36:17,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-04-29 00:36:17,523 [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-04-29 00:36:18,046 [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-04-29 00:36:18,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-04-29 00:36:18,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-04-29 00:36:19,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-04-29 00:36:19,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-04-29 00:36:19,858 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-04-29 00:36:20,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/533 HTTP/1.1" 200 None
2024-04-29 00:36:20,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-04-29 00:36:21,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-29 00:36:21,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-29 00:36:22,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-04-29 00:36:22,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/e335980be1e7197826687f6c322a60c61b4aa545?per_page=1 HTTP/1.1" 200 None
2024-04-29 00:36:23,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-04-29 00:36:23,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545/status HTTP/1.1" 200 None
2024-04-29 00:36:23,604 [ scc.repo] DEBUG - PR 533 jburel 'use conda-forge channel'
2024-04-29 00:36:24,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-04-29 00:36:24,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-04-29 00:36:25,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-04-29 00:36:25,564 [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-04-29 00:36:26,064 [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-04-29 00:36:26,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-04-29 00:36:26,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-04-29 00:36:27,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-04-29 00:36:27,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-04-29 00:36:27,879 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-04-29 00:36:28,348 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-04-29 00:36:28,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-04-29 00:36:29,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615 HTTP/1.1" 200 None
2024-04-29 00:36:29,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-29 00:36:30,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615 HTTP/1.1" 200 None
2024-04-29 00:36:30,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/219d9e721304a4c46b4d73ef9ff3777549d69615?per_page=1 HTTP/1.1" 200 2
2024-04-29 00:36:30,752 [ scc.repo] DEBUG - PR 168 stick 'Changes to nginx @maintenance handler'
2024-04-29 00:36:30,752 [ scc.repo] DEBUG ## Branches found:
2024-04-29 00:36:30,752 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-04-29 00:36:30,753 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:36:30,753 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:36:30,758 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-29 00:36:30,762 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-29 00:36:30,763 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-29 00:36:30,767 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-29 00:36:30,772 [ scc.git] DEBUG Already up to date.
2024-04-29 00:36:30,772 [ scc.git] DEBUG Calling 'git fetch origin pull/168/head'
2024-04-29 00:36:31,441 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-29 00:36:31,441 [ scc.git] DEBUG * branch refs/pull/168/head -> FETCH_HEAD
2024-04-29 00:36:31,446 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-04-29 00:36:31,984 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-29 00:36:31,984 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-04-29 00:36:31,990 [ scc.git] DEBUG Calling 'git fetch origin pull/533/head'
2024-04-29 00:36:32,389 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-29 00:36:32,390 [ scc.git] DEBUG * branch refs/pull/533/head -> FETCH_HEAD
2024-04-29 00:36:32,395 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-04-29 00:36:32,824 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-29 00:36:32,824 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-04-29 00:36:32,829 [ scc.git] DEBUG Calling 'git fetch origin pull/536/head'
2024-04-29 00:36:33,688 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-29 00:36:33,688 [ scc.git] DEBUG * branch refs/pull/536/head -> FETCH_HEAD
2024-04-29 00:36:33,694 [ scc.git] DEBUG Calling 'git fetch origin pull/542/head'
2024-04-29 00:36:34,376 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-29 00:36:34,377 [ scc.git] DEBUG * branch refs/pull/542/head -> FETCH_HEAD
2024-04-29 00:36:34,383 [ scc.git] DEBUG Calling 'git fetch origin pull/543/head'
2024-04-29 00:36:35,380 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-29 00:36:35,380 [ scc.git] DEBUG * branch refs/pull/543/head -> FETCH_HEAD
2024-04-29 00:36:35,386 [ scc.git] DEBUG ## Unique users: []
2024-04-29 00:36:35,386 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:36:35,386 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:36:35,390 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-04-29 00:36:35,404 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:36:35,408 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 168 (Changes to nginx @maintenance handler) 219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-04-29 00:36:35,459 [ scc.git] DEBUG Auto-merging test/unit/test_web.py
2024-04-29 00:36:35,460 [ scc.git] DEBUG CONFLICT (content): Merge conflict in test/unit/test_web.py
2024-04-29 00:36:35,461 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-29 00:36:35,461 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-29 00:36:35,468 [ scc.git] DEBUG Calling 'git reset --hard e1b1355ebd4f9de8b855dd2c55f59d86c061a81b'
2024-04-29 00:36:35,479 [ scc.git] DEBUG HEAD is now at e1b1355eb Merge pull request #540 from will-moore/django_template_context_processors_request
2024-04-29 00:36:35,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:36:35,635 [ scc.git] DEBUG Calling 'git merge-base e1b1355ebd4f9de8b855dd2c55f59d86c061a81b 219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-04-29 00:36:35,650 [ scc.git] DEBUG Calling 'git diff --name-only 632d14a9cab5319c6b1bd9190d441a95e457103b..e1b1355ebd4f9de8b855dd2c55f59d86c061a81b'
2024-04-29 00:36:35,763 [ scc.git] INFO - PR 168 stick 'Changes to nginx @maintenance handler'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#46](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/46/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/46/consoleText) for more details.
Possible conflicts:
- Upstream changes
- test/unit/test_web.py
--conflicts
2024-04-29 00:36:35,769 [ scc.config] DEBUG Found github.token
2024-04-29 00:36:35,770 [ scc.git] DEBUG Not adding comment to issue #168, already --conflicts.
2024-04-29 00:36:35,770 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-04-29 00:36:35,775 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:36:35,780 [ 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-04-29 00:36:35,823 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-04-29 00:36:35,823 [ scc.git] DEBUG Auto-merging setup.py
2024-04-29 00:36:35,824 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:36:35,827 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-04-29 00:36:35,827 [ scc.git] DEBUG setup.py | 1 +
2024-04-29 00:36:35,828 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-04-29 00:36:36,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:36:36,048 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e335980be1e7197826687f6c322a60c61b4aa545'
2024-04-29 00:36:36,054 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:36:36,058 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 533 (use conda-forge channel) e335980be1e7197826687f6c322a60c61b4aa545'
2024-04-29 00:36:36,074 [ scc.git] DEBUG Auto-merging README.rst
2024-04-29 00:36:36,075 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:36:36,078 [ scc.git] DEBUG README.rst | 3 +--
2024-04-29 00:36:36,078 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 2 deletions(-)
2024-04-29 00:36:36,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:36:36,454 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-04-29 00:36:36,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:36:36,464 [ 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-04-29 00:36:36,515 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-04-29 00:36:36,515 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-04-29 00:36:36,516 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:36:36,520 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-04-29 00:36:36,520 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-04-29 00:36:36,520 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-04-29 00:36:36,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:36:36,861 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...412fa66a52477fb77319a35147313a6f3cf481a2'
2024-04-29 00:36:36,868 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:36:36,872 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 536 (imgData JSON with no stateful services) 412fa66a52477fb77319a35147313a6f3cf481a2'
2024-04-29 00:36:36,992 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py
2024-04-29 00:36:36,992 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-04-29 00:36:36,993 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:36:36,999 [ scc.git] DEBUG omeroweb/webclient/views.py | 4 +-
2024-04-29 00:36:37,000 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 135 ++++++++++++++++++++++++++++++++++++++---
2024-04-29 00:36:37,000 [ scc.git] DEBUG omeroweb/webgateway/util.py | 38 ++++++++++++
2024-04-29 00:36:37,000 [ scc.git] DEBUG 3 files changed, 166 insertions(+), 11 deletions(-)
2024-04-29 00:36:37,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:36:37,275 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...977f7b65169e6dee479197a9156993bbadd2d2e2'
2024-04-29 00:36:37,282 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:36:37,286 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 542 (PlateAcquisition filtering with plate display) 977f7b65169e6dee479197a9156993bbadd2d2e2'
2024-04-29 00:36:37,368 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py
2024-04-29 00:36:37,369 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:36:37,376 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 13 +++-------
2024-04-29 00:36:37,377 [ scc.git] DEBUG .../webclient/templates/webclient/data/plate.html | 10 ++++----
2024-04-29 00:36:37,377 [ scc.git] DEBUG omeroweb/webclient/views.py | 17 ++++++++++++
2024-04-29 00:36:37,377 [ scc.git] DEBUG omeroweb/webgateway/plategrid.py | 30 +++++++++++++++++++---
2024-04-29 00:36:37,377 [ scc.git] DEBUG .../static/webgateway/js/ome.plateview.js | 16 +++++++-----
2024-04-29 00:36:37,377 [ scc.git] DEBUG omeroweb/webgateway/urls.py | 2 +-
2024-04-29 00:36:37,377 [ scc.git] DEBUG omeroweb/webgateway/views.py | 16 ++++++++++--
2024-04-29 00:36:37,377 [ scc.git] DEBUG 7 files changed, 78 insertions(+), 26 deletions(-)
2024-04-29 00:36:37,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:36:37,683 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4'
2024-04-29 00:36:37,690 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:36:37,693 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 543 (Block UI for some long running tasks) 8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4'
2024-04-29 00:36:37,794 [ scc.git] DEBUG Auto-merging omeroweb/webclient/templates/webclient/data/includes/center_plugin.thumbs.js.html
2024-04-29 00:36:37,795 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-29 00:36:37,802 [ scc.git] DEBUG .../webclient/javascript/ome.progress_overlay.js | 60 ++++++
2024-04-29 00:36:37,802 [ scc.git] DEBUG .../webclient/javascript/ome.webclient.actions.js | 112 +++++++-----
2024-04-29 00:36:37,802 [ scc.git] DEBUG .../webclient/annotations/metadata_preview.html | 51 +++---
2024-04-29 00:36:37,802 [ scc.git] DEBUG .../webclient/templates/webclient/base/base.html | 1 +
2024-04-29 00:36:37,802 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 2 +-
2024-04-29 00:36:37,802 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 16 +-
2024-04-29 00:36:37,802 [ scc.git] DEBUG .../static/webgateway/js/ome.gs_utils.js | 201 ---------------------
2024-04-29 00:36:37,802 [ scc.git] DEBUG .../webgateway/static/webgateway/js/ome.popup.js | 1 -
2024-04-29 00:36:37,802 [ scc.git] DEBUG .../webgateway/static/webgateway/js/omero_image.js | 35 ++--
2024-04-29 00:36:37,802 [ scc.git] DEBUG 9 files changed, 186 insertions(+), 293 deletions(-)
2024-04-29 00:36:37,802 [ scc.git] DEBUG create mode 100644 omeroweb/webclient/static/webclient/javascript/ome.progress_overlay.js
2024-04-29 00:36:38,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:36:38,104 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-29 00:36:38,144 [ scc.git] DEBUG Get sha1 of %s
2024-04-29 00:36:38,144 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-29 00:36:38,148 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:36:38,187 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:36:38,198 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f48a5f05910> has no local changes
2024-04-29 00:36:38,199 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 549 knabar 'Remove webgateway cache' (status: failure)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 533 jburel 'use conda-forge channel'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 536 will-moore 'imgData JSON with no stateful services'
- PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
- PR 543 knabar 'Block UI for some long running tasks'
Conflicting PRs (not included):
- PR 168 stick 'Changes to nginx @maintenance handler'
Generated by OMERO-python-superbuild-push#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/46/)'
2024-04-29 00:36:38,209 [ scc.git] DEBUG [detached HEAD cebb609ae] merge master -Dorg -Ssuccess-only
2024-04-29 00:36:38,209 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-29 00:36:38,210 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-29 00:36:38,257 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-04-29 00:36:38,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:36:38,543 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-04-29 00:36:38,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:36:38,950 [ scc.config] DEBUG Found submodule.omero-py.url
2024-04-29 00:36:39,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:36:39,348 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-04-29 00:36:39,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:36:39,766 [ scc.config] DEBUG Found submodule.omero-web.url
2024-04-29 00:36:40,164 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-29 00:36:40,174 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-29 00:36:40,202 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f48a704be80> has local changes
2024-04-29 00:36:40,202 [ 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'
- PR 23 sbesson 'Remove python-future compatibility code'
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'
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 549 knabar 'Remove webgateway cache' (status: failure)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 533 jburel 'use conda-forge channel'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 536 will-moore 'imgData JSON with no stateful services'
- PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
- PR 543 knabar 'Block UI for some long running tasks'
Conflicting PRs (not included):
- PR 168 stick 'Changes to nginx @maintenance handler'
Generated by OMERO-python-superbuild-push#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/46/)'
2024-04-29 00:36:40,212 [ scc.git] DEBUG [detached HEAD 06d5893] merge master -Dorg -Ssuccess-only
2024-04-29 00:36:40,213 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-04-29 00:36:40,213 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-04-29 00:36:40,213 [ scc.merge] INFO Already up to date.
2024-04-29 00:36:40,213 [ scc.merge] INFO
2024-04-29 00:36:40,213 [ scc.merge] INFO
2024-04-29 00:36:40,213 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-04-29 00:36:40,213 [ scc.merge] INFO Already up to date.
2024-04-29 00:36:40,213 [ scc.merge] INFO
2024-04-29 00:36:40,213 [ scc.merge] INFO Merged PRs:
2024-04-29 00:36:40,213 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-04-29 00:36:40,213 [ scc.merge] INFO - PR 23 sbesson 'Remove python-future compatibility code'
2024-04-29 00:36:40,213 [ scc.merge] INFO
2024-04-29 00:36:40,213 [ scc.merge] INFO Repository: ome/omero-marshal
2024-04-29 00:36:40,213 [ scc.merge] INFO Excluded PRs:
2024-04-29 00:36:40,213 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-04-29 00:36:40,213 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-04-29 00:36:40,213 [ scc.merge] INFO Already up to date.
2024-04-29 00:36:40,213 [ scc.merge] INFO
2024-04-29 00:36:40,213 [ scc.merge] INFO Merged PRs:
2024-04-29 00:36:40,213 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-04-29 00:36:40,213 [ scc.merge] INFO
2024-04-29 00:36:40,213 [ scc.merge] INFO Repository: ome/omero-py
2024-04-29 00:36:40,213 [ scc.merge] INFO Excluded PRs:
2024-04-29 00:36:40,213 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-04-29 00:36:40,213 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-04-29 00:36:40,213 [ scc.merge] INFO - PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
2024-04-29 00:36:40,213 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-04-29 00:36:40,214 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-04-29 00:36:40,214 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-04-29 00:36:40,214 [ scc.merge] INFO Already up to date.
2024-04-29 00:36:40,214 [ scc.merge] INFO
2024-04-29 00:36:40,214 [ scc.merge] INFO Merged PRs:
2024-04-29 00:36:40,214 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-04-29 00:36:40,214 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-04-29 00:36:40,214 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-04-29 00:36:40,214 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-04-29 00:36:40,214 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-04-29 00:36:40,214 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-04-29 00:36:40,214 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-04-29 00:36:40,214 [ scc.merge] INFO
2024-04-29 00:36:40,214 [ scc.merge] INFO Repository: ome/omero-scripts
2024-04-29 00:36:40,214 [ scc.merge] INFO Excluded PRs:
2024-04-29 00:36:40,214 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-29 00:36:40,214 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-29 00:36:40,214 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-29 00:36:40,214 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-29 00:36:40,214 [ scc.merge] INFO Already up to date.
2024-04-29 00:36:40,214 [ scc.merge] INFO
2024-04-29 00:36:40,214 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-29 00:36:40,214 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-29 00:36:40,214 [ scc.merge] INFO
2024-04-29 00:36:40,214 [ scc.merge] INFO Repository: ome/omero-web
2024-04-29 00:36:40,214 [ scc.merge] INFO Excluded PRs:
2024-04-29 00:36:40,214 [ scc.merge] INFO - PR 549 knabar 'Remove webgateway cache' (status: failure)
2024-04-29 00:36:40,214 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-04-29 00:36:40,214 [ scc.merge] INFO Already up to date.
2024-04-29 00:36:40,214 [ scc.merge] INFO
2024-04-29 00:36:40,214 [ scc.merge] INFO Merged PRs:
2024-04-29 00:36:40,214 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-04-29 00:36:40,214 [ scc.merge] INFO - PR 533 jburel 'use conda-forge channel'
2024-04-29 00:36:40,214 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-04-29 00:36:40,214 [ scc.merge] INFO - PR 536 will-moore 'imgData JSON with no stateful services'
2024-04-29 00:36:40,214 [ scc.merge] INFO - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-04-29 00:36:40,215 [ scc.merge] INFO - PR 543 knabar 'Block UI for some long running tasks'
2024-04-29 00:36:40,215 [ scc.merge] INFO
2024-04-29 00:36:40,215 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-29 00:36:40,215 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler'
2024-04-29 00:36:40,215 [ scc.merge] INFO
2024-04-29 00:36:40,215 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-29 00:36:40,215 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:36:40,219 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-04-29 00:36:40,220 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:36:40,224 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-29 00:36:40,224 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-04-29 00:36:40,224 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:36:40,228 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-29 00:36:40,228 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-04-29 00:36:40,228 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:36:40,233 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-29 00:36:40,233 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-04-29 00:36:40,233 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:36:40,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-29 00:36:40,238 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-04-29 00:36:40,238 [ scc.git] DEBUG Calling 'git remote'
2024-04-29 00:36:40,242 [ 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 5863350
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 52d9a6f4
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 e1b1355eb
nothing to commit, working tree clean
HEAD detached from 9308a59
nothing to commit, working tree clean
2024-04-29 00:37:10,031 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
