Console Output
+ export BASE_REPO=omero-python-superbuild.git
+ BASE_REPO=omero-python-superbuild.git
+ export BASE_BRANCH=master
+ BASE_BRANCH=master
+ export VERSION_LOG=/home/omero/workspace/OMERO-python-superbuild-push/build/version.tsv
+ VERSION_LOG=/home/omero/workspace/OMERO-python-superbuild-push/build/version.tsv
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ '[' '!' nondestructive = nondestructive ']'
++ VIRTUAL_ENV=/home/omero/workspace/OMERO-python-superbuild-push/build/venv
++ export VIRTUAL_ENV
++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ PATH=/home/omero/workspace/OMERO-python-superbuild-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ export PATH
++ '[' -n '' ']'
++ '[' -z '' ']'
++ _OLD_VIRTUAL_PS1=
++ PS1='(venv) '
++ export PS1
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
+ '[' merge_ci '!=' null ']'
+ export PUSH_BRANCH=merge_ci
+ PUSH_BRANCH=merge_ci
+ '[' null '!=' null ']'
+ export STATUS=success-only 'MERGE_OPTIONS=-vvv --no-ask --reset --comment'
+ STATUS=success-only
+ MERGE_OPTIONS='-vvv --no-ask --reset --comment'
+ bash build/build-infra-master/recursive-merge
Merge base repository (no submodule updates)
2024-04-27 00:34:15,216 [ scc.config] DEBUG Found github.token
2024-04-27 00:34:15,221 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-04-27 00:34:15,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:34:15,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:34:16,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-04-27 00:34:16,288 [ scc.gh] DEBUG 4308 remaining from 5000 (Reset at 01:04
2024-04-27 00:34:16,289 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-27 00:34:16,293 [ scc.git] DEBUG Check current status
2024-04-27 00:34:16,293 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-27 00:34:16,298 [ scc.git] DEBUG 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-04-27 00:34:16,298 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-27 00:34:16,347 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-04-27 00:34:16,351 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-04-27 00:34:16,355 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-04-27 00:34:16,360 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-04-27 00:34:16,504 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-04-27 00:34:16,509 [ scc.config] DEBUG Found remote.origin.url
2024-04-27 00:34:16,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-04-27 00:34:17,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-27 00:34:17,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-27 00:34:18,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-27 00:34:18,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-27 00:34:18,477 [ scc.git] DEBUG Resetting...
2024-04-27 00:34:18,478 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-04-27 00:34:18,484 [ scc.git] DEBUG HEAD is now at 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-04-27 00:34:18,484 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-04-27 00:34:18,547 [ scc.git] DEBUG Check current status
2024-04-27 00:34:18,547 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-27 00:34:18,552 [ scc.git] DEBUG 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-04-27 00:34:18,552 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-27 00:34:18,602 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-04-27 00:34:18,606 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-04-27 00:34:18,610 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-04-27 00:34:18,616 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-04-27 00:34:18,620 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-04-27 00:34:18,621 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-04-27 00:34:18,621 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-04-27 00:34:18,621 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-04-27 00:34:18,621 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-04-27 00:34:18,621 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-04-27 00:34:18,622 [ scc.repo] DEBUG ## PRs found:
2024-04-27 00:34:18,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-04-27 00:34:18,916 [ scc.repo] DEBUG ## Branches found:
2024-04-27 00:34:18,916 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:34:18,916 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:34:18,922 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-27 00:34:18,928 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-27 00:34:18,928 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-27 00:34:18,934 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-27 00:34:18,941 [ scc.git] DEBUG Already up to date.
2024-04-27 00:34:18,941 [ scc.git] DEBUG ## Unique users: []
2024-04-27 00:34:18,941 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:34:18,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:34:18,946 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:34:18,997 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:34:18,998 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:34:19,003 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:34:19,184 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8c0a845e80> has no local changes
2024-04-27 00:34:19,185 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/44/)'
2024-04-27 00:34:19,218 [ scc.git] DEBUG [detached HEAD 7335ead] merge master -Dorg -Snone
2024-04-27 00:34:19,218 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-04-27 00:34:19,218 [ scc.merge] INFO Already up to date.
2024-04-27 00:34:19,218 [ scc.merge] INFO
2024-04-27 00:34:19,219 [ scc.merge] INFO
2024-04-27 00:34:19,219 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-27 00:34:19,219 [ scc.git] DEBUG Calling 'git remote'
Synchronizing submodule url for 'omero-dropbox'
Synchronizing submodule url for 'omero-marshal'
Synchronizing submodule url for 'omero-py'
Synchronizing submodule url for 'omero-scripts'
Synchronizing submodule url for 'omero-web'
Merge all submodules using repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-04-27 00:34:21,851 [ scc.config] DEBUG Found github.token
2024-04-27 00:34:21,854 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-04-27 00:34:22,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:34:22,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:34:22,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-04-27 00:34:22,937 [ scc.gh] DEBUG 4300 remaining from 5000 (Reset at 01:04
2024-04-27 00:34:22,938 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-27 00:34:22,942 [ scc.git] DEBUG Check current status
2024-04-27 00:34:22,942 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-27 00:34:22,947 [ scc.git] DEBUG 7335ead merge master -Dorg -Snone
2024-04-27 00:34:22,947 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-27 00:34:22,996 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-04-27 00:34:23,000 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-04-27 00:34:23,004 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-04-27 00:34:23,010 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-04-27 00:34:23,014 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-04-27 00:34:23,020 [ scc.config] DEBUG Found remote.origin.url
2024-04-27 00:34:23,020 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-04-27 00:34:23,022 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-04-27 00:34:23,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-04-27 00:34:23,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-27 00:34:24,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-27 00:34:24,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-27 00:34:25,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-27 00:34:25,081 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:34:25,143 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-04-27 00:34:25,144 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-27 00:34:25,148 [ scc.git] DEBUG Check current status
2024-04-27 00:34:25,148 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-27 00:34:25,152 [ scc.git] DEBUG 5863350 Merge pull request #22 from sbesson/python311
2024-04-27 00:34:25,153 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-27 00:34:25,205 [ scc.config] DEBUG Found remote.origin.url
2024-04-27 00:34:25,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-04-27 00:34:25,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-27 00:34:26,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-27 00:34:26,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-27 00:34:27,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-27 00:34:27,286 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:34:27,335 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-27 00:34:27,336 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-04-27 00:34:27,336 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-27 00:34:27,341 [ scc.git] DEBUG Check current status
2024-04-27 00:34:27,341 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-27 00:34:27,346 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-04-27 00:34:27,346 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-27 00:34:27,394 [ scc.config] DEBUG Found remote.origin.url
2024-04-27 00:34:27,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-04-27 00:34:28,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-27 00:34:28,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-27 00:34:29,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-27 00:34:29,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-27 00:34:29,488 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:34:29,532 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-27 00:34:29,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-04-27 00:34:29,534 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-27 00:34:29,538 [ scc.git] DEBUG Check current status
2024-04-27 00:34:29,538 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-27 00:34:29,547 [ scc.git] DEBUG 52d9a6f4 Bump version: 5.19.2 → 5.19.3.dev0
2024-04-27 00:34:29,548 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-27 00:34:29,590 [ scc.config] DEBUG Found remote.origin.url
2024-04-27 00:34:29,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-04-27 00:34:30,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-27 00:34:30,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-27 00:34:31,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-27 00:34:31,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-27 00:34:31,696 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:34:31,741 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-27 00:34:31,742 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-04-27 00:34:31,742 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-27 00:34:31,746 [ scc.git] DEBUG Check current status
2024-04-27 00:34:31,747 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-27 00:34:31,758 [ scc.git] DEBUG 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-04-27 00:34:31,759 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-27 00:34:31,809 [ scc.config] DEBUG Found remote.origin.url
2024-04-27 00:34:31,810 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-04-27 00:34:32,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-04-27 00:34:32,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-27 00:34:33,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-27 00:34:33,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-27 00:34:33,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-27 00:34:33,926 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:34:33,974 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-27 00:34:33,975 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-04-27 00:34:33,975 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-27 00:34:33,980 [ scc.git] DEBUG Check current status
2024-04-27 00:34:33,980 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-27 00:34:34,003 [ scc.git] DEBUG e1b1355eb Merge pull request #540 from will-moore/django_template_context_processors_request
2024-04-27 00:34:34,004 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-27 00:34:34,052 [ scc.config] DEBUG Found remote.origin.url
2024-04-27 00:34:34,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-04-27 00:34:34,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-27 00:34:35,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-27 00:34:35,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-27 00:34:36,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-27 00:34:36,110 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:34:36,158 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-27 00:34:36,158 [ scc.git] DEBUG Resetting...
2024-04-27 00:34:36,159 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-04-27 00:34:36,165 [ scc.git] DEBUG HEAD is now at 7335ead merge master -Dorg -Snone
2024-04-27 00:34:36,165 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-04-27 00:34:36,228 [ scc.git] DEBUG Check current status
2024-04-27 00:34:36,228 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-27 00:34:36,233 [ scc.git] DEBUG 7335ead merge master -Dorg -Snone
2024-04-27 00:34:36,233 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-27 00:34:36,281 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-04-27 00:34:36,285 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-04-27 00:34:36,288 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-04-27 00:34:36,292 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-04-27 00:34:36,297 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-04-27 00:34:36,298 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-04-27 00:34:36,298 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-04-27 00:34:36,298 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-04-27 00:34:36,298 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-04-27 00:34:36,298 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-04-27 00:34:36,298 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-04-27 00:34:36,298 [ scc.repo] DEBUG ## PRs found:
2024-04-27 00:34:36,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-04-27 00:34:36,544 [ scc.repo] DEBUG ## Branches found:
2024-04-27 00:34:36,544 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:34:36,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:34:36,550 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-27 00:34:36,554 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-27 00:34:36,554 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-27 00:34:36,560 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-27 00:34:36,564 [ scc.git] DEBUG Already up to date.
2024-04-27 00:34:36,564 [ scc.git] DEBUG ## Unique users: []
2024-04-27 00:34:36,564 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:34:36,564 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:34:36,569 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:34:36,616 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:34:36,616 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:34:36,621 [ scc.repo] DEBUG ## PRs found:
2024-04-27 00:34:37,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-04-27 00:34:37,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23 HTTP/1.1" 200 None
2024-04-27 00:34:38,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23/comments HTTP/1.1" 200 None
2024-04-27 00:34:38,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None
2024-04-27 00:34:39,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-27 00:34:39,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-27 00:34:40,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None
2024-04-27 00:34:40,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8?per_page=1 HTTP/1.1" 200 2
2024-04-27 00:34:40,495 [ scc.repo] DEBUG - PR 23 sbesson 'Remove python-future compatibility code'
2024-04-27 00:34:40,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-04-27 00:34:41,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-04-27 00:34:41,935 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-04-27 00:34:42,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-27 00:34:42,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-04-27 00:34:43,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-04-27 00:34:43,309 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-04-27 00:34:43,309 [ scc.repo] DEBUG ## Branches found:
2024-04-27 00:34:43,309 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-04-27 00:34:43,309 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:34:43,310 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:34:43,315 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-27 00:34:43,320 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-27 00:34:43,320 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-27 00:34:43,326 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-27 00:34:43,331 [ scc.git] DEBUG Already up to date.
2024-04-27 00:34:43,332 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-04-27 00:34:43,808 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-04-27 00:34:43,808 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-04-27 00:34:43,819 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head'
2024-04-27 00:34:44,236 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-04-27 00:34:44,237 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD
2024-04-27 00:34:44,246 [ scc.git] DEBUG ## Unique users: []
2024-04-27 00:34:44,247 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:34:44,247 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:34:44,254 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-04-27 00:34:44,260 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:34:44,266 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-04-27 00:34:44,344 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:34:44,349 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-04-27 00:34:44,349 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-04-27 00:34:44,349 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-04-27 00:34:44,351 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-04-27 00:34:44,351 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-04-27 00:34:44,351 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-04-27 00:34:44,352 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-04-27 00:34:44,352 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-04-27 00:34:44,352 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-04-27 00:34:44,352 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-04-27 00:34:44,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:34:44,494 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8'
2024-04-27 00:34:44,500 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:34:44,505 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 23 (Remove python-future compatibility code) 9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8'
2024-04-27 00:34:44,602 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-04-27 00:34:44,602 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-04-27 00:34:44,602 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-04-27 00:34:44,602 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-04-27 00:34:44,602 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-04-27 00:34:44,602 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-04-27 00:34:44,603 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-04-27 00:34:44,603 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-04-27 00:34:44,603 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-04-27 00:34:44,616 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:34:44,624 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-04-27 00:34:44,624 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++--
2024-04-27 00:34:44,624 [ scc.git] DEBUG .github/workflows/tox.yml | 5 ++--
2024-04-27 00:34:44,624 [ scc.git] DEBUG Dockerfile | 32 ----------------------
2024-04-27 00:34:44,624 [ scc.git] DEBUG setup.py | 2 +-
2024-04-27 00:34:44,624 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 1 -
2024-04-27 00:34:44,624 [ scc.git] DEBUG src/fsDirectory.py | 8 +-----
2024-04-27 00:34:44,624 [ scc.git] DEBUG src/fsDropBox.py | 8 +-----
2024-04-27 00:34:44,624 [ scc.git] DEBUG src/fsDropBoxMonitorClient.py | 11 +-------
2024-04-27 00:34:44,624 [ scc.git] DEBUG src/fsFileServer.py | 12 ++-------
2024-04-27 00:34:44,625 [ scc.git] DEBUG src/fsLists.py | 2 --
2024-04-27 00:34:44,625 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 9 +------
2024-04-27 00:34:44,625 [ scc.git] DEBUG src/fsMonitor.py | 2 --
2024-04-27 00:34:44,625 [ scc.git] DEBUG src/fsMonitorServer.py | 8 +++---
2024-04-27 00:34:44,625 [ scc.git] DEBUG src/fsNotificationScheduler.py | 3 ---
2024-04-27 00:34:44,625 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 21 +++++----------
2024-04-27 00:34:44,625 [ scc.git] DEBUG src/fsUtil.py | 9 +++----
2024-04-27 00:34:44,625 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 8 +-----
2024-04-27 00:34:44,625 [ scc.git] DEBUG test/conftest.py | 2 --
2024-04-27 00:34:44,625 [ scc.git] DEBUG test/drivers.py | 17 +++---------
2024-04-27 00:34:44,625 [ scc.git] DEBUG test/unit/test_drivers.py | 55 ++++++++++++++++----------------------
2024-04-27 00:34:44,625 [ scc.git] DEBUG test/unit/test_monitor.py | 2 --
2024-04-27 00:34:44,625 [ scc.git] DEBUG test/unit/test_replay.py | 8 +-----
2024-04-27 00:34:44,625 [ scc.git] DEBUG test/unit/test_state.py | 1 -
2024-04-27 00:34:44,625 [ scc.git] DEBUG tox.ini | 3 ++-
2024-04-27 00:34:44,625 [ scc.git] DEBUG 25 files changed, 59 insertions(+), 178 deletions(-)
2024-04-27 00:34:44,625 [ scc.git] DEBUG delete mode 100644 Dockerfile
2024-04-27 00:34:44,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:34:44,888 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:34:44,944 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:34:44,944 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:34:44,948 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:34:44,994 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:34:45,001 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc6585863d0> has no local changes
2024-04-27 00:34:45,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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/44/)'
2024-04-27 00:34:45,011 [ scc.git] DEBUG [detached HEAD 42f81d8] merge master -Dorg -Ssuccess-only
2024-04-27 00:34:45,011 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-27 00:34:45,012 [ scc.repo] DEBUG ## PRs found:
2024-04-27 00:34:45,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-04-27 00:34:45,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-04-27 00:34:46,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-04-27 00:34:46,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-04-27 00:34:47,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-27 00:34:47,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-27 00:34:48,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-04-27 00:34:48,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-04-27 00:34:48,781 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-04-27 00:34:49,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-04-27 00:34:49,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-04-27 00:34:50,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-04-27 00:34:50,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-04-27 00:34:50,702 [ scc.repo] DEBUG ## Branches found:
2024-04-27 00:34:50,702 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-04-27 00:34:50,702 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:34:50,702 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:34:50,709 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-27 00:34:50,714 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-27 00:34:50,714 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-27 00:34:50,719 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-27 00:34:50,725 [ scc.git] DEBUG Already up to date.
2024-04-27 00:34:50,725 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-04-27 00:34:51,174 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-04-27 00:34:51,175 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-04-27 00:34:51,180 [ scc.git] DEBUG ## Unique users: []
2024-04-27 00:34:51,180 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:34:51,180 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:34:51,185 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-04-27 00:34:51,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:34:51,198 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-04-27 00:34:51,226 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-04-27 00:34:51,227 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:34:51,231 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-04-27 00:34:51,231 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-04-27 00:34:51,231 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-04-27 00:34:51,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:34:51,405 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:34:51,455 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:34:51,455 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:34:51,460 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:34:51,506 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:34:51,512 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc6585768e0> has no local changes
2024-04-27 00:34:51,513 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/44/)'
2024-04-27 00:34:51,522 [ scc.git] DEBUG [detached HEAD ca7b890] merge master -Dorg -Ssuccess-only
2024-04-27 00:34:51,522 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-27 00:34:51,523 [ scc.repo] DEBUG ## PRs found:
2024-04-27 00:34:52,203 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-04-27 00:34:52,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-04-27 00:34:53,129 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-04-27 00:34:53,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-04-27 00:34:54,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-27 00:34:54,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-27 00:34:55,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-04-27 00:34:55,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-04-27 00:34:56,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-27 00:34:56,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-27 00:34:57,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-04-27 00:34:57,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-04-27 00:34:58,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-04-27 00:34:58,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-04-27 00:34:58,445 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-04-27 00:34:58,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-04-27 00:34:58,914 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-04-27 00:34:59,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378 HTTP/1.1" 200 None
2024-04-27 00:34:59,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378/comments HTTP/1.1" 200 None
2024-04-27 00:35:00,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-04-27 00:35:00,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-04-27 00:35:01,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-04-27 00:35:01,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-27 00:35:02,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-04-27 00:35:02,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-04-27 00:35:02,652 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-04-27 00:35:03,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-04-27 00:35:03,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-04-27 00:35:04,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-04-27 00:35:04,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-27 00:35:05,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-27 00:35:05,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-04-27 00:35:05,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-04-27 00:35:06,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-04-27 00:35:06,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-04-27 00:35:06,907 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-04-27 00:35:07,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-04-27 00:35:07,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-04-27 00:35:08,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-04-27 00:35:08,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-04-27 00:35:09,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-04-27 00:35:09,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-27 00:35:10,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-04-27 00:35:10,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-04-27 00:35:10,672 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-04-27 00:35:11,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-04-27 00:35:11,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-04-27 00:35:12,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-27 00:35:12,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-04-27 00:35:12,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-04-27 00:35:12,928 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-04-27 00:35:13,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-04-27 00:35:13,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-04-27 00:35:14,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-04-27 00:35:14,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-27 00:35:15,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-04-27 00:35:15,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-04-27 00:35:15,756 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-04-27 00:35:16,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-04-27 00:35:16,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-04-27 00:35:17,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-04-27 00:35:17,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-27 00:35:18,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-04-27 00:35:18,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-04-27 00:35:18,616 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-04-27 00:35:19,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-04-27 00:35:19,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-04-27 00:35:20,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-04-27 00:35:20,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-04-27 00:35:20,471 [ scc.repo] DEBUG ## Branches found:
2024-04-27 00:35:20,472 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-04-27 00:35:20,472 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:35:20,472 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:35:20,505 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-27 00:35:20,509 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-27 00:35:20,510 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-27 00:35:20,515 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-27 00:35:20,521 [ scc.git] DEBUG Already up to date.
2024-04-27 00:35:20,521 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-04-27 00:35:21,217 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-27 00:35:21,217 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-04-27 00:35:21,223 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-04-27 00:35:21,745 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-27 00:35:21,746 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-04-27 00:35:21,753 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-04-27 00:35:22,233 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-27 00:35:22,234 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-04-27 00:35:22,239 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-04-27 00:35:22,672 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-27 00:35:22,673 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-04-27 00:35:22,678 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-04-27 00:35:23,167 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-27 00:35:23,167 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-04-27 00:35:23,172 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-04-27 00:35:23,593 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-27 00:35:23,593 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-04-27 00:35:23,599 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-04-27 00:35:24,015 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-27 00:35:24,015 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-04-27 00:35:24,020 [ scc.git] DEBUG ## Unique users: []
2024-04-27 00:35:24,021 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:35:24,021 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:35:24,025 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-04-27 00:35:24,036 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:35:24,040 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-04-27 00:35:24,112 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-04-27 00:35:24,112 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-04-27 00:35:24,125 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:35:24,129 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-04-27 00:35:24,130 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-04-27 00:35:24,130 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-04-27 00:35:24,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:35:24,277 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-04-27 00:35:24,289 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:35:24,294 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-04-27 00:35:24,461 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-04-27 00:35:24,461 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-04-27 00:35:24,462 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:35:24,471 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-04-27 00:35:24,471 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-04-27 00:35:24,471 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-04-27 00:35:24,685 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:35:24,687 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-04-27 00:35:24,702 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:35:24,706 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 266 (errors: use raise_error from cli plugins) df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-04-27 00:35:24,874 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-04-27 00:35:24,875 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:35:24,879 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-04-27 00:35:24,879 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-04-27 00:35:25,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:35:25,109 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-04-27 00:35:25,121 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:35:25,125 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 299 (Add parents and children to omero obj) 09ae8033d77faf0346255eb9644207e02c98709a'
2024-04-27 00:35:25,201 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-04-27 00:35:25,201 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-04-27 00:35:25,202 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:35:25,206 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-04-27 00:35:25,206 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-04-27 00:35:25,206 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-04-27 00:35:25,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:35:25,519 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-04-27 00:35:25,531 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:35:25,536 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-04-27 00:35:25,587 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:35:25,590 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-04-27 00:35:25,590 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-04-27 00:35:25,590 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-04-27 00:35:25,590 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-04-27 00:35:25,590 [ scc.git] DEBUG create mode 100644 connect.py
2024-04-27 00:35:25,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:35:25,924 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-04-27 00:35:25,935 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:35:25,940 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 337 (bulk.yml depth is passed to xargs) 0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-04-27 00:35:26,066 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-04-27 00:35:26,067 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:35:26,071 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-04-27 00:35:26,071 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-27 00:35:26,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:35:26,324 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-04-27 00:35:26,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:35:26,341 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-04-27 00:35:26,380 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-04-27 00:35:26,381 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:35:26,385 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-04-27 00:35:26,385 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-04-27 00:35:26,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:35:26,738 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:35:26,783 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:35:26,783 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:35:26,788 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:35:26,832 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:35:26,844 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc6574b2760> has no local changes
2024-04-27 00:35:26,845 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-py
Excluded PRs:
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
Generated by OMERO-python-superbuild-push#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/44/)'
2024-04-27 00:35:26,857 [ scc.git] DEBUG [detached HEAD d88401f3] merge master -Dorg -Ssuccess-only
2024-04-27 00:35:26,857 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-27 00:35:26,858 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-27 00:35:26,858 [ scc.repo] DEBUG ## PRs found:
2024-04-27 00:35:27,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-27 00:35:27,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-27 00:35:28,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-27 00:35:28,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-27 00:35:29,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-27 00:35:29,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-27 00:35:30,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-27 00:35:30,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-27 00:35:31,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-27 00:35:31,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-27 00:35:31,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-04-27 00:35:31,958 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-27 00:35:32,415 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-27 00:35:32,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-27 00:35:33,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-27 00:35:33,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-27 00:35:33,933 [ scc.repo] DEBUG ## Branches found:
2024-04-27 00:35:33,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-04-27 00:35:33,934 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:35:33,934 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:35:33,938 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-27 00:35:33,943 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-27 00:35:33,943 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-27 00:35:33,948 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-27 00:35:33,954 [ scc.git] DEBUG Already up to date.
2024-04-27 00:35:33,954 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-27 00:35:34,416 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-04-27 00:35:34,416 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-27 00:35:34,423 [ scc.git] DEBUG ## Unique users: []
2024-04-27 00:35:34,423 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:35:34,423 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:35:34,428 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-27 00:35:34,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:35:34,439 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-27 00:35:34,492 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-27 00:35:34,493 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-27 00:35:34,493 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-27 00:35:34,493 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-27 00:35:34,498 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-27 00:35:34,504 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-04-27 00:35:34,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:35:34,655 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-27 00:35:34,661 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-27 00:35:34,666 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#44](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/44/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/44/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-27 00:35:34,671 [ scc.config] DEBUG Found github.token
2024-04-27 00:35:34,671 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-27 00:35:34,671 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:35:34,717 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:35:34,717 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:35:34,721 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:35:34,762 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:35:34,768 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc6574b9640> has no local changes
2024-04-27 00:35:34,768 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/44/)'
2024-04-27 00:35:34,780 [ scc.git] DEBUG [detached HEAD 12c475e] merge master -Dorg -Ssuccess-only
2024-04-27 00:35:34,781 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-27 00:35:34,782 [ scc.repo] DEBUG ## PRs found:
2024-04-27 00:35:35,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-04-27 00:35:35,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549 HTTP/1.1" 200 None
2024-04-27 00:35:36,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549/comments HTTP/1.1" 200 None
2024-04-27 00:35:36,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ade7fa1b5839e9b17878c38efd4f6404a5857712 HTTP/1.1" 200 None
2024-04-27 00:35:37,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ade7fa1b5839e9b17878c38efd4f6404a5857712/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-27 00:35:37,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ade7fa1b5839e9b17878c38efd4f6404a5857712/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-27 00:35:38,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543 HTTP/1.1" 200 None
2024-04-27 00:35:38,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543/comments HTTP/1.1" 200 None
2024-04-27 00:35:39,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-04-27 00:35:39,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-27 00:35:40,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-27 00:35:40,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-04-27 00:35:40,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4?per_page=1 HTTP/1.1" 200 None
2024-04-27 00:35:41,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-04-27 00:35:41,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/status HTTP/1.1" 200 None
2024-04-27 00:35:41,840 [ scc.repo] DEBUG - PR 543 knabar 'Block UI for some long running tasks'
2024-04-27 00:35:42,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542 HTTP/1.1" 200 None
2024-04-27 00:35:42,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542/comments HTTP/1.1" 200 None
2024-04-27 00:35:42,820 [ scc.repo] DEBUG # ... Include label: include
2024-04-27 00:35:43,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-04-27 00:35:43,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-27 00:35:44,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-27 00:35:44,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-04-27 00:35:45,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/977f7b65169e6dee479197a9156993bbadd2d2e2?per_page=1 HTTP/1.1" 200 None
2024-04-27 00:35:45,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-04-27 00:35:46,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/status HTTP/1.1" 200 None
2024-04-27 00:35:46,264 [ scc.repo] DEBUG - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-04-27 00:35:46,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/536 HTTP/1.1" 200 None
2024-04-27 00:35:47,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/536/comments HTTP/1.1" 200 None
2024-04-27 00:35:47,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2 HTTP/1.1" 200 None
2024-04-27 00:35:48,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-27 00:35:48,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-27 00:35:49,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2 HTTP/1.1" 200 None
2024-04-27 00:35:49,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/412fa66a52477fb77319a35147313a6f3cf481a2?per_page=1 HTTP/1.1" 200 None
2024-04-27 00:35:50,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2 HTTP/1.1" 200 None
2024-04-27 00:35:50,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2/status HTTP/1.1" 200 None
2024-04-27 00:35:50,474 [ scc.repo] DEBUG - PR 536 will-moore 'imgData JSON with no stateful services'
2024-04-27 00:35:50,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-04-27 00:35:51,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-04-27 00:35:51,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-04-27 00:35:52,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-04-27 00:35:52,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-27 00:35:53,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-27 00:35:53,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-04-27 00:35:54,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-04-27 00:35:54,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-04-27 00:35:55,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-04-27 00:35:55,091 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-04-27 00:35:55,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/533 HTTP/1.1" 200 None
2024-04-27 00:35:56,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-04-27 00:35:56,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-27 00:35:56,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-27 00:35:57,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-04-27 00:35:57,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/e335980be1e7197826687f6c322a60c61b4aa545?per_page=1 HTTP/1.1" 200 None
2024-04-27 00:35:58,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-04-27 00:35:58,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545/status HTTP/1.1" 200 None
2024-04-27 00:35:58,897 [ scc.repo] DEBUG - PR 533 jburel 'use conda-forge channel'
2024-04-27 00:35:59,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-04-27 00:35:59,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-04-27 00:36:00,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-04-27 00:36:00,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-27 00:36:01,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-27 00:36:01,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-04-27 00:36:02,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-04-27 00:36:02,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-04-27 00:36:03,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-04-27 00:36:03,089 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-04-27 00:36:03,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-04-27 00:36:04,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-04-27 00:36:04,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615 HTTP/1.1" 200 None
2024-04-27 00:36:05,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-27 00:36:05,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615 HTTP/1.1" 200 None
2024-04-27 00:36:06,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/219d9e721304a4c46b4d73ef9ff3777549d69615?per_page=1 HTTP/1.1" 200 2
2024-04-27 00:36:06,078 [ scc.repo] DEBUG - PR 168 stick 'Changes to nginx @maintenance handler'
2024-04-27 00:36:06,079 [ scc.repo] DEBUG ## Branches found:
2024-04-27 00:36:06,079 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-04-27 00:36:06,079 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:36:06,079 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:36:06,084 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-27 00:36:06,088 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-27 00:36:06,088 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-27 00:36:06,092 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-27 00:36:06,097 [ scc.git] DEBUG Already up to date.
2024-04-27 00:36:06,097 [ scc.git] DEBUG Calling 'git fetch origin pull/168/head'
2024-04-27 00:36:06,781 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-27 00:36:06,782 [ scc.git] DEBUG * branch refs/pull/168/head -> FETCH_HEAD
2024-04-27 00:36:06,787 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-04-27 00:36:07,269 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-27 00:36:07,269 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-04-27 00:36:07,274 [ scc.git] DEBUG Calling 'git fetch origin pull/533/head'
2024-04-27 00:36:07,701 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-27 00:36:07,702 [ scc.git] DEBUG * branch refs/pull/533/head -> FETCH_HEAD
2024-04-27 00:36:07,706 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-04-27 00:36:08,126 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-27 00:36:08,126 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-04-27 00:36:08,130 [ scc.git] DEBUG Calling 'git fetch origin pull/536/head'
2024-04-27 00:36:08,916 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-27 00:36:08,916 [ scc.git] DEBUG * branch refs/pull/536/head -> FETCH_HEAD
2024-04-27 00:36:08,920 [ scc.git] DEBUG Calling 'git fetch origin pull/542/head'
2024-04-27 00:36:09,545 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-27 00:36:09,545 [ scc.git] DEBUG * branch refs/pull/542/head -> FETCH_HEAD
2024-04-27 00:36:09,550 [ scc.git] DEBUG Calling 'git fetch origin pull/543/head'
2024-04-27 00:36:10,403 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-27 00:36:10,404 [ scc.git] DEBUG * branch refs/pull/543/head -> FETCH_HEAD
2024-04-27 00:36:10,408 [ scc.git] DEBUG ## Unique users: []
2024-04-27 00:36:10,408 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:36:10,408 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:36:10,412 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-04-27 00:36:10,426 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:36:10,431 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 168 (Changes to nginx @maintenance handler) 219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-04-27 00:36:10,478 [ scc.git] DEBUG Auto-merging test/unit/test_web.py
2024-04-27 00:36:10,478 [ scc.git] DEBUG CONFLICT (content): Merge conflict in test/unit/test_web.py
2024-04-27 00:36:10,479 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-27 00:36:10,480 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-27 00:36:10,487 [ scc.git] DEBUG Calling 'git reset --hard e1b1355ebd4f9de8b855dd2c55f59d86c061a81b'
2024-04-27 00:36:10,498 [ scc.git] DEBUG HEAD is now at e1b1355eb Merge pull request #540 from will-moore/django_template_context_processors_request
2024-04-27 00:36:10,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:36:10,659 [ scc.git] DEBUG Calling 'git merge-base e1b1355ebd4f9de8b855dd2c55f59d86c061a81b 219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-04-27 00:36:10,673 [ scc.git] DEBUG Calling 'git diff --name-only 632d14a9cab5319c6b1bd9190d441a95e457103b..e1b1355ebd4f9de8b855dd2c55f59d86c061a81b'
2024-04-27 00:36:10,776 [ scc.git] INFO - PR 168 stick 'Changes to nginx @maintenance handler'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#44](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/44/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/44/consoleText) for more details.
Possible conflicts:
- Upstream changes
- test/unit/test_web.py
--conflicts
2024-04-27 00:36:10,781 [ scc.config] DEBUG Found github.token
2024-04-27 00:36:10,781 [ scc.git] DEBUG Not adding comment to issue #168, already --conflicts.
2024-04-27 00:36:10,782 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-04-27 00:36:10,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:36:10,792 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 527 (Add some initial CSP settings to test) 5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-04-27 00:36:10,859 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-04-27 00:36:10,859 [ scc.git] DEBUG Auto-merging setup.py
2024-04-27 00:36:10,860 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:36:10,864 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-04-27 00:36:10,864 [ scc.git] DEBUG setup.py | 1 +
2024-04-27 00:36:10,864 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-04-27 00:36:11,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:36:11,055 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e335980be1e7197826687f6c322a60c61b4aa545'
2024-04-27 00:36:11,061 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:36:11,066 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 533 (use conda-forge channel) e335980be1e7197826687f6c322a60c61b4aa545'
2024-04-27 00:36:11,081 [ scc.git] DEBUG Auto-merging README.rst
2024-04-27 00:36:11,083 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:36:11,086 [ scc.git] DEBUG README.rst | 3 +--
2024-04-27 00:36:11,086 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 2 deletions(-)
2024-04-27 00:36:11,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:36:11,450 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-04-27 00:36:11,457 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:36:11,461 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 534 (get strings from omero.cmd.ERR and omero.CmdError correctly) d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-04-27 00:36:11,600 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-04-27 00:36:11,600 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-04-27 00:36:11,601 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:36:11,605 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-04-27 00:36:11,606 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-04-27 00:36:11,606 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-04-27 00:36:11,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:36:11,863 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...412fa66a52477fb77319a35147313a6f3cf481a2'
2024-04-27 00:36:11,870 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:36:11,874 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 536 (imgData JSON with no stateful services) 412fa66a52477fb77319a35147313a6f3cf481a2'
2024-04-27 00:36:11,953 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py
2024-04-27 00:36:11,954 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-04-27 00:36:11,954 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:36:11,960 [ scc.git] DEBUG omeroweb/webclient/views.py | 4 +-
2024-04-27 00:36:11,960 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 135 ++++++++++++++++++++++++++++++++++++++---
2024-04-27 00:36:11,960 [ scc.git] DEBUG omeroweb/webgateway/util.py | 38 ++++++++++++
2024-04-27 00:36:11,960 [ scc.git] DEBUG 3 files changed, 166 insertions(+), 11 deletions(-)
2024-04-27 00:36:12,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:36:12,258 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...977f7b65169e6dee479197a9156993bbadd2d2e2'
2024-04-27 00:36:12,265 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:36:12,269 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 542 (PlateAcquisition filtering with plate display) 977f7b65169e6dee479197a9156993bbadd2d2e2'
2024-04-27 00:36:12,338 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py
2024-04-27 00:36:12,339 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:36:12,347 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 13 +++-------
2024-04-27 00:36:12,347 [ scc.git] DEBUG .../webclient/templates/webclient/data/plate.html | 10 ++++----
2024-04-27 00:36:12,347 [ scc.git] DEBUG omeroweb/webclient/views.py | 17 ++++++++++++
2024-04-27 00:36:12,347 [ scc.git] DEBUG omeroweb/webgateway/plategrid.py | 30 +++++++++++++++++++---
2024-04-27 00:36:12,347 [ scc.git] DEBUG .../static/webgateway/js/ome.plateview.js | 16 +++++++-----
2024-04-27 00:36:12,347 [ scc.git] DEBUG omeroweb/webgateway/urls.py | 2 +-
2024-04-27 00:36:12,347 [ scc.git] DEBUG omeroweb/webgateway/views.py | 16 ++++++++++--
2024-04-27 00:36:12,347 [ scc.git] DEBUG 7 files changed, 78 insertions(+), 26 deletions(-)
2024-04-27 00:36:12,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:36:12,651 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4'
2024-04-27 00:36:12,659 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:36:12,663 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 543 (Block UI for some long running tasks) 8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4'
2024-04-27 00:36:12,761 [ scc.git] DEBUG Auto-merging omeroweb/webclient/templates/webclient/data/includes/center_plugin.thumbs.js.html
2024-04-27 00:36:12,762 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-27 00:36:12,768 [ scc.git] DEBUG .../webclient/javascript/ome.progress_overlay.js | 60 ++++++
2024-04-27 00:36:12,768 [ scc.git] DEBUG .../webclient/javascript/ome.webclient.actions.js | 112 +++++++-----
2024-04-27 00:36:12,768 [ scc.git] DEBUG .../webclient/annotations/metadata_preview.html | 51 +++---
2024-04-27 00:36:12,768 [ scc.git] DEBUG .../webclient/templates/webclient/base/base.html | 1 +
2024-04-27 00:36:12,768 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 2 +-
2024-04-27 00:36:12,768 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 16 +-
2024-04-27 00:36:12,768 [ scc.git] DEBUG .../static/webgateway/js/ome.gs_utils.js | 201 ---------------------
2024-04-27 00:36:12,768 [ scc.git] DEBUG .../webgateway/static/webgateway/js/ome.popup.js | 1 -
2024-04-27 00:36:12,768 [ scc.git] DEBUG .../webgateway/static/webgateway/js/omero_image.js | 35 ++--
2024-04-27 00:36:12,768 [ scc.git] DEBUG 9 files changed, 186 insertions(+), 293 deletions(-)
2024-04-27 00:36:12,768 [ scc.git] DEBUG create mode 100644 omeroweb/webclient/static/webclient/javascript/ome.progress_overlay.js
2024-04-27 00:36:13,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:36:13,052 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-27 00:36:13,094 [ scc.git] DEBUG Get sha1 of %s
2024-04-27 00:36:13,094 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-27 00:36:13,098 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:36:13,134 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:36:13,145 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc6574d3910> has no local changes
2024-04-27 00:36:13,145 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 549 knabar 'Remove webgateway cache' (status: failure)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 533 jburel 'use conda-forge channel'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 536 will-moore 'imgData JSON with no stateful services'
- PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
- PR 543 knabar 'Block UI for some long running tasks'
Conflicting PRs (not included):
- PR 168 stick 'Changes to nginx @maintenance handler'
Generated by OMERO-python-superbuild-push#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/44/)'
2024-04-27 00:36:13,155 [ scc.git] DEBUG [detached HEAD 2b62d311b] merge master -Dorg -Ssuccess-only
2024-04-27 00:36:13,155 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-27 00:36:13,155 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-27 00:36:13,200 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-04-27 00:36:13,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:36:13,478 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-04-27 00:36:13,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:36:13,881 [ scc.config] DEBUG Found submodule.omero-py.url
2024-04-27 00:36:14,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:36:14,289 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-04-27 00:36:14,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:36:14,691 [ scc.config] DEBUG Found submodule.omero-web.url
2024-04-27 00:36:15,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-27 00:36:15,098 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-27 00:36:15,127 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc65861ae80> has local changes
2024-04-27 00:36:15,127 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-python-superbuild
Already up to date.
Repository: ome/omero-dropbox
Already up to date.
Merged PRs:
- PR 16 joshmoore 'Review all instances of whitelist/blacklist'
- PR 23 sbesson 'Remove python-future compatibility code'
Repository: ome/omero-marshal
Excluded PRs:
- PR 34 chris-allan 'Initial support for Event' (exclude comment)
- PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 will-moore 'Roi encoder allows Shape None'
Repository: ome/omero-py
Excluded PRs:
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Repository: ome/omero-web
Excluded PRs:
- PR 549 knabar 'Remove webgateway cache' (status: failure)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 533 jburel 'use conda-forge channel'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 536 will-moore 'imgData JSON with no stateful services'
- PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
- PR 543 knabar 'Block UI for some long running tasks'
Conflicting PRs (not included):
- PR 168 stick 'Changes to nginx @maintenance handler'
Generated by OMERO-python-superbuild-push#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/44/)'
2024-04-27 00:36:15,137 [ scc.git] DEBUG [detached HEAD 3b84742] merge master -Dorg -Ssuccess-only
2024-04-27 00:36:15,138 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-04-27 00:36:15,138 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-04-27 00:36:15,138 [ scc.merge] INFO Already up to date.
2024-04-27 00:36:15,138 [ scc.merge] INFO
2024-04-27 00:36:15,138 [ scc.merge] INFO
2024-04-27 00:36:15,138 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-04-27 00:36:15,138 [ scc.merge] INFO Already up to date.
2024-04-27 00:36:15,138 [ scc.merge] INFO
2024-04-27 00:36:15,138 [ scc.merge] INFO Merged PRs:
2024-04-27 00:36:15,138 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-04-27 00:36:15,138 [ scc.merge] INFO - PR 23 sbesson 'Remove python-future compatibility code'
2024-04-27 00:36:15,138 [ scc.merge] INFO
2024-04-27 00:36:15,138 [ scc.merge] INFO Repository: ome/omero-marshal
2024-04-27 00:36:15,138 [ scc.merge] INFO Excluded PRs:
2024-04-27 00:36:15,138 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-04-27 00:36:15,138 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-04-27 00:36:15,138 [ scc.merge] INFO Already up to date.
2024-04-27 00:36:15,138 [ scc.merge] INFO
2024-04-27 00:36:15,138 [ scc.merge] INFO Merged PRs:
2024-04-27 00:36:15,138 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-04-27 00:36:15,138 [ scc.merge] INFO
2024-04-27 00:36:15,139 [ scc.merge] INFO Repository: ome/omero-py
2024-04-27 00:36:15,139 [ scc.merge] INFO Excluded PRs:
2024-04-27 00:36:15,139 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-04-27 00:36:15,139 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-04-27 00:36:15,139 [ scc.merge] INFO - PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
2024-04-27 00:36:15,139 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-04-27 00:36:15,139 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-04-27 00:36:15,139 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-04-27 00:36:15,139 [ scc.merge] INFO Already up to date.
2024-04-27 00:36:15,139 [ scc.merge] INFO
2024-04-27 00:36:15,139 [ scc.merge] INFO Merged PRs:
2024-04-27 00:36:15,139 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-04-27 00:36:15,139 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-04-27 00:36:15,139 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-04-27 00:36:15,139 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-04-27 00:36:15,139 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-04-27 00:36:15,139 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-04-27 00:36:15,139 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-04-27 00:36:15,139 [ scc.merge] INFO
2024-04-27 00:36:15,139 [ scc.merge] INFO Repository: ome/omero-scripts
2024-04-27 00:36:15,139 [ scc.merge] INFO Excluded PRs:
2024-04-27 00:36:15,139 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-27 00:36:15,139 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-27 00:36:15,139 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-27 00:36:15,139 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-27 00:36:15,139 [ scc.merge] INFO Already up to date.
2024-04-27 00:36:15,139 [ scc.merge] INFO
2024-04-27 00:36:15,139 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-27 00:36:15,139 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-27 00:36:15,139 [ scc.merge] INFO
2024-04-27 00:36:15,139 [ scc.merge] INFO Repository: ome/omero-web
2024-04-27 00:36:15,139 [ scc.merge] INFO Excluded PRs:
2024-04-27 00:36:15,139 [ scc.merge] INFO - PR 549 knabar 'Remove webgateway cache' (status: failure)
2024-04-27 00:36:15,139 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-04-27 00:36:15,139 [ scc.merge] INFO Already up to date.
2024-04-27 00:36:15,139 [ scc.merge] INFO
2024-04-27 00:36:15,139 [ scc.merge] INFO Merged PRs:
2024-04-27 00:36:15,140 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-04-27 00:36:15,140 [ scc.merge] INFO - PR 533 jburel 'use conda-forge channel'
2024-04-27 00:36:15,140 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-04-27 00:36:15,140 [ scc.merge] INFO - PR 536 will-moore 'imgData JSON with no stateful services'
2024-04-27 00:36:15,140 [ scc.merge] INFO - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-04-27 00:36:15,140 [ scc.merge] INFO - PR 543 knabar 'Block UI for some long running tasks'
2024-04-27 00:36:15,140 [ scc.merge] INFO
2024-04-27 00:36:15,140 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-27 00:36:15,140 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler'
2024-04-27 00:36:15,140 [ scc.merge] INFO
2024-04-27 00:36:15,140 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-27 00:36:15,140 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:36:15,144 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-04-27 00:36:15,145 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:36:15,148 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-27 00:36:15,148 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-04-27 00:36:15,148 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:36:15,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-27 00:36:15,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-04-27 00:36:15,152 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:36:15,155 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-27 00:36:15,156 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-04-27 00:36:15,156 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:36:15,159 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-27 00:36:15,159 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-04-27 00:36:15,159 [ scc.git] DEBUG Calling 'git remote'
2024-04-27 00:36:15,162 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
Update component versions
Downloading https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-build/lastSuccessfulBuild/artifact/omero-blitz/build/distributions/omero-blitz-5.5.5-python.zip ...
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 150, in <module>
download_blitz_target()
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 83, in download_blitz_target
resp = urlopen(loc)
File "/usr/lib64/python3.9/urllib/request.py", line 214, in urlopen
return opener.open(url, data, timeout)
File "/usr/lib64/python3.9/urllib/request.py", line 523, in open
response = meth(req, response)
File "/usr/lib64/python3.9/urllib/request.py", line 632, in http_response
response = self.parent.error(
File "/usr/lib64/python3.9/urllib/request.py", line 561, in error
return self._call_chain(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 494, in _call_chain
result = func(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 641, in http_error_default
raise HTTPError(req.full_url, code, msg, hdrs, fp)
urllib.error.HTTPError: HTTP Error 404: Not Found
Downloading https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-build/lastSuccessfulBuild/artifact/omero-blitz/build/distributions/omero-blitz-5.5.5-python.zip ...
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 150, in <module>
download_blitz_target()
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 83, in download_blitz_target
resp = urlopen(loc)
File "/usr/lib64/python3.9/urllib/request.py", line 214, in urlopen
return opener.open(url, data, timeout)
File "/usr/lib64/python3.9/urllib/request.py", line 523, in open
response = meth(req, response)
File "/usr/lib64/python3.9/urllib/request.py", line 632, in http_response
response = self.parent.error(
File "/usr/lib64/python3.9/urllib/request.py", line 561, in error
return self._call_chain(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 494, in _call_chain
result = func(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 641, in http_error_default
raise HTTPError(req.full_url, code, msg, hdrs, fp)
urllib.error.HTTPError: HTTP Error 404: Not Found
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'omero-dropbox'
Entering 'omero-marshal'
Entering 'omero-py'
Entering 'omero-scripts'
Entering 'omero-web'
Entering 'omero-dropbox'
HEAD detached from 5863350
nothing to commit, working tree clean
Entering 'omero-marshal'
HEAD detached from cca4c2f
nothing to commit, working tree clean
Entering 'omero-py'
HEAD detached from 52d9a6f4
nothing to commit, working tree clean
Entering 'omero-scripts'
HEAD detached from 5a90893
nothing to commit, working tree clean
Entering 'omero-web'
HEAD detached from e1b1355eb
nothing to commit, working tree clean
HEAD detached from 9308a59
nothing to commit, working tree clean
2024-04-27 00:36:45,303 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/f5fa13f0/images/svgs/logo.svg){kind=logo}
