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-26 00:34:46,239 [ scc.config] DEBUG Found github.token
2024-04-26 00:34:46,242 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-04-26 00:34:46,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:34:46,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:34:47,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-04-26 00:34:47,292 [ scc.gh] DEBUG 4919 remaining from 5000 (Reset at 01:04
2024-04-26 00:34:47,293 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-26 00:34:47,297 [ scc.git] DEBUG Check current status
2024-04-26 00:34:47,298 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-26 00:34:47,301 [ scc.git] DEBUG 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-04-26 00:34:47,301 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-26 00:34:47,356 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-04-26 00:34:47,360 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-04-26 00:34:47,376 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-04-26 00:34:47,380 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-04-26 00:34:47,500 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-04-26 00:34:47,506 [ scc.config] DEBUG Found remote.origin.url
2024-04-26 00:34:47,773 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-04-26 00:34:48,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-26 00:34:48,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-26 00:34:49,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-26 00:34:49,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-26 00:34:49,506 [ scc.git] DEBUG Resetting...
2024-04-26 00:34:49,506 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-04-26 00:34:49,512 [ scc.git] DEBUG HEAD is now at 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-04-26 00:34:49,513 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-04-26 00:34:49,570 [ scc.git] DEBUG Check current status
2024-04-26 00:34:49,570 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-26 00:34:49,574 [ scc.git] DEBUG 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-04-26 00:34:49,574 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-26 00:34:49,612 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-04-26 00:34:49,615 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-04-26 00:34:49,618 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-04-26 00:34:49,621 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-04-26 00:34:49,626 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-04-26 00:34:49,626 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-04-26 00:34:49,627 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-04-26 00:34:49,627 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-04-26 00:34:49,627 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-04-26 00:34:49,627 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-04-26 00:34:49,627 [ scc.repo] DEBUG ## PRs found:
2024-04-26 00:34:49,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-04-26 00:34:49,941 [ scc.repo] DEBUG ## Branches found:
2024-04-26 00:34:49,941 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:34:49,941 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:34:49,945 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 00:34:49,948 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 00:34:49,948 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 00:34:49,952 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 00:34:49,956 [ scc.git] DEBUG Already up to date.
2024-04-26 00:34:49,956 [ scc.git] DEBUG ## Unique users: []
2024-04-26 00:34:49,956 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:34:49,956 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:34:49,959 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:34:49,998 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:34:49,998 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:34:50,002 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:34:50,222 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f04d8ab9e80> has no local changes
2024-04-26 00:34:50,222 [ 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#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/43/)'
2024-04-26 00:34:50,249 [ scc.git] DEBUG [detached HEAD 71ad33e] merge master -Dorg -Snone
2024-04-26 00:34:50,249 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-04-26 00:34:50,249 [ scc.merge] INFO Already up to date.
2024-04-26 00:34:50,249 [ scc.merge] INFO
2024-04-26 00:34:50,250 [ scc.merge] INFO
2024-04-26 00:34:50,250 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-26 00:34:50,250 [ 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-26 00:34:52,661 [ scc.config] DEBUG Found github.token
2024-04-26 00:34:52,664 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-04-26 00:34:52,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:34:53,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:34:53,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-04-26 00:34:53,707 [ scc.gh] DEBUG 4911 remaining from 5000 (Reset at 01:04
2024-04-26 00:34:53,708 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-26 00:34:53,712 [ scc.git] DEBUG Check current status
2024-04-26 00:34:53,713 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-26 00:34:53,716 [ scc.git] DEBUG 71ad33e merge master -Dorg -Snone
2024-04-26 00:34:53,716 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-26 00:34:53,758 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-04-26 00:34:53,761 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-04-26 00:34:53,765 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-04-26 00:34:53,769 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-04-26 00:34:53,772 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-04-26 00:34:53,777 [ scc.config] DEBUG Found remote.origin.url
2024-04-26 00:34:53,777 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-04-26 00:34:53,779 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-04-26 00:34:54,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-04-26 00:34:54,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-26 00:34:55,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-26 00:34:55,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-26 00:34:55,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-26 00:34:55,876 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:34:55,926 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-04-26 00:34:55,926 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-26 00:34:55,930 [ scc.git] DEBUG Check current status
2024-04-26 00:34:55,930 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-26 00:34:55,934 [ scc.git] DEBUG 5863350 Merge pull request #22 from sbesson/python311
2024-04-26 00:34:55,934 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-26 00:34:55,980 [ scc.config] DEBUG Found remote.origin.url
2024-04-26 00:34:56,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-04-26 00:34:56,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-26 00:34:57,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-26 00:34:57,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-26 00:34:58,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-26 00:34:58,049 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:34:58,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-26 00:34:58,087 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-04-26 00:34:58,087 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-26 00:34:58,091 [ scc.git] DEBUG Check current status
2024-04-26 00:34:58,091 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-26 00:34:58,095 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-04-26 00:34:58,095 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-26 00:34:58,133 [ scc.config] DEBUG Found remote.origin.url
2024-04-26 00:34:58,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-04-26 00:34:58,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-26 00:34:59,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-26 00:34:59,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-26 00:35:00,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-26 00:35:00,209 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:35:00,251 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-26 00:35:00,252 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-04-26 00:35:00,252 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-26 00:35:00,256 [ scc.git] DEBUG Check current status
2024-04-26 00:35:00,256 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-26 00:35:00,270 [ scc.git] DEBUG 52d9a6f4 Bump version: 5.19.2 → 5.19.3.dev0
2024-04-26 00:35:00,270 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-26 00:35:00,314 [ scc.config] DEBUG Found remote.origin.url
2024-04-26 00:35:00,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-04-26 00:35:01,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-26 00:35:01,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-26 00:35:01,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-26 00:35:02,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-26 00:35:02,414 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:35:02,450 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-26 00:35:02,451 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-04-26 00:35:02,451 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-26 00:35:02,454 [ scc.git] DEBUG Check current status
2024-04-26 00:35:02,454 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-26 00:35:02,472 [ scc.git] DEBUG 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-04-26 00:35:02,472 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-26 00:35:02,518 [ scc.config] DEBUG Found remote.origin.url
2024-04-26 00:35:02,519 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-04-26 00:35:02,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-04-26 00:35:03,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-26 00:35:03,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-26 00:35:04,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-26 00:35:04,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-26 00:35:04,641 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:35:04,677 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-26 00:35:04,678 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-04-26 00:35:04,678 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-26 00:35:04,683 [ scc.git] DEBUG Check current status
2024-04-26 00:35:04,683 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-26 00:35:04,687 [ scc.git] DEBUG e1b1355eb Merge pull request #540 from will-moore/django_template_context_processors_request
2024-04-26 00:35:04,687 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-26 00:35:04,726 [ scc.config] DEBUG Found remote.origin.url
2024-04-26 00:35:05,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-04-26 00:35:05,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-26 00:35:06,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-26 00:35:06,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-26 00:35:06,856 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-26 00:35:06,859 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:35:06,899 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-26 00:35:06,899 [ scc.git] DEBUG Resetting...
2024-04-26 00:35:06,899 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-04-26 00:35:06,906 [ scc.git] DEBUG HEAD is now at 71ad33e merge master -Dorg -Snone
2024-04-26 00:35:06,906 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-04-26 00:35:06,956 [ scc.git] DEBUG Check current status
2024-04-26 00:35:06,957 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-26 00:35:06,962 [ scc.git] DEBUG 71ad33e merge master -Dorg -Snone
2024-04-26 00:35:06,962 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-26 00:35:07,001 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-04-26 00:35:07,004 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-04-26 00:35:07,007 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-04-26 00:35:07,010 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-04-26 00:35:07,014 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-04-26 00:35:07,015 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-04-26 00:35:07,015 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-04-26 00:35:07,015 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-04-26 00:35:07,015 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-04-26 00:35:07,015 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-04-26 00:35:07,015 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-04-26 00:35:07,015 [ scc.repo] DEBUG ## PRs found:
2024-04-26 00:35:07,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-04-26 00:35:07,302 [ scc.repo] DEBUG ## Branches found:
2024-04-26 00:35:07,302 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:35:07,302 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:35:07,307 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 00:35:07,310 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 00:35:07,311 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 00:35:07,315 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 00:35:07,319 [ scc.git] DEBUG Already up to date.
2024-04-26 00:35:07,319 [ scc.git] DEBUG ## Unique users: []
2024-04-26 00:35:07,319 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:35:07,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:35:07,323 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:35:07,363 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:35:07,363 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:35:07,367 [ scc.repo] DEBUG ## PRs found:
2024-04-26 00:35:07,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-04-26 00:35:08,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23 HTTP/1.1" 200 None
2024-04-26 00:35:08,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23/comments HTTP/1.1" 200 None
2024-04-26 00:35:09,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None
2024-04-26 00:35:09,749 [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-26 00:35:10,225 [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-26 00:35:10,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None
2024-04-26 00:35:11,092 [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-26 00:35:11,094 [ scc.repo] DEBUG - PR 23 sbesson 'Remove python-future compatibility code'
2024-04-26 00:35:11,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-04-26 00:35:12,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-04-26 00:35:12,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-04-26 00:35:12,957 [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-26 00:35:13,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-04-26 00:35:13,844 [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-26 00:35:13,845 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-04-26 00:35:13,845 [ scc.repo] DEBUG ## Branches found:
2024-04-26 00:35:13,845 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-04-26 00:35:13,845 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:35:13,845 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:35:13,851 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 00:35:13,854 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 00:35:13,855 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 00:35:13,858 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 00:35:13,863 [ scc.git] DEBUG Already up to date.
2024-04-26 00:35:13,863 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-04-26 00:35:14,281 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-04-26 00:35:14,282 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-04-26 00:35:14,287 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head'
2024-04-26 00:35:14,652 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-04-26 00:35:14,652 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD
2024-04-26 00:35:14,657 [ scc.git] DEBUG ## Unique users: []
2024-04-26 00:35:14,657 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:35:14,657 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:35:14,661 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-04-26 00:35:14,668 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:35:14,673 [ 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-26 00:35:14,738 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:35:14,742 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-04-26 00:35:14,742 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-04-26 00:35:14,742 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-04-26 00:35:14,742 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-04-26 00:35:14,742 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-04-26 00:35:14,742 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-04-26 00:35:14,742 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-04-26 00:35:14,742 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-04-26 00:35:14,742 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-04-26 00:35:14,744 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-04-26 00:35:14,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:35:14,905 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8'
2024-04-26 00:35:14,911 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:35:14,916 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 23 (Remove python-future compatibility code) 9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8'
2024-04-26 00:35:14,999 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-04-26 00:35:14,999 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-04-26 00:35:14,999 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-04-26 00:35:15,000 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-04-26 00:35:15,000 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-04-26 00:35:15,000 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-04-26 00:35:15,000 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-04-26 00:35:15,000 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-04-26 00:35:15,000 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-04-26 00:35:15,000 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:35:15,007 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-04-26 00:35:15,007 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++--
2024-04-26 00:35:15,007 [ scc.git] DEBUG .github/workflows/tox.yml | 5 ++--
2024-04-26 00:35:15,007 [ scc.git] DEBUG Dockerfile | 32 ----------------------
2024-04-26 00:35:15,007 [ scc.git] DEBUG setup.py | 2 +-
2024-04-26 00:35:15,007 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 1 -
2024-04-26 00:35:15,008 [ scc.git] DEBUG src/fsDirectory.py | 8 +-----
2024-04-26 00:35:15,008 [ scc.git] DEBUG src/fsDropBox.py | 8 +-----
2024-04-26 00:35:15,008 [ scc.git] DEBUG src/fsDropBoxMonitorClient.py | 11 +-------
2024-04-26 00:35:15,008 [ scc.git] DEBUG src/fsFileServer.py | 12 ++-------
2024-04-26 00:35:15,008 [ scc.git] DEBUG src/fsLists.py | 2 --
2024-04-26 00:35:15,008 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 9 +------
2024-04-26 00:35:15,008 [ scc.git] DEBUG src/fsMonitor.py | 2 --
2024-04-26 00:35:15,008 [ scc.git] DEBUG src/fsMonitorServer.py | 8 +++---
2024-04-26 00:35:15,008 [ scc.git] DEBUG src/fsNotificationScheduler.py | 3 ---
2024-04-26 00:35:15,008 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 21 +++++----------
2024-04-26 00:35:15,008 [ scc.git] DEBUG src/fsUtil.py | 9 +++----
2024-04-26 00:35:15,008 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 8 +-----
2024-04-26 00:35:15,008 [ scc.git] DEBUG test/conftest.py | 2 --
2024-04-26 00:35:15,008 [ scc.git] DEBUG test/drivers.py | 17 +++---------
2024-04-26 00:35:15,008 [ scc.git] DEBUG test/unit/test_drivers.py | 55 ++++++++++++++++----------------------
2024-04-26 00:35:15,009 [ scc.git] DEBUG test/unit/test_monitor.py | 2 --
2024-04-26 00:35:15,009 [ scc.git] DEBUG test/unit/test_replay.py | 8 +-----
2024-04-26 00:35:15,009 [ scc.git] DEBUG test/unit/test_state.py | 1 -
2024-04-26 00:35:15,009 [ scc.git] DEBUG tox.ini | 3 ++-
2024-04-26 00:35:15,009 [ scc.git] DEBUG 25 files changed, 59 insertions(+), 178 deletions(-)
2024-04-26 00:35:15,009 [ scc.git] DEBUG delete mode 100644 Dockerfile
2024-04-26 00:35:15,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:35:15,321 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:35:15,361 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:35:15,362 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:35:15,366 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:35:15,410 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:35:15,419 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe39bdf73d0> has no local changes
2024-04-26 00:35:15,420 [ 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#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/43/)'
2024-04-26 00:35:15,429 [ scc.git] DEBUG [detached HEAD 9ace99f] merge master -Dorg -Ssuccess-only
2024-04-26 00:35:15,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-26 00:35:15,430 [ scc.repo] DEBUG ## PRs found:
2024-04-26 00:35:15,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-04-26 00:35:16,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-04-26 00:35:16,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-04-26 00:35:17,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-04-26 00:35:17,764 [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-26 00:35:18,246 [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-26 00:35:18,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-04-26 00:35:19,156 [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-26 00:35:19,156 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-04-26 00:35:19,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-04-26 00:35:20,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-04-26 00:35:20,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-04-26 00:35:20,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-04-26 00:35:20,974 [ scc.repo] DEBUG ## Branches found:
2024-04-26 00:35:20,974 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-04-26 00:35:20,974 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:35:20,974 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:35:20,980 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 00:35:20,984 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 00:35:20,985 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 00:35:20,990 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 00:35:20,995 [ scc.git] DEBUG Already up to date.
2024-04-26 00:35:20,995 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-04-26 00:35:21,430 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-04-26 00:35:21,431 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-04-26 00:35:21,436 [ scc.git] DEBUG ## Unique users: []
2024-04-26 00:35:21,436 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:35:21,436 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:35:21,440 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-04-26 00:35:21,445 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:35:21,448 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-04-26 00:35:21,458 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-04-26 00:35:21,459 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:35:21,461 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-04-26 00:35:21,461 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-04-26 00:35:21,461 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-04-26 00:35:21,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:35:21,615 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:35:21,655 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:35:21,656 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:35:21,660 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:35:21,700 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:35:21,706 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe39bd91f10> has no local changes
2024-04-26 00:35:21,706 [ 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#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/43/)'
2024-04-26 00:35:21,714 [ scc.git] DEBUG [detached HEAD 86ea551] merge master -Dorg -Ssuccess-only
2024-04-26 00:35:21,714 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-26 00:35:21,715 [ scc.repo] DEBUG ## PRs found:
2024-04-26 00:35:22,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-04-26 00:35:22,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-04-26 00:35:23,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-04-26 00:35:23,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-04-26 00:35:24,204 [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-26 00:35:24,722 [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-26 00:35:25,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-04-26 00:35:25,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-04-26 00:35:26,134 [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-26 00:35:26,624 [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-26 00:35:27,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-04-26 00:35:27,556 [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-26 00:35:28,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-04-26 00:35:28,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-04-26 00:35:28,432 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-04-26 00:35:28,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-04-26 00:35:28,894 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-04-26 00:35:29,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378 HTTP/1.1" 200 None
2024-04-26 00:35:29,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378/comments HTTP/1.1" 200 None
2024-04-26 00:35:30,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-04-26 00:35:30,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-04-26 00:35:31,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-04-26 00:35:31,664 [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-26 00:35:32,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-04-26 00:35:32,548 [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-26 00:35:32,549 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-04-26 00:35:33,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-04-26 00:35:33,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-04-26 00:35:33,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-04-26 00:35:34,443 [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-26 00:35:34,953 [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-26 00:35:35,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-04-26 00:35:35,858 [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-26 00:35:36,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-04-26 00:35:36,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-04-26 00:35:36,798 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-04-26 00:35:37,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-04-26 00:35:37,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-04-26 00:35:38,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-04-26 00:35:38,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-04-26 00:35:39,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-04-26 00:35:39,631 [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-26 00:35:40,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-04-26 00:35:40,524 [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-26 00:35:40,525 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-04-26 00:35:40,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-04-26 00:35:41,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-04-26 00:35:41,919 [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-26 00:35:42,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-04-26 00:35:42,854 [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-26 00:35:42,855 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-04-26 00:35:43,329 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-04-26 00:35:43,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-04-26 00:35:44,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-04-26 00:35:44,816 [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-26 00:35:45,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-04-26 00:35:45,810 [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-26 00:35:45,811 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-04-26 00:35:46,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-04-26 00:35:46,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-04-26 00:35:47,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-04-26 00:35:47,706 [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-26 00:35:48,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-04-26 00:35:48,609 [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-26 00:35:48,610 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-04-26 00:35:49,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-04-26 00:35:49,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-04-26 00:35:49,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-04-26 00:35:50,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-04-26 00:35:50,426 [ scc.repo] DEBUG ## Branches found:
2024-04-26 00:35:50,426 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-04-26 00:35:50,426 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:35:50,426 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:35:50,431 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 00:35:50,435 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 00:35:50,435 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 00:35:50,440 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 00:35:50,446 [ scc.git] DEBUG Already up to date.
2024-04-26 00:35:50,446 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-04-26 00:35:51,180 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-26 00:35:51,180 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-04-26 00:35:51,185 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-04-26 00:35:51,629 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-26 00:35:51,629 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-04-26 00:35:51,635 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-04-26 00:35:52,086 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-26 00:35:52,086 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-04-26 00:35:52,092 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-04-26 00:35:52,492 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-26 00:35:52,492 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-04-26 00:35:52,498 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-04-26 00:35:52,923 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-26 00:35:52,923 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-04-26 00:35:52,927 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-04-26 00:35:53,302 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-26 00:35:53,302 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-04-26 00:35:53,308 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-04-26 00:35:53,711 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-26 00:35:53,711 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-04-26 00:35:53,717 [ scc.git] DEBUG ## Unique users: []
2024-04-26 00:35:53,717 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:35:53,717 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:35:53,724 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-04-26 00:35:53,736 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:35:53,741 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-04-26 00:35:53,854 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-04-26 00:35:53,854 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-04-26 00:35:53,856 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:35:53,861 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-04-26 00:35:53,861 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-04-26 00:35:53,861 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-04-26 00:35:54,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:35:54,013 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-04-26 00:35:54,027 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:35:54,032 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-04-26 00:35:54,175 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-04-26 00:35:54,175 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-04-26 00:35:54,176 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:35:54,185 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-04-26 00:35:54,185 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-04-26 00:35:54,185 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-04-26 00:35:54,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:35:54,412 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-04-26 00:35:54,429 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:35:54,439 [ 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-26 00:35:54,506 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-04-26 00:35:54,508 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:35:54,513 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-04-26 00:35:54,513 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-04-26 00:35:54,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:35:54,827 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-04-26 00:35:54,839 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:35:54,844 [ 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-26 00:35:54,923 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-04-26 00:35:54,923 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-04-26 00:35:54,925 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:35:54,929 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-04-26 00:35:54,929 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-04-26 00:35:54,929 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-04-26 00:35:55,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:35:55,239 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-04-26 00:35:55,251 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:35:55,257 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-04-26 00:35:55,289 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:35:55,292 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-04-26 00:35:55,292 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-04-26 00:35:55,292 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-04-26 00:35:55,292 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-04-26 00:35:55,292 [ scc.git] DEBUG create mode 100644 connect.py
2024-04-26 00:35:55,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:35:55,650 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-04-26 00:35:55,662 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:35:55,667 [ 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-26 00:35:55,771 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-04-26 00:35:55,773 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:35:55,776 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-04-26 00:35:55,776 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-26 00:35:56,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:35:56,066 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-04-26 00:35:56,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:35:56,083 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-04-26 00:35:56,122 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-04-26 00:35:56,124 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:35:56,128 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-04-26 00:35:56,128 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-04-26 00:35:56,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:35:56,469 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:35:56,511 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:35:56,512 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:35:56,516 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:35:56,557 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:35:56,565 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe39ad32760> has no local changes
2024-04-26 00:35:56,565 [ 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#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/43/)'
2024-04-26 00:35:56,574 [ scc.git] DEBUG [detached HEAD b9e72973] merge master -Dorg -Ssuccess-only
2024-04-26 00:35:56,574 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-26 00:35:56,575 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-26 00:35:56,575 [ scc.repo] DEBUG ## PRs found:
2024-04-26 00:35:57,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-26 00:35:57,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-26 00:35:57,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-26 00:35:58,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-26 00:35:58,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-26 00:35:59,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-26 00:35:59,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-26 00:36:00,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-26 00:36:00,748 [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-26 00:36:01,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-26 00:36:01,680 [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-26 00:36:01,681 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-26 00:36:02,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-26 00:36:02,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-26 00:36:03,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-26 00:36:03,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-26 00:36:03,680 [ scc.repo] DEBUG ## Branches found:
2024-04-26 00:36:03,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-04-26 00:36:03,680 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:36:03,680 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:36:03,687 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-26 00:36:03,693 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 00:36:03,694 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-26 00:36:03,700 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-26 00:36:03,706 [ scc.git] DEBUG Already up to date.
2024-04-26 00:36:03,706 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-26 00:36:04,149 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-04-26 00:36:04,150 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-26 00:36:04,157 [ scc.git] DEBUG ## Unique users: []
2024-04-26 00:36:04,157 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:36:04,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:36:04,163 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-26 00:36:04,170 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:36:04,174 [ 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-26 00:36:04,281 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-26 00:36:04,281 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-26 00:36:04,281 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-26 00:36:04,281 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-26 00:36:04,288 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-26 00:36:04,295 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-04-26 00:36:04,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:36:04,452 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-26 00:36:04,459 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-26 00:36:04,466 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#43](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/43/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/43/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-26 00:36:04,472 [ scc.config] DEBUG Found github.token
2024-04-26 00:36:04,472 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-26 00:36:04,472 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:36:04,519 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:36:04,519 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:36:04,525 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:36:04,563 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:36:04,569 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe39ad273a0> has no local changes
2024-04-26 00:36:04,569 [ 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#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/43/)'
2024-04-26 00:36:04,578 [ scc.git] DEBUG [detached HEAD 6973e13] merge master -Dorg -Ssuccess-only
2024-04-26 00:36:04,579 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-26 00:36:04,579 [ scc.repo] DEBUG ## PRs found:
2024-04-26 00:36:05,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-04-26 00:36:05,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549 HTTP/1.1" 200 None
2024-04-26 00:36:05,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549/comments HTTP/1.1" 200 None
2024-04-26 00:36:06,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ade7fa1b5839e9b17878c38efd4f6404a5857712 HTTP/1.1" 200 None
2024-04-26 00:36:06,915 [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-26 00:36:07,401 [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-26 00:36:07,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543 HTTP/1.1" 200 None
2024-04-26 00:36:08,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543/comments HTTP/1.1" 200 None
2024-04-26 00:36:08,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-04-26 00:36:09,327 [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-26 00:36:09,797 [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-26 00:36:10,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-04-26 00:36:10,710 [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-26 00:36:11,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-04-26 00:36:11,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/status HTTP/1.1" 200 None
2024-04-26 00:36:11,642 [ scc.repo] DEBUG - PR 543 knabar 'Block UI for some long running tasks'
2024-04-26 00:36:12,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542 HTTP/1.1" 200 None
2024-04-26 00:36:12,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542/comments HTTP/1.1" 200 None
2024-04-26 00:36:12,602 [ scc.repo] DEBUG # ... Include label: include
2024-04-26 00:36:13,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-04-26 00:36:13,586 [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-26 00:36:14,045 [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-26 00:36:14,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-04-26 00:36:14,981 [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-26 00:36:15,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-04-26 00:36:15,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/status HTTP/1.1" 200 None
2024-04-26 00:36:15,850 [ scc.repo] DEBUG - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-04-26 00:36:16,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/536 HTTP/1.1" 200 None
2024-04-26 00:36:16,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/536/comments HTTP/1.1" 200 None
2024-04-26 00:36:17,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2 HTTP/1.1" 200 None
2024-04-26 00:36:17,795 [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-26 00:36:18,295 [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-26 00:36:18,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2 HTTP/1.1" 200 None
2024-04-26 00:36:19,222 [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-26 00:36:19,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2 HTTP/1.1" 200 None
2024-04-26 00:36:20,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2/status HTTP/1.1" 200 None
2024-04-26 00:36:20,149 [ scc.repo] DEBUG - PR 536 will-moore 'imgData JSON with no stateful services'
2024-04-26 00:36:20,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-04-26 00:36:21,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-04-26 00:36:21,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-04-26 00:36:22,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-04-26 00:36:22,476 [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-26 00:36:22,975 [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-26 00:36:23,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-04-26 00:36:23,882 [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-26 00:36:24,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-04-26 00:36:24,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-04-26 00:36:24,774 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-04-26 00:36:25,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/533 HTTP/1.1" 200 None
2024-04-26 00:36:25,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-04-26 00:36:26,251 [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-26 00:36:26,733 [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-26 00:36:27,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-04-26 00:36:27,604 [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-26 00:36:28,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-04-26 00:36:28,530 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545/status HTTP/1.1" 200 None
2024-04-26 00:36:28,531 [ scc.repo] DEBUG - PR 533 jburel 'use conda-forge channel'
2024-04-26 00:36:29,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-04-26 00:36:29,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-04-26 00:36:29,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-04-26 00:36:30,421 [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-26 00:36:30,911 [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-26 00:36:31,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-04-26 00:36:31,820 [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-26 00:36:32,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-04-26 00:36:32,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-04-26 00:36:32,737 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-04-26 00:36:33,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-04-26 00:36:33,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-04-26 00:36:34,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615 HTTP/1.1" 200 None
2024-04-26 00:36:34,692 [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-26 00:36:35,234 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615 HTTP/1.1" 200 None
2024-04-26 00:36:35,648 [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-26 00:36:35,649 [ scc.repo] DEBUG - PR 168 stick 'Changes to nginx @maintenance handler'
2024-04-26 00:36:35,650 [ scc.repo] DEBUG ## Branches found:
2024-04-26 00:36:35,650 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-04-26 00:36:35,650 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:36:35,650 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:36:35,657 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-26 00:36:35,662 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-26 00:36:35,662 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-26 00:36:35,667 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-26 00:36:35,672 [ scc.git] DEBUG Already up to date.
2024-04-26 00:36:35,672 [ scc.git] DEBUG Calling 'git fetch origin pull/168/head'
2024-04-26 00:36:36,353 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-26 00:36:36,353 [ scc.git] DEBUG * branch refs/pull/168/head -> FETCH_HEAD
2024-04-26 00:36:36,359 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-04-26 00:36:36,947 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-26 00:36:36,947 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-04-26 00:36:36,953 [ scc.git] DEBUG Calling 'git fetch origin pull/533/head'
2024-04-26 00:36:37,351 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-26 00:36:37,351 [ scc.git] DEBUG * branch refs/pull/533/head -> FETCH_HEAD
2024-04-26 00:36:37,358 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-04-26 00:36:37,780 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-26 00:36:37,780 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-04-26 00:36:37,786 [ scc.git] DEBUG Calling 'git fetch origin pull/536/head'
2024-04-26 00:36:38,681 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-26 00:36:38,681 [ scc.git] DEBUG * branch refs/pull/536/head -> FETCH_HEAD
2024-04-26 00:36:38,686 [ scc.git] DEBUG Calling 'git fetch origin pull/542/head'
2024-04-26 00:36:39,412 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-26 00:36:39,412 [ scc.git] DEBUG * branch refs/pull/542/head -> FETCH_HEAD
2024-04-26 00:36:39,418 [ scc.git] DEBUG Calling 'git fetch origin pull/543/head'
2024-04-26 00:36:40,496 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-26 00:36:40,496 [ scc.git] DEBUG * branch refs/pull/543/head -> FETCH_HEAD
2024-04-26 00:36:40,503 [ scc.git] DEBUG ## Unique users: []
2024-04-26 00:36:40,503 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:36:40,504 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:36:40,508 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-04-26 00:36:40,522 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:36:40,527 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 168 (Changes to nginx @maintenance handler) 219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-04-26 00:36:40,613 [ scc.git] DEBUG Auto-merging test/unit/test_web.py
2024-04-26 00:36:40,613 [ scc.git] DEBUG CONFLICT (content): Merge conflict in test/unit/test_web.py
2024-04-26 00:36:40,615 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-26 00:36:40,616 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-26 00:36:40,624 [ scc.git] DEBUG Calling 'git reset --hard e1b1355ebd4f9de8b855dd2c55f59d86c061a81b'
2024-04-26 00:36:40,634 [ scc.git] DEBUG HEAD is now at e1b1355eb Merge pull request #540 from will-moore/django_template_context_processors_request
2024-04-26 00:36:40,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:36:40,791 [ scc.git] DEBUG Calling 'git merge-base e1b1355ebd4f9de8b855dd2c55f59d86c061a81b 219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-04-26 00:36:40,807 [ scc.git] DEBUG Calling 'git diff --name-only 632d14a9cab5319c6b1bd9190d441a95e457103b..e1b1355ebd4f9de8b855dd2c55f59d86c061a81b'
2024-04-26 00:36:40,902 [ scc.git] INFO - PR 168 stick 'Changes to nginx @maintenance handler'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#43](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/43/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/43/consoleText) for more details.
Possible conflicts:
- Upstream changes
- test/unit/test_web.py
--conflicts
2024-04-26 00:36:40,907 [ scc.config] DEBUG Found github.token
2024-04-26 00:36:40,907 [ scc.git] DEBUG Not adding comment to issue #168, already --conflicts.
2024-04-26 00:36:40,907 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-04-26 00:36:40,913 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:36:40,918 [ 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-26 00:36:41,049 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-04-26 00:36:41,049 [ scc.git] DEBUG Auto-merging setup.py
2024-04-26 00:36:41,050 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:36:41,054 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-04-26 00:36:41,054 [ scc.git] DEBUG setup.py | 1 +
2024-04-26 00:36:41,054 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-04-26 00:36:41,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:36:41,202 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e335980be1e7197826687f6c322a60c61b4aa545'
2024-04-26 00:36:41,209 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:36:41,213 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 533 (use conda-forge channel) e335980be1e7197826687f6c322a60c61b4aa545'
2024-04-26 00:36:41,235 [ scc.git] DEBUG Auto-merging README.rst
2024-04-26 00:36:41,237 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:36:41,240 [ scc.git] DEBUG README.rst | 3 +--
2024-04-26 00:36:41,240 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 2 deletions(-)
2024-04-26 00:36:41,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:36:41,627 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-04-26 00:36:41,633 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:36:41,638 [ 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-26 00:36:41,745 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-04-26 00:36:41,745 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-04-26 00:36:41,746 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:36:41,753 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-04-26 00:36:41,753 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-04-26 00:36:41,753 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-04-26 00:36:42,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:36:42,028 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...412fa66a52477fb77319a35147313a6f3cf481a2'
2024-04-26 00:36:42,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:36:42,039 [ 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-26 00:36:42,141 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py
2024-04-26 00:36:42,141 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-04-26 00:36:42,142 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:36:42,147 [ scc.git] DEBUG omeroweb/webclient/views.py | 4 +-
2024-04-26 00:36:42,147 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 135 ++++++++++++++++++++++++++++++++++++++---
2024-04-26 00:36:42,147 [ scc.git] DEBUG omeroweb/webgateway/util.py | 38 ++++++++++++
2024-04-26 00:36:42,147 [ scc.git] DEBUG 3 files changed, 166 insertions(+), 11 deletions(-)
2024-04-26 00:36:42,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:36:42,427 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...977f7b65169e6dee479197a9156993bbadd2d2e2'
2024-04-26 00:36:42,434 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:36:42,440 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 542 (PlateAcquisition filtering with plate display) 977f7b65169e6dee479197a9156993bbadd2d2e2'
2024-04-26 00:36:42,733 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py
2024-04-26 00:36:42,735 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:36:42,742 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 13 +++-------
2024-04-26 00:36:42,743 [ scc.git] DEBUG .../webclient/templates/webclient/data/plate.html | 10 ++++----
2024-04-26 00:36:42,743 [ scc.git] DEBUG omeroweb/webclient/views.py | 17 ++++++++++++
2024-04-26 00:36:42,743 [ scc.git] DEBUG omeroweb/webgateway/plategrid.py | 30 +++++++++++++++++++---
2024-04-26 00:36:42,743 [ scc.git] DEBUG .../static/webgateway/js/ome.plateview.js | 16 +++++++-----
2024-04-26 00:36:42,743 [ scc.git] DEBUG omeroweb/webgateway/urls.py | 2 +-
2024-04-26 00:36:42,743 [ scc.git] DEBUG omeroweb/webgateway/views.py | 16 ++++++++++--
2024-04-26 00:36:42,743 [ scc.git] DEBUG 7 files changed, 78 insertions(+), 26 deletions(-)
2024-04-26 00:36:42,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:36:42,905 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4'
2024-04-26 00:36:42,914 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:36:42,918 [ 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-26 00:36:43,032 [ scc.git] DEBUG Auto-merging omeroweb/webclient/templates/webclient/data/includes/center_plugin.thumbs.js.html
2024-04-26 00:36:43,033 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-26 00:36:43,039 [ scc.git] DEBUG .../webclient/javascript/ome.progress_overlay.js | 60 ++++++
2024-04-26 00:36:43,039 [ scc.git] DEBUG .../webclient/javascript/ome.webclient.actions.js | 112 +++++++-----
2024-04-26 00:36:43,039 [ scc.git] DEBUG .../webclient/annotations/metadata_preview.html | 51 +++---
2024-04-26 00:36:43,039 [ scc.git] DEBUG .../webclient/templates/webclient/base/base.html | 1 +
2024-04-26 00:36:43,039 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 2 +-
2024-04-26 00:36:43,039 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 16 +-
2024-04-26 00:36:43,039 [ scc.git] DEBUG .../static/webgateway/js/ome.gs_utils.js | 201 ---------------------
2024-04-26 00:36:43,039 [ scc.git] DEBUG .../webgateway/static/webgateway/js/ome.popup.js | 1 -
2024-04-26 00:36:43,040 [ scc.git] DEBUG .../webgateway/static/webgateway/js/omero_image.js | 35 ++--
2024-04-26 00:36:43,040 [ scc.git] DEBUG 9 files changed, 186 insertions(+), 293 deletions(-)
2024-04-26 00:36:43,040 [ scc.git] DEBUG create mode 100644 omeroweb/webclient/static/webclient/javascript/ome.progress_overlay.js
2024-04-26 00:36:43,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:36:43,306 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-26 00:36:43,351 [ scc.git] DEBUG Get sha1 of %s
2024-04-26 00:36:43,352 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-26 00:36:43,356 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:36:43,395 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:36:43,405 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe39ad45910> has no local changes
2024-04-26 00:36:43,405 [ 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#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/43/)'
2024-04-26 00:36:43,417 [ scc.git] DEBUG [detached HEAD 45d3ce16a] merge master -Dorg -Ssuccess-only
2024-04-26 00:36:43,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-26 00:36:43,417 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-26 00:36:43,466 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-04-26 00:36:43,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:36:43,718 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-04-26 00:36:44,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:36:44,137 [ scc.config] DEBUG Found submodule.omero-py.url
2024-04-26 00:36:44,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:36:44,539 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-04-26 00:36:44,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:36:44,939 [ scc.config] DEBUG Found submodule.omero-web.url
2024-04-26 00:36:45,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-26 00:36:45,356 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-26 00:36:45,385 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fe39be8be80> has local changes
2024-04-26 00:36:45,385 [ 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#43 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/43/)'
2024-04-26 00:36:45,413 [ scc.git] DEBUG [detached HEAD cfdf321] merge master -Dorg -Ssuccess-only
2024-04-26 00:36:45,413 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-04-26 00:36:45,413 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-04-26 00:36:45,413 [ scc.merge] INFO Already up to date.
2024-04-26 00:36:45,413 [ scc.merge] INFO
2024-04-26 00:36:45,413 [ scc.merge] INFO
2024-04-26 00:36:45,413 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-04-26 00:36:45,413 [ scc.merge] INFO Already up to date.
2024-04-26 00:36:45,413 [ scc.merge] INFO
2024-04-26 00:36:45,414 [ scc.merge] INFO Merged PRs:
2024-04-26 00:36:45,414 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-04-26 00:36:45,414 [ scc.merge] INFO - PR 23 sbesson 'Remove python-future compatibility code'
2024-04-26 00:36:45,414 [ scc.merge] INFO
2024-04-26 00:36:45,414 [ scc.merge] INFO Repository: ome/omero-marshal
2024-04-26 00:36:45,414 [ scc.merge] INFO Excluded PRs:
2024-04-26 00:36:45,414 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-04-26 00:36:45,414 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-04-26 00:36:45,414 [ scc.merge] INFO Already up to date.
2024-04-26 00:36:45,414 [ scc.merge] INFO
2024-04-26 00:36:45,414 [ scc.merge] INFO Merged PRs:
2024-04-26 00:36:45,414 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-04-26 00:36:45,414 [ scc.merge] INFO
2024-04-26 00:36:45,414 [ scc.merge] INFO Repository: ome/omero-py
2024-04-26 00:36:45,414 [ scc.merge] INFO Excluded PRs:
2024-04-26 00:36:45,414 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-04-26 00:36:45,414 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-04-26 00:36:45,414 [ scc.merge] INFO - PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
2024-04-26 00:36:45,414 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-04-26 00:36:45,414 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-04-26 00:36:45,414 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-04-26 00:36:45,414 [ scc.merge] INFO Already up to date.
2024-04-26 00:36:45,414 [ scc.merge] INFO
2024-04-26 00:36:45,414 [ scc.merge] INFO Merged PRs:
2024-04-26 00:36:45,414 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-04-26 00:36:45,414 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-04-26 00:36:45,414 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-04-26 00:36:45,414 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-04-26 00:36:45,414 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-04-26 00:36:45,414 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-04-26 00:36:45,414 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-04-26 00:36:45,414 [ scc.merge] INFO
2024-04-26 00:36:45,414 [ scc.merge] INFO Repository: ome/omero-scripts
2024-04-26 00:36:45,414 [ scc.merge] INFO Excluded PRs:
2024-04-26 00:36:45,414 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-26 00:36:45,415 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-26 00:36:45,415 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-26 00:36:45,415 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-26 00:36:45,415 [ scc.merge] INFO Already up to date.
2024-04-26 00:36:45,415 [ scc.merge] INFO
2024-04-26 00:36:45,415 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-26 00:36:45,415 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-26 00:36:45,415 [ scc.merge] INFO
2024-04-26 00:36:45,415 [ scc.merge] INFO Repository: ome/omero-web
2024-04-26 00:36:45,415 [ scc.merge] INFO Excluded PRs:
2024-04-26 00:36:45,415 [ scc.merge] INFO - PR 549 knabar 'Remove webgateway cache' (status: failure)
2024-04-26 00:36:45,415 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-04-26 00:36:45,415 [ scc.merge] INFO Already up to date.
2024-04-26 00:36:45,415 [ scc.merge] INFO
2024-04-26 00:36:45,415 [ scc.merge] INFO Merged PRs:
2024-04-26 00:36:45,415 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-04-26 00:36:45,415 [ scc.merge] INFO - PR 533 jburel 'use conda-forge channel'
2024-04-26 00:36:45,415 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-04-26 00:36:45,415 [ scc.merge] INFO - PR 536 will-moore 'imgData JSON with no stateful services'
2024-04-26 00:36:45,415 [ scc.merge] INFO - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-04-26 00:36:45,415 [ scc.merge] INFO - PR 543 knabar 'Block UI for some long running tasks'
2024-04-26 00:36:45,415 [ scc.merge] INFO
2024-04-26 00:36:45,415 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-26 00:36:45,415 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler'
2024-04-26 00:36:45,415 [ scc.merge] INFO
2024-04-26 00:36:45,415 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-26 00:36:45,415 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:36:45,420 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-04-26 00:36:45,420 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:36:45,424 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-26 00:36:45,424 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-04-26 00:36:45,425 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:36:45,428 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-26 00:36:45,429 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-04-26 00:36:45,429 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:36:45,432 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-26 00:36:45,433 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-04-26 00:36:45,433 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:36:45,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-26 00:36:45,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-04-26 00:36:45,437 [ scc.git] DEBUG Calling 'git remote'
2024-04-26 00:36:45,441 [ 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-26 00:37:15,381 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/d0200910/images/svgs/logo.svg){kind=logo}
