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-05-01 00:33:26,837 [ scc.config] DEBUG Found github.token
2024-05-01 00:33:26,840 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-05-01 00:33:27,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:33:27,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:33:27,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-05-01 00:33:27,880 [ scc.gh] DEBUG 4998 remaining from 5000 (Reset at 01:05
2024-05-01 00:33:27,881 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-01 00:33:27,885 [ scc.git] DEBUG Check current status
2024-05-01 00:33:27,885 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-01 00:33:27,889 [ scc.git] DEBUG 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-05-01 00:33:27,889 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-01 00:33:27,930 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-05-01 00:33:27,933 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-01 00:33:27,937 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-05-01 00:33:27,941 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-01 00:33:28,032 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-01 00:33:28,037 [ scc.config] DEBUG Found remote.origin.url
2024-05-01 00:33:28,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-05-01 00:33:28,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-01 00:33:29,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-01 00:33:29,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-01 00:33:30,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-01 00:33:30,077 [ scc.git] DEBUG Resetting...
2024-05-01 00:33:30,077 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-05-01 00:33:30,083 [ scc.git] DEBUG HEAD is now at 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-05-01 00:33:30,083 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-05-01 00:33:30,130 [ scc.git] DEBUG Check current status
2024-05-01 00:33:30,130 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-01 00:33:30,134 [ scc.git] DEBUG 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-05-01 00:33:30,135 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-01 00:33:30,173 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-05-01 00:33:30,175 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-01 00:33:30,178 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-05-01 00:33:30,182 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-01 00:33:30,186 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-01 00:33:30,187 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-05-01 00:33:30,187 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-05-01 00:33:30,187 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-05-01 00:33:30,187 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-05-01 00:33:30,187 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-05-01 00:33:30,187 [ scc.repo] DEBUG ## PRs found:
2024-05-01 00:33:30,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-05-01 00:33:30,514 [ scc.repo] DEBUG ## Branches found:
2024-05-01 00:33:30,514 [ scc.git] DEBUG Get sha1 of %s
2024-05-01 00:33:30,514 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:33:30,518 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-01 00:33:30,521 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-01 00:33:30,522 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-01 00:33:30,525 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-01 00:33:30,529 [ scc.git] DEBUG Already up to date.
2024-05-01 00:33:30,529 [ scc.git] DEBUG ## Unique users: []
2024-05-01 00:33:30,529 [ scc.git] DEBUG Get sha1 of %s
2024-05-01 00:33:30,529 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:33:30,532 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-01 00:33:30,572 [ scc.git] DEBUG Get sha1 of %s
2024-05-01 00:33:30,572 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:33:30,576 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-01 00:33:30,708 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fce9d56c430> has no local changes
2024-05-01 00:33:30,708 [ 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#48 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/48/)'
2024-05-01 00:33:30,732 [ scc.git] DEBUG [detached HEAD fa2fbcc] merge master -Dorg -Snone
2024-05-01 00:33:30,732 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-05-01 00:33:30,732 [ scc.merge] INFO Already up to date.
2024-05-01 00:33:30,732 [ scc.merge] INFO
2024-05-01 00:33:30,732 [ scc.merge] INFO
2024-05-01 00:33:30,732 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-01 00:33:30,732 [ 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-05-01 00:33:33,075 [ scc.config] DEBUG Found github.token
2024-05-01 00:33:33,080 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-05-01 00:33:33,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:33:33,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:33:34,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-05-01 00:33:34,143 [ scc.gh] DEBUG 4990 remaining from 5000 (Reset at 01:05
2024-05-01 00:33:34,144 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-01 00:33:34,148 [ scc.git] DEBUG Check current status
2024-05-01 00:33:34,148 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-01 00:33:34,151 [ scc.git] DEBUG fa2fbcc merge master -Dorg -Snone
2024-05-01 00:33:34,152 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-01 00:33:34,191 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-05-01 00:33:34,194 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-01 00:33:34,197 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-05-01 00:33:34,200 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-01 00:33:34,203 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-01 00:33:34,208 [ scc.config] DEBUG Found remote.origin.url
2024-05-01 00:33:34,208 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-05-01 00:33:34,211 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-05-01 00:33:34,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-05-01 00:33:35,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-01 00:33:35,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-01 00:33:35,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-01 00:33:36,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-01 00:33:36,305 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-01 00:33:36,349 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-05-01 00:33:36,349 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-01 00:33:36,352 [ scc.git] DEBUG Check current status
2024-05-01 00:33:36,352 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-01 00:33:36,356 [ scc.git] DEBUG 5863350 Merge pull request #22 from sbesson/python311
2024-05-01 00:33:36,356 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-01 00:33:36,395 [ scc.config] DEBUG Found remote.origin.url
2024-05-01 00:33:36,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-05-01 00:33:37,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-01 00:33:37,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-01 00:33:38,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-01 00:33:38,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-01 00:33:38,578 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-01 00:33:38,615 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-01 00:33:38,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-05-01 00:33:38,617 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-01 00:33:38,620 [ scc.git] DEBUG Check current status
2024-05-01 00:33:38,621 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-01 00:33:38,624 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-05-01 00:33:38,625 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-01 00:33:38,665 [ scc.config] DEBUG Found remote.origin.url
2024-05-01 00:33:39,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-05-01 00:33:39,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-01 00:33:39,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-01 00:33:40,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-01 00:33:40,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-01 00:33:40,758 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-01 00:33:40,795 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-01 00:33:40,796 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-05-01 00:33:40,796 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-01 00:33:40,800 [ scc.git] DEBUG Check current status
2024-05-01 00:33:40,800 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-01 00:33:40,803 [ scc.git] DEBUG 52d9a6f4 Bump version: 5.19.2 → 5.19.3.dev0
2024-05-01 00:33:40,803 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-01 00:33:40,844 [ scc.config] DEBUG Found remote.origin.url
2024-05-01 00:33:41,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-05-01 00:33:41,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-01 00:33:42,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-01 00:33:42,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-01 00:33:42,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-01 00:33:42,956 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-01 00:33:43,004 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-01 00:33:43,006 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-05-01 00:33:43,006 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-01 00:33:43,011 [ scc.git] DEBUG Check current status
2024-05-01 00:33:43,011 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-01 00:33:43,016 [ scc.git] DEBUG 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-01 00:33:43,017 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-01 00:33:43,070 [ scc.config] DEBUG Found remote.origin.url
2024-05-01 00:33:43,074 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-05-01 00:33:43,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-05-01 00:33:43,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-01 00:33:44,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-01 00:33:44,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-01 00:33:45,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-01 00:33:45,159 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-01 00:33:45,201 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-01 00:33:45,202 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-05-01 00:33:45,202 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-01 00:33:45,206 [ scc.git] DEBUG Check current status
2024-05-01 00:33:45,206 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-01 00:33:45,210 [ scc.git] DEBUG e1b1355eb Merge pull request #540 from will-moore/django_template_context_processors_request
2024-05-01 00:33:45,210 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-01 00:33:45,250 [ scc.config] DEBUG Found remote.origin.url
2024-05-01 00:33:45,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-05-01 00:33:46,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-01 00:33:46,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-01 00:33:46,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-01 00:33:47,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-01 00:33:47,373 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-01 00:33:47,416 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-01 00:33:47,416 [ scc.git] DEBUG Resetting...
2024-05-01 00:33:47,417 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-05-01 00:33:47,423 [ scc.git] DEBUG HEAD is now at fa2fbcc merge master -Dorg -Snone
2024-05-01 00:33:47,424 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-05-01 00:33:47,500 [ scc.git] DEBUG Check current status
2024-05-01 00:33:47,500 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-01 00:33:47,504 [ scc.git] DEBUG fa2fbcc merge master -Dorg -Snone
2024-05-01 00:33:47,505 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-01 00:33:47,553 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-05-01 00:33:47,556 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-01 00:33:47,560 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-05-01 00:33:47,564 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-01 00:33:47,567 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-01 00:33:47,568 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-05-01 00:33:47,568 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-05-01 00:33:47,568 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-05-01 00:33:47,568 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-05-01 00:33:47,568 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-05-01 00:33:47,568 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-05-01 00:33:47,569 [ scc.repo] DEBUG ## PRs found:
2024-05-01 00:33:47,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-05-01 00:33:47,793 [ scc.repo] DEBUG ## Branches found:
2024-05-01 00:33:47,794 [ scc.git] DEBUG Get sha1 of %s
2024-05-01 00:33:47,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:33:47,798 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-01 00:33:47,802 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-01 00:33:47,802 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-01 00:33:47,806 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-01 00:33:47,810 [ scc.git] DEBUG Already up to date.
2024-05-01 00:33:47,811 [ scc.git] DEBUG ## Unique users: []
2024-05-01 00:33:47,811 [ scc.git] DEBUG Get sha1 of %s
2024-05-01 00:33:47,811 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:33:47,814 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-01 00:33:47,854 [ scc.git] DEBUG Get sha1 of %s
2024-05-01 00:33:47,854 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:33:47,860 [ scc.repo] DEBUG ## PRs found:
2024-05-01 00:33:48,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-05-01 00:33:48,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23 HTTP/1.1" 200 None
2024-05-01 00:33:49,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23/comments HTTP/1.1" 200 None
2024-05-01 00:33:49,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None
2024-05-01 00:33:50,243 [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-05-01 00:33:50,727 [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-05-01 00:33:51,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None
2024-05-01 00:33:51,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8?per_page=1 HTTP/1.1" 200 2
2024-05-01 00:33:51,597 [ scc.repo] DEBUG - PR 23 sbesson 'Remove python-future compatibility code'
2024-05-01 00:33:52,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-05-01 00:33:52,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-05-01 00:33:53,045 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-05-01 00:33:53,551 [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-05-01 00:33:54,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-05-01 00:33:54,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-05-01 00:33:54,462 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-05-01 00:33:54,463 [ scc.repo] DEBUG ## Branches found:
2024-05-01 00:33:54,463 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-05-01 00:33:54,463 [ scc.git] DEBUG Get sha1 of %s
2024-05-01 00:33:54,463 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:33:54,468 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-01 00:33:54,472 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-01 00:33:54,472 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-01 00:33:54,477 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-01 00:33:54,482 [ scc.git] DEBUG Already up to date.
2024-05-01 00:33:54,482 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-05-01 00:33:54,852 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-05-01 00:33:54,852 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-05-01 00:33:54,857 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head'
2024-05-01 00:33:55,267 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-05-01 00:33:55,267 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD
2024-05-01 00:33:55,273 [ scc.git] DEBUG ## Unique users: []
2024-05-01 00:33:55,273 [ scc.git] DEBUG Get sha1 of %s
2024-05-01 00:33:55,273 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:33:55,279 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-05-01 00:33:55,284 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:33:55,288 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-05-01 00:33:55,319 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-01 00:33:55,323 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-05-01 00:33:55,323 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-05-01 00:33:55,323 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-05-01 00:33:55,323 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-05-01 00:33:55,325 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-05-01 00:33:55,325 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-05-01 00:33:55,325 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-05-01 00:33:55,325 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-05-01 00:33:55,326 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-05-01 00:33:55,326 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-05-01 00:33:55,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:33:55,491 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8'
2024-05-01 00:33:55,498 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:33:55,502 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 23 (Remove python-future compatibility code) 9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8'
2024-05-01 00:33:55,529 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-05-01 00:33:55,530 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-05-01 00:33:55,530 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-05-01 00:33:55,530 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-05-01 00:33:55,530 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-05-01 00:33:55,530 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-05-01 00:33:55,530 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-05-01 00:33:55,530 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-05-01 00:33:55,530 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-05-01 00:33:55,530 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-01 00:33:55,536 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-05-01 00:33:55,536 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++--
2024-05-01 00:33:55,536 [ scc.git] DEBUG .github/workflows/tox.yml | 5 ++--
2024-05-01 00:33:55,536 [ scc.git] DEBUG Dockerfile | 32 ----------------------
2024-05-01 00:33:55,536 [ scc.git] DEBUG setup.py | 2 +-
2024-05-01 00:33:55,536 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 1 -
2024-05-01 00:33:55,536 [ scc.git] DEBUG src/fsDirectory.py | 8 +-----
2024-05-01 00:33:55,537 [ scc.git] DEBUG src/fsDropBox.py | 8 +-----
2024-05-01 00:33:55,537 [ scc.git] DEBUG src/fsDropBoxMonitorClient.py | 11 +-------
2024-05-01 00:33:55,537 [ scc.git] DEBUG src/fsFileServer.py | 12 ++-------
2024-05-01 00:33:55,537 [ scc.git] DEBUG src/fsLists.py | 2 --
2024-05-01 00:33:55,537 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 9 +------
2024-05-01 00:33:55,537 [ scc.git] DEBUG src/fsMonitor.py | 2 --
2024-05-01 00:33:55,537 [ scc.git] DEBUG src/fsMonitorServer.py | 8 +++---
2024-05-01 00:33:55,537 [ scc.git] DEBUG src/fsNotificationScheduler.py | 3 ---
2024-05-01 00:33:55,537 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 21 +++++----------
2024-05-01 00:33:55,537 [ scc.git] DEBUG src/fsUtil.py | 9 +++----
2024-05-01 00:33:55,537 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 8 +-----
2024-05-01 00:33:55,537 [ scc.git] DEBUG test/conftest.py | 2 --
2024-05-01 00:33:55,537 [ scc.git] DEBUG test/drivers.py | 17 +++---------
2024-05-01 00:33:55,537 [ scc.git] DEBUG test/unit/test_drivers.py | 55 ++++++++++++++++----------------------
2024-05-01 00:33:55,537 [ scc.git] DEBUG test/unit/test_monitor.py | 2 --
2024-05-01 00:33:55,537 [ scc.git] DEBUG test/unit/test_replay.py | 8 +-----
2024-05-01 00:33:55,537 [ scc.git] DEBUG test/unit/test_state.py | 1 -
2024-05-01 00:33:55,537 [ scc.git] DEBUG tox.ini | 3 ++-
2024-05-01 00:33:55,538 [ scc.git] DEBUG 25 files changed, 59 insertions(+), 178 deletions(-)
2024-05-01 00:33:55,538 [ scc.git] DEBUG delete mode 100644 Dockerfile
2024-05-01 00:33:55,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:33:55,906 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-01 00:33:55,946 [ scc.git] DEBUG Get sha1 of %s
2024-05-01 00:33:55,947 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:33:55,951 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-01 00:33:55,994 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-01 00:33:56,002 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9692f34e80> has no local changes
2024-05-01 00:33:56,002 [ 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#48 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/48/)'
2024-05-01 00:33:56,013 [ scc.git] DEBUG [detached HEAD 146f9f8] merge master -Dorg -Ssuccess-only
2024-05-01 00:33:56,013 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-01 00:33:56,013 [ scc.repo] DEBUG ## PRs found:
2024-05-01 00:33:56,474 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-05-01 00:33:56,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-05-01 00:33:57,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-05-01 00:33:57,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-05-01 00:33:58,396 [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-05-01 00:33:58,890 [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-05-01 00:33:59,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-05-01 00:33:59,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-05-01 00:33:59,837 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-05-01 00:34:00,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-05-01 00:34:00,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-05-01 00:34:01,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-05-01 00:34:01,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-05-01 00:34:01,694 [ scc.repo] DEBUG ## Branches found:
2024-05-01 00:34:01,694 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-05-01 00:34:01,694 [ scc.git] DEBUG Get sha1 of %s
2024-05-01 00:34:01,695 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:34:01,700 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-01 00:34:01,705 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-01 00:34:01,705 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-01 00:34:01,710 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-01 00:34:01,716 [ scc.git] DEBUG Already up to date.
2024-05-01 00:34:01,716 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-05-01 00:34:02,177 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-05-01 00:34:02,177 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-05-01 00:34:02,182 [ scc.git] DEBUG ## Unique users: []
2024-05-01 00:34:02,182 [ scc.git] DEBUG Get sha1 of %s
2024-05-01 00:34:02,182 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:34:02,186 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-05-01 00:34:02,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:34:02,195 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-05-01 00:34:02,205 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-05-01 00:34:02,205 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-01 00:34:02,208 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-05-01 00:34:02,208 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-05-01 00:34:02,208 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-05-01 00:34:02,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:34:02,370 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-01 00:34:02,411 [ scc.git] DEBUG Get sha1 of %s
2024-05-01 00:34:02,412 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:34:02,416 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-01 00:34:02,462 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-01 00:34:02,469 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9692d0d310> has no local changes
2024-05-01 00:34:02,470 [ 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#48 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/48/)'
2024-05-01 00:34:02,480 [ scc.git] DEBUG [detached HEAD 397323d] merge master -Dorg -Ssuccess-only
2024-05-01 00:34:02,481 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-01 00:34:02,481 [ scc.repo] DEBUG ## PRs found:
2024-05-01 00:34:03,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-05-01 00:34:03,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/407 HTTP/1.1" 200 None
2024-05-01 00:34:04,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/407/comments HTTP/1.1" 200 None
2024-05-01 00:34:04,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/48ee525426aef7e8f8701c27d99ee24dbe13af02 HTTP/1.1" 200 None
2024-05-01 00:34:05,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/48ee525426aef7e8f8701c27d99ee24dbe13af02/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-01 00:34:05,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/48ee525426aef7e8f8701c27d99ee24dbe13af02/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-01 00:34:05,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/48ee525426aef7e8f8701c27d99ee24dbe13af02 HTTP/1.1" 200 None
2024-05-01 00:34:06,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/48ee525426aef7e8f8701c27d99ee24dbe13af02?per_page=1 HTTP/1.1" 200 None
2024-05-01 00:34:06,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/48ee525426aef7e8f8701c27d99ee24dbe13af02 HTTP/1.1" 200 None
2024-05-01 00:34:07,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/48ee525426aef7e8f8701c27d99ee24dbe13af02/status HTTP/1.1" 200 None
2024-05-01 00:34:07,576 [ scc.repo] DEBUG - PR 407 jburel 'Remove ref to ome channel for zeroc-ice'
2024-05-01 00:34:08,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-05-01 00:34:08,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-05-01 00:34:09,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-05-01 00:34:09,513 [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-05-01 00:34:09,994 [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-05-01 00:34:10,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-05-01 00:34:10,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-05-01 00:34:11,548 [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-05-01 00:34:12,046 [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-05-01 00:34:12,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-05-01 00:34:12,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-05-01 00:34:13,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-05-01 00:34:13,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-05-01 00:34:13,989 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-05-01 00:34:14,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-05-01 00:34:14,458 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-05-01 00:34:14,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378 HTTP/1.1" 200 None
2024-05-01 00:34:15,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378/comments HTTP/1.1" 200 None
2024-05-01 00:34:15,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-05-01 00:34:16,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-05-01 00:34:16,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-05-01 00:34:17,192 [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-05-01 00:34:17,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-05-01 00:34:18,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-05-01 00:34:18,096 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-05-01 00:34:18,573 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-05-01 00:34:19,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-05-01 00:34:19,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-05-01 00:34:20,011 [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-05-01 00:34:20,488 [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-05-01 00:34:20,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-05-01 00:34:21,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-05-01 00:34:21,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-05-01 00:34:22,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-05-01 00:34:22,252 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-05-01 00:34:22,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-05-01 00:34:23,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-05-01 00:34:23,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-05-01 00:34:24,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-05-01 00:34:24,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-05-01 00:34:25,439 [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-05-01 00:34:25,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-05-01 00:34:26,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-05-01 00:34:26,343 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-05-01 00:34:26,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-05-01 00:34:27,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-05-01 00:34:27,736 [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-05-01 00:34:28,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-05-01 00:34:28,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-05-01 00:34:28,662 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-05-01 00:34:29,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-05-01 00:34:29,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-05-01 00:34:30,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-05-01 00:34:30,616 [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-05-01 00:34:31,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-05-01 00:34:31,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-05-01 00:34:31,596 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-05-01 00:34:32,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-05-01 00:34:32,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-05-01 00:34:33,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-05-01 00:34:33,497 [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-05-01 00:34:33,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-05-01 00:34:34,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-05-01 00:34:34,355 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-05-01 00:34:34,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-05-01 00:34:35,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-05-01 00:34:35,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-05-01 00:34:36,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-05-01 00:34:36,279 [ scc.repo] DEBUG ## Branches found:
2024-05-01 00:34:36,279 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-05-01 00:34:36,279 [ scc.git] DEBUG Get sha1 of %s
2024-05-01 00:34:36,279 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:34:36,284 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-01 00:34:36,289 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-01 00:34:36,289 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-01 00:34:36,294 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-01 00:34:36,300 [ scc.git] DEBUG Already up to date.
2024-05-01 00:34:36,300 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-05-01 00:34:36,849 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-01 00:34:36,849 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-05-01 00:34:36,854 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-05-01 00:34:37,321 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-01 00:34:37,322 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-05-01 00:34:37,327 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-05-01 00:34:37,738 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-01 00:34:37,738 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-05-01 00:34:37,743 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-05-01 00:34:38,124 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-01 00:34:38,124 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-05-01 00:34:38,132 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-05-01 00:34:38,569 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-01 00:34:38,570 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-05-01 00:34:38,574 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-05-01 00:34:38,947 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-01 00:34:38,948 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-05-01 00:34:38,954 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-05-01 00:34:39,309 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-01 00:34:39,309 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-05-01 00:34:39,316 [ scc.git] DEBUG Calling 'git fetch origin pull/407/head'
2024-05-01 00:34:39,811 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-01 00:34:39,812 [ scc.git] DEBUG * branch refs/pull/407/head -> FETCH_HEAD
2024-05-01 00:34:39,817 [ scc.git] DEBUG ## Unique users: []
2024-05-01 00:34:39,817 [ scc.git] DEBUG Get sha1 of %s
2024-05-01 00:34:39,817 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:34:39,822 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-05-01 00:34:39,833 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:34:39,837 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-05-01 00:34:39,910 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-05-01 00:34:39,910 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-05-01 00:34:39,911 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-01 00:34:39,915 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-05-01 00:34:39,915 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-05-01 00:34:39,915 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-05-01 00:34:40,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:34:40,077 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-05-01 00:34:40,088 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:34:40,092 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-05-01 00:34:40,178 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-05-01 00:34:40,178 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-05-01 00:34:40,179 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-01 00:34:40,186 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-05-01 00:34:40,186 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-05-01 00:34:40,186 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-05-01 00:34:40,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:34:40,486 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-05-01 00:34:40,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:34:40,501 [ 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-05-01 00:34:40,561 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-05-01 00:34:40,562 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-01 00:34:40,565 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-05-01 00:34:40,566 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-05-01 00:34:40,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:34:40,888 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-05-01 00:34:40,900 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:34:40,904 [ 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-05-01 00:34:40,977 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-05-01 00:34:40,977 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-05-01 00:34:40,978 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-01 00:34:40,982 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-05-01 00:34:40,982 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-05-01 00:34:40,982 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-05-01 00:34:41,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:34:41,294 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-05-01 00:34:41,304 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:34:41,309 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-05-01 00:34:41,367 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-01 00:34:41,370 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-05-01 00:34:41,370 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-05-01 00:34:41,370 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-05-01 00:34:41,370 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-05-01 00:34:41,370 [ scc.git] DEBUG create mode 100644 connect.py
2024-05-01 00:34:41,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:34:41,708 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-05-01 00:34:41,719 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:34:41,723 [ 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-05-01 00:34:41,787 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-05-01 00:34:41,789 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-01 00:34:41,792 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-05-01 00:34:41,792 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-01 00:34:42,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:34:42,136 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-05-01 00:34:42,147 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:34:42,152 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-05-01 00:34:42,189 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-05-01 00:34:42,190 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-01 00:34:42,194 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-05-01 00:34:42,194 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-05-01 00:34:42,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:34:42,543 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...48ee525426aef7e8f8701c27d99ee24dbe13af02'
2024-05-01 00:34:42,554 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:34:42,558 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 407 (Remove ref to ome channel for zeroc-ice) 48ee525426aef7e8f8701c27d99ee24dbe13af02'
2024-05-01 00:34:42,576 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-01 00:34:42,579 [ scc.git] DEBUG .github/workflows/workflow.yml | 2 +-
2024-05-01 00:34:42,579 [ scc.git] DEBUG README.rst | 14 +++++++-------
2024-05-01 00:34:42,579 [ scc.git] DEBUG 2 files changed, 8 insertions(+), 8 deletions(-)
2024-05-01 00:34:42,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:34:42,990 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-01 00:34:43,032 [ scc.git] DEBUG Get sha1 of %s
2024-05-01 00:34:43,033 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:34:43,041 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-01 00:34:43,079 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-01 00:34:43,086 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9691c32820> has no local changes
2024-05-01 00:34:43,087 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-py
Excluded PRs:
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 407 jburel 'Remove ref to ome channel for zeroc-ice'
Generated by OMERO-python-superbuild-push#48 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/48/)'
2024-05-01 00:34:43,096 [ scc.git] DEBUG [detached HEAD cb6bfec1] merge master -Dorg -Ssuccess-only
2024-05-01 00:34:43,097 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-01 00:34:43,097 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-01 00:34:43,097 [ scc.repo] DEBUG ## PRs found:
2024-05-01 00:34:43,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-01 00:34:44,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-01 00:34:44,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-01 00:34:45,030 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-01 00:34:45,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-01 00:34:45,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-01 00:34:46,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-01 00:34:47,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-01 00:34:47,646 [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-05-01 00:34:48,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-01 00:34:48,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-05-01 00:34:48,551 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-01 00:34:49,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-01 00:34:49,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-01 00:34:50,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-01 00:34:50,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-01 00:34:50,482 [ scc.repo] DEBUG ## Branches found:
2024-05-01 00:34:50,482 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-05-01 00:34:50,482 [ scc.git] DEBUG Get sha1 of %s
2024-05-01 00:34:50,482 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:34:50,486 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-01 00:34:50,490 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-01 00:34:50,490 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-01 00:34:50,495 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-01 00:34:50,499 [ scc.git] DEBUG Already up to date.
2024-05-01 00:34:50,500 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-01 00:34:50,942 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-05-01 00:34:50,942 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-01 00:34:50,947 [ scc.git] DEBUG ## Unique users: []
2024-05-01 00:34:50,947 [ scc.git] DEBUG Get sha1 of %s
2024-05-01 00:34:50,947 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:34:50,951 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-01 00:34:50,957 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:34:50,961 [ 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-05-01 00:34:51,008 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-01 00:34:51,008 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-01 00:34:51,009 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-01 00:34:51,009 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-01 00:34:51,014 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-01 00:34:51,020 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-01 00:34:51,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:34:51,186 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-01 00:34:51,192 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-01 00:34:51,198 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#48](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/48/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/48/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-01 00:34:51,203 [ scc.config] DEBUG Found github.token
2024-05-01 00:34:51,203 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-01 00:34:51,203 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-01 00:34:51,244 [ scc.git] DEBUG Get sha1 of %s
2024-05-01 00:34:51,244 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:34:51,249 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-01 00:34:51,288 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-01 00:34:51,294 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9691c39670> has no local changes
2024-05-01 00:34:51,294 [ 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#48 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/48/)'
2024-05-01 00:34:51,303 [ scc.git] DEBUG [detached HEAD cc98f7a] merge master -Dorg -Ssuccess-only
2024-05-01 00:34:51,303 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-01 00:34:51,303 [ scc.repo] DEBUG ## PRs found:
2024-05-01 00:34:51,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-05-01 00:34:52,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/553 HTTP/1.1" 200 None
2024-05-01 00:34:52,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549 HTTP/1.1" 200 None
2024-05-01 00:34:53,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549/comments HTTP/1.1" 200 None
2024-05-01 00:34:53,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ade7fa1b5839e9b17878c38efd4f6404a5857712 HTTP/1.1" 200 None
2024-05-01 00:34:54,186 [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-05-01 00:34:54,667 [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-05-01 00:34:55,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543 HTTP/1.1" 200 None
2024-05-01 00:34:55,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543/comments HTTP/1.1" 200 None
2024-05-01 00:34:56,081 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-05-01 00:34:56,559 [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-05-01 00:34:57,021 [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-05-01 00:34:57,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-05-01 00:34:57,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4?per_page=1 HTTP/1.1" 200 None
2024-05-01 00:34:58,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-05-01 00:34:58,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/status HTTP/1.1" 200 None
2024-05-01 00:34:58,798 [ scc.repo] DEBUG - PR 543 knabar 'Block UI for some long running tasks'
2024-05-01 00:34:59,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542 HTTP/1.1" 200 None
2024-05-01 00:34:59,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542/comments HTTP/1.1" 200 None
2024-05-01 00:34:59,800 [ scc.repo] DEBUG # ... Include label: include
2024-05-01 00:35:00,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-05-01 00:35:00,832 [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-05-01 00:35:01,322 [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-05-01 00:35:01,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-05-01 00:35:02,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/977f7b65169e6dee479197a9156993bbadd2d2e2?per_page=1 HTTP/1.1" 200 None
2024-05-01 00:35:02,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-05-01 00:35:03,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/status HTTP/1.1" 200 None
2024-05-01 00:35:03,074 [ scc.repo] DEBUG - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-05-01 00:35:03,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-05-01 00:35:03,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-05-01 00:35:04,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-05-01 00:35:04,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-05-01 00:35:05,427 [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-05-01 00:35:05,910 [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-05-01 00:35:06,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-05-01 00:35:06,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-05-01 00:35:07,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-05-01 00:35:07,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-05-01 00:35:07,701 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-05-01 00:35:08,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/533 HTTP/1.1" 200 None
2024-05-01 00:35:08,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-05-01 00:35:09,145 [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-05-01 00:35:09,644 [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-05-01 00:35:10,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-05-01 00:35:10,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/e335980be1e7197826687f6c322a60c61b4aa545?per_page=1 HTTP/1.1" 200 None
2024-05-01 00:35:10,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-05-01 00:35:11,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545/status HTTP/1.1" 200 None
2024-05-01 00:35:11,419 [ scc.repo] DEBUG - PR 533 jburel 'use conda-forge channel'
2024-05-01 00:35:11,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-05-01 00:35:12,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-05-01 00:35:12,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-05-01 00:35:13,318 [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-05-01 00:35:13,799 [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-05-01 00:35:14,282 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-05-01 00:35:14,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-05-01 00:35:15,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-05-01 00:35:15,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-05-01 00:35:15,604 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-05-01 00:35:16,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-05-01 00:35:16,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-05-01 00:35:17,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615 HTTP/1.1" 200 None
2024-05-01 00:35:17,545 [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-05-01 00:35:18,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615 HTTP/1.1" 200 None
2024-05-01 00:35:18,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/219d9e721304a4c46b4d73ef9ff3777549d69615?per_page=1 HTTP/1.1" 200 2
2024-05-01 00:35:18,436 [ scc.repo] DEBUG - PR 168 stick 'Changes to nginx @maintenance handler'
2024-05-01 00:35:18,436 [ scc.repo] DEBUG ## Branches found:
2024-05-01 00:35:18,436 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-05-01 00:35:18,437 [ scc.git] DEBUG Get sha1 of %s
2024-05-01 00:35:18,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:35:18,441 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-01 00:35:18,446 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-01 00:35:18,446 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-01 00:35:18,452 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-01 00:35:18,457 [ scc.git] DEBUG Already up to date.
2024-05-01 00:35:18,457 [ scc.git] DEBUG Calling 'git fetch origin pull/168/head'
2024-05-01 00:35:19,042 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-01 00:35:19,042 [ scc.git] DEBUG * branch refs/pull/168/head -> FETCH_HEAD
2024-05-01 00:35:19,047 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-05-01 00:35:19,477 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-01 00:35:19,477 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-05-01 00:35:19,483 [ scc.git] DEBUG Calling 'git fetch origin pull/533/head'
2024-05-01 00:35:19,863 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-01 00:35:19,863 [ scc.git] DEBUG * branch refs/pull/533/head -> FETCH_HEAD
2024-05-01 00:35:19,868 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-05-01 00:35:20,290 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-01 00:35:20,290 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-05-01 00:35:20,295 [ scc.git] DEBUG Calling 'git fetch origin pull/542/head'
2024-05-01 00:35:21,000 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-01 00:35:21,000 [ scc.git] DEBUG * branch refs/pull/542/head -> FETCH_HEAD
2024-05-01 00:35:21,006 [ scc.git] DEBUG Calling 'git fetch origin pull/543/head'
2024-05-01 00:35:21,775 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-01 00:35:21,776 [ scc.git] DEBUG * branch refs/pull/543/head -> FETCH_HEAD
2024-05-01 00:35:21,781 [ scc.git] DEBUG ## Unique users: []
2024-05-01 00:35:21,781 [ scc.git] DEBUG Get sha1 of %s
2024-05-01 00:35:21,781 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:35:21,786 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-05-01 00:35:21,801 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:35:21,807 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 168 (Changes to nginx @maintenance handler) 219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-05-01 00:35:21,896 [ scc.git] DEBUG Auto-merging test/unit/test_web.py
2024-05-01 00:35:21,897 [ scc.git] DEBUG CONFLICT (content): Merge conflict in test/unit/test_web.py
2024-05-01 00:35:21,897 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-01 00:35:21,898 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-01 00:35:21,905 [ scc.git] DEBUG Calling 'git reset --hard e1b1355ebd4f9de8b855dd2c55f59d86c061a81b'
2024-05-01 00:35:21,916 [ scc.git] DEBUG HEAD is now at e1b1355eb Merge pull request #540 from will-moore/django_template_context_processors_request
2024-05-01 00:35:22,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:35:22,077 [ scc.git] DEBUG Calling 'git merge-base e1b1355ebd4f9de8b855dd2c55f59d86c061a81b 219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-05-01 00:35:22,092 [ scc.git] DEBUG Calling 'git diff --name-only 632d14a9cab5319c6b1bd9190d441a95e457103b..e1b1355ebd4f9de8b855dd2c55f59d86c061a81b'
2024-05-01 00:35:22,155 [ scc.git] INFO - PR 168 stick 'Changes to nginx @maintenance handler'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#48](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/48/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/48/consoleText) for more details.
Possible conflicts:
- Upstream changes
- test/unit/test_web.py
--conflicts
2024-05-01 00:35:22,180 [ scc.config] DEBUG Found github.token
2024-05-01 00:35:22,180 [ scc.git] DEBUG Not adding comment to issue #168, already --conflicts.
2024-05-01 00:35:22,180 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-05-01 00:35:22,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:35:22,193 [ 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-05-01 00:35:22,266 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-05-01 00:35:22,266 [ scc.git] DEBUG Auto-merging setup.py
2024-05-01 00:35:22,267 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-01 00:35:22,271 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-05-01 00:35:22,271 [ scc.git] DEBUG setup.py | 1 +
2024-05-01 00:35:22,271 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-05-01 00:35:22,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:35:22,491 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e335980be1e7197826687f6c322a60c61b4aa545'
2024-05-01 00:35:22,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:35:22,501 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 533 (use conda-forge channel) e335980be1e7197826687f6c322a60c61b4aa545'
2024-05-01 00:35:22,518 [ scc.git] DEBUG Auto-merging README.rst
2024-05-01 00:35:22,519 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-01 00:35:22,522 [ scc.git] DEBUG README.rst | 3 +--
2024-05-01 00:35:22,522 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 2 deletions(-)
2024-05-01 00:35:22,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:35:22,898 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-05-01 00:35:22,904 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:35:22,909 [ 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-05-01 00:35:22,957 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-05-01 00:35:22,957 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-05-01 00:35:22,958 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-01 00:35:22,962 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-05-01 00:35:22,962 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-05-01 00:35:22,962 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-05-01 00:35:23,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:35:23,309 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...977f7b65169e6dee479197a9156993bbadd2d2e2'
2024-05-01 00:35:23,316 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:35:23,321 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 542 (PlateAcquisition filtering with plate display) 977f7b65169e6dee479197a9156993bbadd2d2e2'
2024-05-01 00:35:23,391 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py
2024-05-01 00:35:23,392 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-01 00:35:23,399 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 13 +++-------
2024-05-01 00:35:23,399 [ scc.git] DEBUG .../webclient/templates/webclient/data/plate.html | 10 ++++----
2024-05-01 00:35:23,399 [ scc.git] DEBUG omeroweb/webclient/views.py | 17 ++++++++++++
2024-05-01 00:35:23,399 [ scc.git] DEBUG omeroweb/webgateway/plategrid.py | 30 +++++++++++++++++++---
2024-05-01 00:35:23,399 [ scc.git] DEBUG .../static/webgateway/js/ome.plateview.js | 16 +++++++-----
2024-05-01 00:35:23,399 [ scc.git] DEBUG omeroweb/webgateway/urls.py | 2 +-
2024-05-01 00:35:23,399 [ scc.git] DEBUG omeroweb/webgateway/views.py | 16 ++++++++++--
2024-05-01 00:35:23,399 [ scc.git] DEBUG 7 files changed, 78 insertions(+), 26 deletions(-)
2024-05-01 00:35:23,712 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:35:23,713 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4'
2024-05-01 00:35:23,721 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:35:23,725 [ 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-05-01 00:35:23,758 [ scc.git] DEBUG Auto-merging omeroweb/webclient/templates/webclient/data/includes/center_plugin.thumbs.js.html
2024-05-01 00:35:23,760 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-01 00:35:23,765 [ scc.git] DEBUG .../webclient/javascript/ome.progress_overlay.js | 60 ++++++
2024-05-01 00:35:23,766 [ scc.git] DEBUG .../webclient/javascript/ome.webclient.actions.js | 112 +++++++-----
2024-05-01 00:35:23,766 [ scc.git] DEBUG .../webclient/annotations/metadata_preview.html | 51 +++---
2024-05-01 00:35:23,766 [ scc.git] DEBUG .../webclient/templates/webclient/base/base.html | 1 +
2024-05-01 00:35:23,766 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 2 +-
2024-05-01 00:35:23,766 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 16 +-
2024-05-01 00:35:23,766 [ scc.git] DEBUG .../static/webgateway/js/ome.gs_utils.js | 201 ---------------------
2024-05-01 00:35:23,766 [ scc.git] DEBUG .../webgateway/static/webgateway/js/ome.popup.js | 1 -
2024-05-01 00:35:23,766 [ scc.git] DEBUG .../webgateway/static/webgateway/js/omero_image.js | 35 ++--
2024-05-01 00:35:23,766 [ scc.git] DEBUG 9 files changed, 186 insertions(+), 293 deletions(-)
2024-05-01 00:35:23,766 [ scc.git] DEBUG create mode 100644 omeroweb/webclient/static/webclient/javascript/ome.progress_overlay.js
2024-05-01 00:35:24,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:35:24,121 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-01 00:35:24,161 [ scc.git] DEBUG Get sha1 of %s
2024-05-01 00:35:24,162 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-01 00:35:24,167 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-01 00:35:24,206 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-01 00:35:24,218 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9691c30af0> has no local changes
2024-05-01 00:35:24,218 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- 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 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#48 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/48/)'
2024-05-01 00:35:24,233 [ scc.git] DEBUG [detached HEAD 31ce784ad] merge master -Dorg -Ssuccess-only
2024-05-01 00:35:24,234 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-01 00:35:24,234 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-01 00:35:24,285 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-05-01 00:35:24,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:35:24,551 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-05-01 00:35:24,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:35:24,964 [ scc.config] DEBUG Found submodule.omero-py.url
2024-05-01 00:35:25,360 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:35:25,373 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-05-01 00:35:25,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:35:25,782 [ scc.config] DEBUG Found submodule.omero-web.url
2024-05-01 00:35:26,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-01 00:35:26,182 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-01 00:35:26,209 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f9692f4d430> has local changes
2024-05-01 00:35:26,210 [ 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'
- PR 407 jburel 'Remove ref to ome channel for zeroc-ice'
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 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- 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 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#48 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/48/)'
2024-05-01 00:35:26,221 [ scc.git] DEBUG [detached HEAD eee0d7b] merge master -Dorg -Ssuccess-only
2024-05-01 00:35:26,221 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-05-01 00:35:26,221 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-05-01 00:35:26,221 [ scc.merge] INFO Already up to date.
2024-05-01 00:35:26,221 [ scc.merge] INFO
2024-05-01 00:35:26,221 [ scc.merge] INFO
2024-05-01 00:35:26,221 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-05-01 00:35:26,221 [ scc.merge] INFO Already up to date.
2024-05-01 00:35:26,221 [ scc.merge] INFO
2024-05-01 00:35:26,221 [ scc.merge] INFO Merged PRs:
2024-05-01 00:35:26,221 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-05-01 00:35:26,221 [ scc.merge] INFO - PR 23 sbesson 'Remove python-future compatibility code'
2024-05-01 00:35:26,221 [ scc.merge] INFO
2024-05-01 00:35:26,221 [ scc.merge] INFO Repository: ome/omero-marshal
2024-05-01 00:35:26,221 [ scc.merge] INFO Excluded PRs:
2024-05-01 00:35:26,221 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-05-01 00:35:26,221 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-05-01 00:35:26,221 [ scc.merge] INFO Already up to date.
2024-05-01 00:35:26,221 [ scc.merge] INFO
2024-05-01 00:35:26,222 [ scc.merge] INFO Merged PRs:
2024-05-01 00:35:26,222 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-05-01 00:35:26,222 [ scc.merge] INFO
2024-05-01 00:35:26,222 [ scc.merge] INFO Repository: ome/omero-py
2024-05-01 00:35:26,222 [ scc.merge] INFO Excluded PRs:
2024-05-01 00:35:26,222 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-05-01 00:35:26,222 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-05-01 00:35:26,222 [ scc.merge] INFO - PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
2024-05-01 00:35:26,222 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-05-01 00:35:26,222 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-05-01 00:35:26,222 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-05-01 00:35:26,222 [ scc.merge] INFO Already up to date.
2024-05-01 00:35:26,222 [ scc.merge] INFO
2024-05-01 00:35:26,222 [ scc.merge] INFO Merged PRs:
2024-05-01 00:35:26,222 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-05-01 00:35:26,222 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-05-01 00:35:26,222 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-05-01 00:35:26,222 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-05-01 00:35:26,222 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-05-01 00:35:26,222 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-05-01 00:35:26,222 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-05-01 00:35:26,222 [ scc.merge] INFO - PR 407 jburel 'Remove ref to ome channel for zeroc-ice'
2024-05-01 00:35:26,222 [ scc.merge] INFO
2024-05-01 00:35:26,222 [ scc.merge] INFO Repository: ome/omero-scripts
2024-05-01 00:35:26,222 [ scc.merge] INFO Excluded PRs:
2024-05-01 00:35:26,222 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-01 00:35:26,222 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-01 00:35:26,222 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-01 00:35:26,222 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-01 00:35:26,222 [ scc.merge] INFO Already up to date.
2024-05-01 00:35:26,222 [ scc.merge] INFO
2024-05-01 00:35:26,222 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-01 00:35:26,222 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-01 00:35:26,222 [ scc.merge] INFO
2024-05-01 00:35:26,222 [ scc.merge] INFO Repository: ome/omero-web
2024-05-01 00:35:26,222 [ scc.merge] INFO Excluded PRs:
2024-05-01 00:35:26,222 [ scc.merge] INFO - PR 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-01 00:35:26,222 [ scc.merge] INFO - PR 549 knabar 'Remove webgateway cache' (status: failure)
2024-05-01 00:35:26,223 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-05-01 00:35:26,223 [ scc.merge] INFO Already up to date.
2024-05-01 00:35:26,223 [ scc.merge] INFO
2024-05-01 00:35:26,223 [ scc.merge] INFO Merged PRs:
2024-05-01 00:35:26,223 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-05-01 00:35:26,223 [ scc.merge] INFO - PR 533 jburel 'use conda-forge channel'
2024-05-01 00:35:26,223 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-05-01 00:35:26,223 [ scc.merge] INFO - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-05-01 00:35:26,223 [ scc.merge] INFO - PR 543 knabar 'Block UI for some long running tasks'
2024-05-01 00:35:26,223 [ scc.merge] INFO
2024-05-01 00:35:26,223 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-01 00:35:26,223 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler'
2024-05-01 00:35:26,223 [ scc.merge] INFO
2024-05-01 00:35:26,223 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-01 00:35:26,223 [ scc.git] DEBUG Calling 'git remote'
2024-05-01 00:35:26,227 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-05-01 00:35:26,227 [ scc.git] DEBUG Calling 'git remote'
2024-05-01 00:35:26,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-01 00:35:26,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-05-01 00:35:26,232 [ scc.git] DEBUG Calling 'git remote'
2024-05-01 00:35:26,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-01 00:35:26,237 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-05-01 00:35:26,237 [ scc.git] DEBUG Calling 'git remote'
2024-05-01 00:35:26,241 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-01 00:35:26,241 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-05-01 00:35:26,241 [ scc.git] DEBUG Calling 'git remote'
2024-05-01 00:35:26,244 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-01 00:35:26,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-05-01 00:35:26,245 [ scc.git] DEBUG Calling 'git remote'
2024-05-01 00:35:26,249 [ 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-05-01 00:35:56,526 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/4be69ed6/images/svgs/logo.svg){kind=logo}
