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-30 00:35:06,370 [ scc.config] DEBUG Found github.token
2024-04-30 00:35:06,373 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-04-30 00:35:06,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:35:07,035 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:35:07,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-04-30 00:35:07,438 [ scc.gh] DEBUG 4908 remaining from 5000 (Reset at 01:04
2024-04-30 00:35:07,439 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-30 00:35:07,444 [ scc.git] DEBUG Check current status
2024-04-30 00:35:07,444 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-30 00:35:07,448 [ scc.git] DEBUG 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-04-30 00:35:07,449 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-30 00:35:07,514 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-04-30 00:35:07,518 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-04-30 00:35:07,541 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-04-30 00:35:07,546 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-04-30 00:35:07,656 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-04-30 00:35:07,661 [ scc.config] DEBUG Found remote.origin.url
2024-04-30 00:35:07,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-04-30 00:35:08,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-30 00:35:08,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-30 00:35:09,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-30 00:35:09,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-30 00:35:09,680 [ scc.git] DEBUG Resetting...
2024-04-30 00:35:09,680 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-04-30 00:35:09,688 [ scc.git] DEBUG HEAD is now at 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-04-30 00:35:09,688 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-04-30 00:35:09,742 [ scc.git] DEBUG Check current status
2024-04-30 00:35:09,743 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-30 00:35:09,748 [ scc.git] DEBUG 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-04-30 00:35:09,748 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-30 00:35:09,788 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-04-30 00:35:09,791 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-04-30 00:35:09,795 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-04-30 00:35:09,799 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-04-30 00:35:09,802 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-04-30 00:35:09,803 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-04-30 00:35:09,803 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-04-30 00:35:09,804 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-04-30 00:35:09,804 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-04-30 00:35:09,804 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-04-30 00:35:09,804 [ scc.repo] DEBUG ## PRs found:
2024-04-30 00:35:10,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-04-30 00:35:10,130 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:35:10,130 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:35:10,130 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:35:10,135 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-30 00:35:10,139 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:35:10,140 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-30 00:35:10,144 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-30 00:35:10,149 [ scc.git] DEBUG Already up to date.
2024-04-30 00:35:10,150 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:35:10,150 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:35:10,150 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:35:10,154 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:35:10,204 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:35:10,204 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:35:10,211 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:35:10,378 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f91e22e6e80> has no local changes
2024-04-30 00:35:10,378 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/47/)'
2024-04-30 00:35:10,405 [ scc.git] DEBUG [detached HEAD b71dcf7] merge master -Dorg -Snone
2024-04-30 00:35:10,406 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-04-30 00:35:10,406 [ scc.merge] INFO Already up to date.
2024-04-30 00:35:10,406 [ scc.merge] INFO
2024-04-30 00:35:10,406 [ scc.merge] INFO
2024-04-30 00:35:10,406 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-30 00:35:10,406 [ 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'
From https://github.com/ome/omero-web
2b3cc87a8..64be6a671 pre-commit-ci-update-config -> origin/pre-commit-ci-update-config
Merge all submodules using repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-04-30 00:35:13,045 [ scc.config] DEBUG Found github.token
2024-04-30 00:35:13,048 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-04-30 00:35:13,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:35:13,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:35:14,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-04-30 00:35:14,095 [ scc.gh] DEBUG 4881 remaining from 5000 (Reset at 01:04
2024-04-30 00:35:14,096 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-30 00:35:14,100 [ scc.git] DEBUG Check current status
2024-04-30 00:35:14,101 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-30 00:35:14,104 [ scc.git] DEBUG b71dcf7 merge master -Dorg -Snone
2024-04-30 00:35:14,104 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-30 00:35:14,145 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-04-30 00:35:14,148 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-04-30 00:35:14,151 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-04-30 00:35:14,155 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-04-30 00:35:14,159 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-04-30 00:35:14,164 [ scc.config] DEBUG Found remote.origin.url
2024-04-30 00:35:14,164 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-04-30 00:35:14,167 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-04-30 00:35:14,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-04-30 00:35:15,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-30 00:35:15,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-30 00:35:15,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-30 00:35:16,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-30 00:35:16,316 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:35:16,369 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-04-30 00:35:16,369 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-30 00:35:16,373 [ scc.git] DEBUG Check current status
2024-04-30 00:35:16,373 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-30 00:35:16,378 [ scc.git] DEBUG 5863350 Merge pull request #22 from sbesson/python311
2024-04-30 00:35:16,378 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-30 00:35:16,428 [ scc.config] DEBUG Found remote.origin.url
2024-04-30 00:35:16,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-04-30 00:35:17,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-30 00:35:17,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-30 00:35:18,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-30 00:35:18,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-30 00:35:18,595 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:35:18,638 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-30 00:35:18,640 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-04-30 00:35:18,640 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-30 00:35:18,645 [ scc.git] DEBUG Check current status
2024-04-30 00:35:18,645 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-30 00:35:18,651 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-04-30 00:35:18,651 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-30 00:35:18,696 [ scc.config] DEBUG Found remote.origin.url
2024-04-30 00:35:19,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-04-30 00:35:19,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-30 00:35:19,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-30 00:35:20,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-30 00:35:20,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-30 00:35:20,817 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:35:20,856 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-30 00:35:20,857 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-04-30 00:35:20,857 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-30 00:35:20,861 [ scc.git] DEBUG Check current status
2024-04-30 00:35:20,861 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-30 00:35:20,950 [ scc.git] DEBUG 52d9a6f4 Bump version: 5.19.2 → 5.19.3.dev0
2024-04-30 00:35:20,951 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-30 00:35:20,995 [ scc.config] DEBUG Found remote.origin.url
2024-04-30 00:35:21,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-04-30 00:35:21,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-30 00:35:22,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-30 00:35:22,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-30 00:35:23,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-30 00:35:23,086 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:35:23,131 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-30 00:35:23,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-04-30 00:35:23,132 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-30 00:35:23,137 [ scc.git] DEBUG Check current status
2024-04-30 00:35:23,137 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-30 00:35:23,154 [ scc.git] DEBUG 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-04-30 00:35:23,154 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-30 00:35:23,205 [ scc.config] DEBUG Found remote.origin.url
2024-04-30 00:35:23,206 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-04-30 00:35:23,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-04-30 00:35:24,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-30 00:35:24,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-30 00:35:24,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-30 00:35:25,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-30 00:35:25,324 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:35:25,363 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-30 00:35:25,364 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-04-30 00:35:25,364 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-30 00:35:25,369 [ scc.git] DEBUG Check current status
2024-04-30 00:35:25,369 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-30 00:35:25,373 [ scc.git] DEBUG e1b1355eb Merge pull request #540 from will-moore/django_template_context_processors_request
2024-04-30 00:35:25,373 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-30 00:35:25,411 [ scc.config] DEBUG Found remote.origin.url
2024-04-30 00:35:25,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-04-30 00:35:26,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-30 00:35:26,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-30 00:35:27,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-30 00:35:27,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-30 00:35:27,519 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:35:27,571 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-30 00:35:27,571 [ scc.git] DEBUG Resetting...
2024-04-30 00:35:27,571 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-04-30 00:35:27,578 [ scc.git] DEBUG HEAD is now at b71dcf7 merge master -Dorg -Snone
2024-04-30 00:35:27,578 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-04-30 00:35:27,639 [ scc.git] DEBUG Check current status
2024-04-30 00:35:27,639 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-30 00:35:27,644 [ scc.git] DEBUG b71dcf7 merge master -Dorg -Snone
2024-04-30 00:35:27,644 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-30 00:35:27,689 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-04-30 00:35:27,692 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-04-30 00:35:27,696 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-04-30 00:35:27,700 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-04-30 00:35:27,703 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-04-30 00:35:27,705 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-04-30 00:35:27,705 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-04-30 00:35:27,705 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-04-30 00:35:27,705 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-04-30 00:35:27,705 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-04-30 00:35:27,705 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-04-30 00:35:27,705 [ scc.repo] DEBUG ## PRs found:
2024-04-30 00:35:27,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 2
2024-04-30 00:35:27,956 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:35:27,956 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:35:27,956 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:35:27,963 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-30 00:35:27,969 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:35:27,969 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-30 00:35:27,976 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-30 00:35:27,982 [ scc.git] DEBUG Already up to date.
2024-04-30 00:35:27,982 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:35:27,982 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:35:27,982 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:35:27,987 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:35:28,034 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:35:28,035 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:35:28,041 [ scc.repo] DEBUG ## PRs found:
2024-04-30 00:35:28,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-04-30 00:35:28,976 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23 HTTP/1.1" 200 None
2024-04-30 00:35:29,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23/comments HTTP/1.1" 200 None
2024-04-30 00:35:29,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None
2024-04-30 00:35:30,470 [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-30 00:35:30,942 [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-30 00:35:31,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None
2024-04-30 00:35:31,864 [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-30 00:35:31,865 [ scc.repo] DEBUG - PR 23 sbesson 'Remove python-future compatibility code'
2024-04-30 00:35:32,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-04-30 00:35:32,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-04-30 00:35:33,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-04-30 00:35:33,766 [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-30 00:35:34,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-04-30 00:35:34,690 [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-30 00:35:34,691 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-04-30 00:35:34,691 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:35:34,692 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-04-30 00:35:34,692 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:35:34,692 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:35:34,698 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-30 00:35:34,702 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:35:34,703 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-30 00:35:34,707 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-30 00:35:34,713 [ scc.git] DEBUG Already up to date.
2024-04-30 00:35:34,713 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-04-30 00:35:35,126 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-04-30 00:35:35,127 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-04-30 00:35:35,133 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head'
2024-04-30 00:35:35,518 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-04-30 00:35:35,519 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD
2024-04-30 00:35:35,525 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:35:35,525 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:35:35,525 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:35:35,531 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-04-30 00:35:35,539 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:35:35,544 [ 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-30 00:35:35,628 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:35:35,634 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-04-30 00:35:35,634 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-04-30 00:35:35,635 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-04-30 00:35:35,637 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-04-30 00:35:35,638 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-04-30 00:35:35,638 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-04-30 00:35:35,638 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-04-30 00:35:35,639 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-04-30 00:35:35,639 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-04-30 00:35:35,639 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-04-30 00:35:35,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:35:35,787 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8'
2024-04-30 00:35:35,794 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:35:35,799 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 23 (Remove python-future compatibility code) 9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8'
2024-04-30 00:35:35,941 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-04-30 00:35:35,941 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-04-30 00:35:35,941 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-04-30 00:35:35,941 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-04-30 00:35:35,941 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-04-30 00:35:35,941 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-04-30 00:35:35,942 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-04-30 00:35:35,942 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-04-30 00:35:35,942 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-04-30 00:35:35,942 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:35:35,948 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-04-30 00:35:35,948 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++--
2024-04-30 00:35:35,948 [ scc.git] DEBUG .github/workflows/tox.yml | 5 ++--
2024-04-30 00:35:35,948 [ scc.git] DEBUG Dockerfile | 32 ----------------------
2024-04-30 00:35:35,948 [ scc.git] DEBUG setup.py | 2 +-
2024-04-30 00:35:35,948 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 1 -
2024-04-30 00:35:35,948 [ scc.git] DEBUG src/fsDirectory.py | 8 +-----
2024-04-30 00:35:35,949 [ scc.git] DEBUG src/fsDropBox.py | 8 +-----
2024-04-30 00:35:35,949 [ scc.git] DEBUG src/fsDropBoxMonitorClient.py | 11 +-------
2024-04-30 00:35:35,949 [ scc.git] DEBUG src/fsFileServer.py | 12 ++-------
2024-04-30 00:35:35,949 [ scc.git] DEBUG src/fsLists.py | 2 --
2024-04-30 00:35:35,949 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 9 +------
2024-04-30 00:35:35,949 [ scc.git] DEBUG src/fsMonitor.py | 2 --
2024-04-30 00:35:35,949 [ scc.git] DEBUG src/fsMonitorServer.py | 8 +++---
2024-04-30 00:35:35,949 [ scc.git] DEBUG src/fsNotificationScheduler.py | 3 ---
2024-04-30 00:35:35,949 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 21 +++++----------
2024-04-30 00:35:35,949 [ scc.git] DEBUG src/fsUtil.py | 9 +++----
2024-04-30 00:35:35,949 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 8 +-----
2024-04-30 00:35:35,949 [ scc.git] DEBUG test/conftest.py | 2 --
2024-04-30 00:35:35,949 [ scc.git] DEBUG test/drivers.py | 17 +++---------
2024-04-30 00:35:35,949 [ scc.git] DEBUG test/unit/test_drivers.py | 55 ++++++++++++++++----------------------
2024-04-30 00:35:35,949 [ scc.git] DEBUG test/unit/test_monitor.py | 2 --
2024-04-30 00:35:35,949 [ scc.git] DEBUG test/unit/test_replay.py | 8 +-----
2024-04-30 00:35:35,949 [ scc.git] DEBUG test/unit/test_state.py | 1 -
2024-04-30 00:35:35,949 [ scc.git] DEBUG tox.ini | 3 ++-
2024-04-30 00:35:35,949 [ scc.git] DEBUG 25 files changed, 59 insertions(+), 178 deletions(-)
2024-04-30 00:35:35,949 [ scc.git] DEBUG delete mode 100644 Dockerfile
2024-04-30 00:35:36,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:35:36,227 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:35:36,277 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:35:36,277 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:35:36,284 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:35:36,326 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:35:36,335 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb5cab063d0> has no local changes
2024-04-30 00:35:36,335 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/47/)'
2024-04-30 00:35:36,344 [ scc.git] DEBUG [detached HEAD 833c9f3] merge master -Dorg -Ssuccess-only
2024-04-30 00:35:36,345 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-30 00:35:36,345 [ scc.repo] DEBUG ## PRs found:
2024-04-30 00:35:36,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-04-30 00:35:37,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-04-30 00:35:37,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-04-30 00:35:38,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-04-30 00:35:38,746 [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-30 00:35:39,230 [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-30 00:35:39,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-04-30 00:35:40,151 [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-30 00:35:40,152 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-04-30 00:35:40,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-04-30 00:35:41,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-04-30 00:35:41,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-04-30 00:35:41,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-04-30 00:35:42,001 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:35:42,001 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-04-30 00:35:42,001 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:35:42,001 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:35:42,007 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-30 00:35:42,012 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:35:42,013 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-30 00:35:42,018 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-30 00:35:42,024 [ scc.git] DEBUG Already up to date.
2024-04-30 00:35:42,024 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-04-30 00:35:42,511 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-04-30 00:35:42,511 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-04-30 00:35:42,519 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:35:42,520 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:35:42,520 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:35:42,526 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-04-30 00:35:42,532 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:35:42,538 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-04-30 00:35:42,566 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-04-30 00:35:42,567 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:35:42,570 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-04-30 00:35:42,570 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-04-30 00:35:42,571 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-04-30 00:35:42,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:35:42,739 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:35:42,789 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:35:42,789 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:35:42,795 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:35:42,838 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:35:42,845 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb5caa9ef10> has no local changes
2024-04-30 00:35:42,845 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/47/)'
2024-04-30 00:35:42,854 [ scc.git] DEBUG [detached HEAD 3266aa4] merge master -Dorg -Ssuccess-only
2024-04-30 00:35:42,855 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-30 00:35:42,855 [ scc.repo] DEBUG ## PRs found:
2024-04-30 00:35:43,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-04-30 00:35:43,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/407 HTTP/1.1" 200 None
2024-04-30 00:35:44,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/407/comments HTTP/1.1" 200 None
2024-04-30 00:35:44,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/48ee525426aef7e8f8701c27d99ee24dbe13af02 HTTP/1.1" 200 None
2024-04-30 00:35:45,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/48ee525426aef7e8f8701c27d99ee24dbe13af02/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-30 00:35:45,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/48ee525426aef7e8f8701c27d99ee24dbe13af02/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-30 00:35:46,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/48ee525426aef7e8f8701c27d99ee24dbe13af02 HTTP/1.1" 200 None
2024-04-30 00:35:46,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/48ee525426aef7e8f8701c27d99ee24dbe13af02?per_page=1 HTTP/1.1" 200 None
2024-04-30 00:35:47,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/48ee525426aef7e8f8701c27d99ee24dbe13af02 HTTP/1.1" 200 None
2024-04-30 00:35:47,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/48ee525426aef7e8f8701c27d99ee24dbe13af02/status HTTP/1.1" 200 None
2024-04-30 00:35:47,545 [ scc.repo] DEBUG - PR 407 jburel 'Remove ref to ome channel for zeroc-ice'
2024-04-30 00:35:48,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-04-30 00:35:48,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-04-30 00:35:48,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-04-30 00:35:49,417 [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-30 00:35:49,866 [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-30 00:35:50,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-04-30 00:35:50,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-04-30 00:35:51,330 [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-30 00:35:51,806 [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-30 00:35:52,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-04-30 00:35:52,677 [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-30 00:35:53,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-04-30 00:35:53,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-04-30 00:35:53,534 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-04-30 00:35:54,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-04-30 00:35:54,014 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-04-30 00:35:54,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378 HTTP/1.1" 200 None
2024-04-30 00:35:54,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378/comments HTTP/1.1" 200 None
2024-04-30 00:35:55,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-04-30 00:35:55,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-04-30 00:35:56,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-04-30 00:35:56,804 [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-30 00:35:57,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-04-30 00:35:57,727 [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-30 00:35:57,728 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-04-30 00:35:58,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-04-30 00:35:58,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-04-30 00:35:59,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-04-30 00:35:59,608 [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-30 00:36:00,069 [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-30 00:36:00,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-04-30 00:36:00,958 [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-30 00:36:01,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-04-30 00:36:01,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-04-30 00:36:01,847 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-04-30 00:36:02,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-04-30 00:36:02,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-04-30 00:36:03,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-04-30 00:36:03,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-04-30 00:36:04,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-04-30 00:36:04,702 [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-30 00:36:05,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-04-30 00:36:05,596 [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-30 00:36:05,597 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-04-30 00:36:06,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-04-30 00:36:06,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-04-30 00:36:07,002 [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-30 00:36:07,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-04-30 00:36:07,857 [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-30 00:36:07,858 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-04-30 00:36:08,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-04-30 00:36:08,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-04-30 00:36:09,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-04-30 00:36:09,800 [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-30 00:36:10,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-04-30 00:36:10,752 [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-30 00:36:10,752 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-04-30 00:36:11,217 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-04-30 00:36:11,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-04-30 00:36:12,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-04-30 00:36:12,637 [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-30 00:36:13,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-04-30 00:36:13,512 [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-30 00:36:13,513 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-04-30 00:36:13,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-04-30 00:36:14,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-04-30 00:36:14,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-04-30 00:36:15,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-04-30 00:36:15,431 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:36:15,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-04-30 00:36:15,432 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:36:15,432 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:36:15,437 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-30 00:36:15,442 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:36:15,442 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-30 00:36:15,448 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-30 00:36:15,454 [ scc.git] DEBUG Already up to date.
2024-04-30 00:36:15,454 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-04-30 00:36:16,211 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-30 00:36:16,212 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-04-30 00:36:16,217 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-04-30 00:36:16,700 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-30 00:36:16,700 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-04-30 00:36:16,705 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-04-30 00:36:17,157 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-30 00:36:17,157 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-04-30 00:36:17,163 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-04-30 00:36:17,602 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-30 00:36:17,603 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-04-30 00:36:17,609 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-04-30 00:36:18,189 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-30 00:36:18,189 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-04-30 00:36:18,194 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-04-30 00:36:18,554 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-30 00:36:18,554 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-04-30 00:36:18,559 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-04-30 00:36:18,972 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-30 00:36:18,972 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-04-30 00:36:18,979 [ scc.git] DEBUG Calling 'git fetch origin pull/407/head'
2024-04-30 00:36:19,615 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-30 00:36:19,616 [ scc.git] DEBUG * branch refs/pull/407/head -> FETCH_HEAD
2024-04-30 00:36:19,619 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:36:19,619 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:36:19,619 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:36:19,625 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-04-30 00:36:19,637 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:36:19,642 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-04-30 00:36:19,725 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-04-30 00:36:19,725 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-04-30 00:36:19,726 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:36:19,731 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-04-30 00:36:19,731 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-04-30 00:36:19,731 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-04-30 00:36:19,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:36:19,907 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-04-30 00:36:19,919 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:36:19,924 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-04-30 00:36:20,044 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-04-30 00:36:20,044 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-04-30 00:36:20,051 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:36:20,060 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-04-30 00:36:20,061 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-04-30 00:36:20,061 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-04-30 00:36:20,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:36:20,318 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-04-30 00:36:20,332 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:36:20,338 [ 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-30 00:36:20,419 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-04-30 00:36:20,421 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:36:20,424 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-04-30 00:36:20,424 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-04-30 00:36:20,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:36:20,727 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-04-30 00:36:20,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:36:20,745 [ 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-30 00:36:20,845 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-04-30 00:36:20,845 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-04-30 00:36:20,857 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:36:20,862 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-04-30 00:36:20,862 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-04-30 00:36:20,862 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-04-30 00:36:21,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:36:21,146 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-04-30 00:36:21,158 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:36:21,165 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-04-30 00:36:21,194 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:36:21,197 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-04-30 00:36:21,197 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-04-30 00:36:21,197 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-04-30 00:36:21,197 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-04-30 00:36:21,197 [ scc.git] DEBUG create mode 100644 connect.py
2024-04-30 00:36:21,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:36:21,547 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-04-30 00:36:21,559 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:36:21,565 [ 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-30 00:36:21,618 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-04-30 00:36:21,620 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:36:21,624 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-04-30 00:36:21,624 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-30 00:36:21,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:36:21,971 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-04-30 00:36:21,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:36:21,988 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-04-30 00:36:22,026 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-04-30 00:36:22,027 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:36:22,031 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-04-30 00:36:22,031 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-04-30 00:36:22,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:36:22,378 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...48ee525426aef7e8f8701c27d99ee24dbe13af02'
2024-04-30 00:36:22,389 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:36:22,394 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 407 (Remove ref to ome channel for zeroc-ice) 48ee525426aef7e8f8701c27d99ee24dbe13af02'
2024-04-30 00:36:22,414 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:36:22,417 [ scc.git] DEBUG .github/workflows/workflow.yml | 2 +-
2024-04-30 00:36:22,417 [ scc.git] DEBUG README.rst | 14 +++++++-------
2024-04-30 00:36:22,417 [ scc.git] DEBUG 2 files changed, 8 insertions(+), 8 deletions(-)
2024-04-30 00:36:22,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:36:22,776 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:36:22,818 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:36:22,819 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:36:22,823 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:36:22,864 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:36:22,874 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb5c9a42760> has no local changes
2024-04-30 00:36:22,874 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-py
Excluded PRs:
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 407 jburel 'Remove ref to ome channel for zeroc-ice'
Generated by OMERO-python-superbuild-push#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/47/)'
2024-04-30 00:36:22,888 [ scc.git] DEBUG [detached HEAD 27c621df] merge master -Dorg -Ssuccess-only
2024-04-30 00:36:22,888 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-30 00:36:22,889 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-30 00:36:22,889 [ scc.repo] DEBUG ## PRs found:
2024-04-30 00:36:23,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-30 00:36:23,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-30 00:36:24,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-30 00:36:24,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-30 00:36:25,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-30 00:36:25,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-30 00:36:26,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-30 00:36:26,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-30 00:36:27,109 [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-30 00:36:27,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-30 00:36:27,974 [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-30 00:36:27,976 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-30 00:36:28,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-30 00:36:29,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-30 00:36:29,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-30 00:36:30,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-30 00:36:30,003 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:36:30,003 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-04-30 00:36:30,003 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:36:30,003 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:36:30,009 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-30 00:36:30,014 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:36:30,014 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-30 00:36:30,019 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-30 00:36:30,025 [ scc.git] DEBUG Already up to date.
2024-04-30 00:36:30,026 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-30 00:36:30,510 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-04-30 00:36:30,511 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-30 00:36:30,516 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:36:30,516 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:36:30,516 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:36:30,522 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-30 00:36:30,528 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:36:30,533 [ 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-30 00:36:30,635 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-30 00:36:30,635 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-30 00:36:30,635 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-30 00:36:30,635 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-30 00:36:30,642 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-30 00:36:30,649 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-04-30 00:36:30,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:36:30,809 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-30 00:36:30,817 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-04-30 00:36:30,824 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#47](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/47/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/47/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-30 00:36:30,831 [ scc.config] DEBUG Found github.token
2024-04-30 00:36:30,831 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-30 00:36:30,831 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:36:30,876 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:36:30,876 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:36:30,881 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:36:30,924 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:36:30,931 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb5c9a4a640> has no local changes
2024-04-30 00:36:30,931 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/47/)'
2024-04-30 00:36:30,940 [ scc.git] DEBUG [detached HEAD 65e51f2] merge master -Dorg -Ssuccess-only
2024-04-30 00:36:30,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-30 00:36:30,941 [ scc.repo] DEBUG ## PRs found:
2024-04-30 00:36:31,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-04-30 00:36:31,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/553 HTTP/1.1" 200 None
2024-04-30 00:36:32,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549 HTTP/1.1" 200 None
2024-04-30 00:36:32,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549/comments HTTP/1.1" 200 None
2024-04-30 00:36:33,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ade7fa1b5839e9b17878c38efd4f6404a5857712 HTTP/1.1" 200 None
2024-04-30 00:36:33,790 [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-30 00:36:34,324 [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-30 00:36:34,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543 HTTP/1.1" 200 None
2024-04-30 00:36:35,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543/comments HTTP/1.1" 200 None
2024-04-30 00:36:35,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-04-30 00:36:36,218 [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-30 00:36:36,696 [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-30 00:36:37,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-04-30 00:36:37,555 [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-30 00:36:38,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-04-30 00:36:38,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/status HTTP/1.1" 200 None
2024-04-30 00:36:38,472 [ scc.repo] DEBUG - PR 543 knabar 'Block UI for some long running tasks'
2024-04-30 00:36:38,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542 HTTP/1.1" 200 None
2024-04-30 00:36:39,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542/comments HTTP/1.1" 200 None
2024-04-30 00:36:39,455 [ scc.repo] DEBUG # ... Include label: include
2024-04-30 00:36:39,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-04-30 00:36:40,416 [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-30 00:36:40,887 [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-30 00:36:41,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-04-30 00:36:41,796 [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-30 00:36:42,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-04-30 00:36:42,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/status HTTP/1.1" 200 None
2024-04-30 00:36:42,721 [ scc.repo] DEBUG - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-04-30 00:36:43,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/536 HTTP/1.1" 200 None
2024-04-30 00:36:43,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/536/comments HTTP/1.1" 200 None
2024-04-30 00:36:44,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2 HTTP/1.1" 200 None
2024-04-30 00:36:44,629 [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-30 00:36:45,119 [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-30 00:36:45,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2 HTTP/1.1" 200 None
2024-04-30 00:36:46,007 [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-30 00:36:46,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2 HTTP/1.1" 200 None
2024-04-30 00:36:46,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2/status HTTP/1.1" 200 None
2024-04-30 00:36:46,925 [ scc.repo] DEBUG - PR 536 will-moore 'imgData JSON with no stateful services'
2024-04-30 00:36:47,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-04-30 00:36:47,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-04-30 00:36:48,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-04-30 00:36:48,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-04-30 00:36:49,346 [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-30 00:36:49,839 [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-30 00:36:50,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-04-30 00:36:50,859 [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-30 00:36:51,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-04-30 00:36:51,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-04-30 00:36:51,758 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-04-30 00:36:52,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/533 HTTP/1.1" 200 None
2024-04-30 00:36:52,692 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-04-30 00:36:53,178 [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-30 00:36:53,649 [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-30 00:36:54,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-04-30 00:36:54,497 [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-30 00:36:54,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-04-30 00:36:55,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545/status HTTP/1.1" 200 None
2024-04-30 00:36:55,421 [ scc.repo] DEBUG - PR 533 jburel 'use conda-forge channel'
2024-04-30 00:36:55,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-04-30 00:36:56,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-04-30 00:36:56,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-04-30 00:36:57,339 [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-30 00:36:57,861 [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-30 00:36:58,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-04-30 00:36:58,721 [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-30 00:36:59,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-04-30 00:36:59,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-04-30 00:36:59,646 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-04-30 00:37:00,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-04-30 00:37:00,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-04-30 00:37:01,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615 HTTP/1.1" 200 None
2024-04-30 00:37:01,575 [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-30 00:37:02,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615 HTTP/1.1" 200 None
2024-04-30 00:37:02,456 [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-30 00:37:02,458 [ scc.repo] DEBUG - PR 168 stick 'Changes to nginx @maintenance handler'
2024-04-30 00:37:02,459 [ scc.repo] DEBUG ## Branches found:
2024-04-30 00:37:02,459 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-04-30 00:37:02,460 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:37:02,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:37:02,472 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-30 00:37:02,483 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-30 00:37:02,484 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-30 00:37:02,491 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-30 00:37:02,509 [ scc.git] DEBUG Already up to date.
2024-04-30 00:37:02,509 [ scc.git] DEBUG Calling 'git fetch origin pull/168/head'
2024-04-30 00:37:03,275 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-30 00:37:03,275 [ scc.git] DEBUG * branch refs/pull/168/head -> FETCH_HEAD
2024-04-30 00:37:03,280 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-04-30 00:37:03,790 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-30 00:37:03,790 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-04-30 00:37:03,796 [ scc.git] DEBUG Calling 'git fetch origin pull/533/head'
2024-04-30 00:37:04,183 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-30 00:37:04,184 [ scc.git] DEBUG * branch refs/pull/533/head -> FETCH_HEAD
2024-04-30 00:37:04,189 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-04-30 00:37:04,624 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-30 00:37:04,624 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-04-30 00:37:04,628 [ scc.git] DEBUG Calling 'git fetch origin pull/536/head'
2024-04-30 00:37:05,413 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-30 00:37:05,413 [ scc.git] DEBUG * branch refs/pull/536/head -> FETCH_HEAD
2024-04-30 00:37:05,418 [ scc.git] DEBUG Calling 'git fetch origin pull/542/head'
2024-04-30 00:37:06,049 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-30 00:37:06,049 [ scc.git] DEBUG * branch refs/pull/542/head -> FETCH_HEAD
2024-04-30 00:37:06,053 [ scc.git] DEBUG Calling 'git fetch origin pull/543/head'
2024-04-30 00:37:07,181 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-30 00:37:07,181 [ scc.git] DEBUG * branch refs/pull/543/head -> FETCH_HEAD
2024-04-30 00:37:07,186 [ scc.git] DEBUG ## Unique users: []
2024-04-30 00:37:07,186 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:37:07,186 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:37:07,190 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-04-30 00:37:07,216 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:37:07,220 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 168 (Changes to nginx @maintenance handler) 219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-04-30 00:37:07,295 [ scc.git] DEBUG Auto-merging test/unit/test_web.py
2024-04-30 00:37:07,296 [ scc.git] DEBUG CONFLICT (content): Merge conflict in test/unit/test_web.py
2024-04-30 00:37:07,297 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-30 00:37:07,297 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-30 00:37:07,305 [ scc.git] DEBUG Calling 'git reset --hard e1b1355ebd4f9de8b855dd2c55f59d86c061a81b'
2024-04-30 00:37:07,315 [ scc.git] DEBUG HEAD is now at e1b1355eb Merge pull request #540 from will-moore/django_template_context_processors_request
2024-04-30 00:37:07,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:37:07,485 [ scc.git] DEBUG Calling 'git merge-base e1b1355ebd4f9de8b855dd2c55f59d86c061a81b 219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-04-30 00:37:07,499 [ scc.git] DEBUG Calling 'git diff --name-only 632d14a9cab5319c6b1bd9190d441a95e457103b..e1b1355ebd4f9de8b855dd2c55f59d86c061a81b'
2024-04-30 00:37:07,647 [ scc.git] INFO - PR 168 stick 'Changes to nginx @maintenance handler'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#47](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/47/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/47/consoleText) for more details.
Possible conflicts:
- Upstream changes
- test/unit/test_web.py
--conflicts
2024-04-30 00:37:07,652 [ scc.config] DEBUG Found github.token
2024-04-30 00:37:07,652 [ scc.git] DEBUG Not adding comment to issue #168, already --conflicts.
2024-04-30 00:37:07,652 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-04-30 00:37:07,657 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:37:07,661 [ 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-30 00:37:07,714 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-04-30 00:37:07,714 [ scc.git] DEBUG Auto-merging setup.py
2024-04-30 00:37:07,715 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:37:07,718 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-04-30 00:37:07,718 [ scc.git] DEBUG setup.py | 1 +
2024-04-30 00:37:07,719 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-04-30 00:37:07,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:37:07,918 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e335980be1e7197826687f6c322a60c61b4aa545'
2024-04-30 00:37:07,924 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:37:07,928 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 533 (use conda-forge channel) e335980be1e7197826687f6c322a60c61b4aa545'
2024-04-30 00:37:07,943 [ scc.git] DEBUG Auto-merging README.rst
2024-04-30 00:37:07,945 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:37:07,947 [ scc.git] DEBUG README.rst | 3 +--
2024-04-30 00:37:07,947 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 2 deletions(-)
2024-04-30 00:37:08,327 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:37:08,328 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-04-30 00:37:08,334 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:37:08,338 [ 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-30 00:37:08,409 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-04-30 00:37:08,409 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-04-30 00:37:08,410 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:37:08,413 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-04-30 00:37:08,414 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-04-30 00:37:08,414 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-04-30 00:37:08,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:37:08,736 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...412fa66a52477fb77319a35147313a6f3cf481a2'
2024-04-30 00:37:08,743 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:37:08,748 [ 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-30 00:37:08,938 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py
2024-04-30 00:37:08,939 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-04-30 00:37:08,939 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:37:08,945 [ scc.git] DEBUG omeroweb/webclient/views.py | 4 +-
2024-04-30 00:37:08,945 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 135 ++++++++++++++++++++++++++++++++++++++---
2024-04-30 00:37:08,945 [ scc.git] DEBUG omeroweb/webgateway/util.py | 38 ++++++++++++
2024-04-30 00:37:08,945 [ scc.git] DEBUG 3 files changed, 166 insertions(+), 11 deletions(-)
2024-04-30 00:37:09,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:37:09,148 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...977f7b65169e6dee479197a9156993bbadd2d2e2'
2024-04-30 00:37:09,155 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:37:09,160 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 542 (PlateAcquisition filtering with plate display) 977f7b65169e6dee479197a9156993bbadd2d2e2'
2024-04-30 00:37:09,295 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py
2024-04-30 00:37:09,296 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:37:09,304 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 13 +++-------
2024-04-30 00:37:09,304 [ scc.git] DEBUG .../webclient/templates/webclient/data/plate.html | 10 ++++----
2024-04-30 00:37:09,304 [ scc.git] DEBUG omeroweb/webclient/views.py | 17 ++++++++++++
2024-04-30 00:37:09,304 [ scc.git] DEBUG omeroweb/webgateway/plategrid.py | 30 +++++++++++++++++++---
2024-04-30 00:37:09,304 [ scc.git] DEBUG .../static/webgateway/js/ome.plateview.js | 16 +++++++-----
2024-04-30 00:37:09,304 [ scc.git] DEBUG omeroweb/webgateway/urls.py | 2 +-
2024-04-30 00:37:09,304 [ scc.git] DEBUG omeroweb/webgateway/views.py | 16 ++++++++++--
2024-04-30 00:37:09,304 [ scc.git] DEBUG 7 files changed, 78 insertions(+), 26 deletions(-)
2024-04-30 00:37:09,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:37:09,544 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4'
2024-04-30 00:37:09,552 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:37:09,557 [ 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-30 00:37:09,662 [ scc.git] DEBUG Auto-merging omeroweb/webclient/templates/webclient/data/includes/center_plugin.thumbs.js.html
2024-04-30 00:37:09,663 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-30 00:37:09,679 [ scc.git] DEBUG .../webclient/javascript/ome.progress_overlay.js | 60 ++++++
2024-04-30 00:37:09,679 [ scc.git] DEBUG .../webclient/javascript/ome.webclient.actions.js | 112 +++++++-----
2024-04-30 00:37:09,679 [ scc.git] DEBUG .../webclient/annotations/metadata_preview.html | 51 +++---
2024-04-30 00:37:09,679 [ scc.git] DEBUG .../webclient/templates/webclient/base/base.html | 1 +
2024-04-30 00:37:09,679 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 2 +-
2024-04-30 00:37:09,679 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 16 +-
2024-04-30 00:37:09,679 [ scc.git] DEBUG .../static/webgateway/js/ome.gs_utils.js | 201 ---------------------
2024-04-30 00:37:09,679 [ scc.git] DEBUG .../webgateway/static/webgateway/js/ome.popup.js | 1 -
2024-04-30 00:37:09,679 [ scc.git] DEBUG .../webgateway/static/webgateway/js/omero_image.js | 35 ++--
2024-04-30 00:37:09,679 [ scc.git] DEBUG 9 files changed, 186 insertions(+), 293 deletions(-)
2024-04-30 00:37:09,679 [ scc.git] DEBUG create mode 100644 omeroweb/webclient/static/webclient/javascript/ome.progress_overlay.js
2024-04-30 00:37:09,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:37:09,959 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-30 00:37:10,001 [ scc.git] DEBUG Get sha1 of %s
2024-04-30 00:37:10,001 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-30 00:37:10,005 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:37:10,049 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:37:10,061 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb5c9a54910> has no local changes
2024-04-30 00:37:10,061 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 549 knabar 'Remove webgateway cache' (status: failure)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 533 jburel 'use conda-forge channel'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/47/)'
2024-04-30 00:37:10,071 [ scc.git] DEBUG [detached HEAD 2ed41ac7c] merge master -Dorg -Ssuccess-only
2024-04-30 00:37:10,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-30 00:37:10,072 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-30 00:37:10,124 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-04-30 00:37:10,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:37:10,387 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-04-30 00:37:10,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:37:10,793 [ scc.config] DEBUG Found submodule.omero-py.url
2024-04-30 00:37:11,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:37:11,206 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-04-30 00:37:11,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:37:11,622 [ scc.config] DEBUG Found submodule.omero-web.url
2024-04-30 00:37:12,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-30 00:37:12,030 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-30 00:37:12,071 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fb5cab9ae80> has local changes
2024-04-30 00:37:12,071 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-python-superbuild
Already up to date.
Repository: ome/omero-dropbox
Already up to date.
Merged PRs:
- PR 16 joshmoore 'Review all instances of whitelist/blacklist'
- PR 23 sbesson 'Remove python-future compatibility code'
Repository: ome/omero-marshal
Excluded PRs:
- PR 34 chris-allan 'Initial support for Event' (exclude comment)
- PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 will-moore 'Roi encoder allows Shape None'
Repository: ome/omero-py
Excluded PRs:
- PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
- PR 387 will-moore 'Numpy pixels type' (label: exclude)
- PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
- PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
- PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
- PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
Already up to date.
Merged PRs:
- PR 199 joshmoore 'user: allow setting default group'
- PR 207 manics 'BlitzGateway.connect raise on error'
- PR 266 joshmoore 'errors: use raise_error from cli plugins'
- PR 299 joshmoore 'Add parents and children to omero obj'
- PR 332 jburel 'Build conda'
- PR 337 will-moore 'bulk.yml depth is passed to xargs'
- PR 391 joshmoore 'Add jstack command'
- PR 407 jburel 'Remove ref to ome channel for zeroc-ice'
Repository: ome/omero-scripts
Excluded PRs:
- PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
- PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
- PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
- PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
Already up to date.
Conflicting PRs (not included):
- PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Repository: ome/omero-web
Excluded PRs:
- PR 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 549 knabar 'Remove webgateway cache' (status: failure)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 533 jburel 'use conda-forge channel'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/47/)'
2024-04-30 00:37:12,081 [ scc.git] DEBUG [detached HEAD 0e39f18] merge master -Dorg -Ssuccess-only
2024-04-30 00:37:12,082 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-04-30 00:37:12,082 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-04-30 00:37:12,082 [ scc.merge] INFO Already up to date.
2024-04-30 00:37:12,082 [ scc.merge] INFO
2024-04-30 00:37:12,082 [ scc.merge] INFO
2024-04-30 00:37:12,082 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-04-30 00:37:12,082 [ scc.merge] INFO Already up to date.
2024-04-30 00:37:12,082 [ scc.merge] INFO
2024-04-30 00:37:12,082 [ scc.merge] INFO Merged PRs:
2024-04-30 00:37:12,082 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-04-30 00:37:12,082 [ scc.merge] INFO - PR 23 sbesson 'Remove python-future compatibility code'
2024-04-30 00:37:12,082 [ scc.merge] INFO
2024-04-30 00:37:12,082 [ scc.merge] INFO Repository: ome/omero-marshal
2024-04-30 00:37:12,082 [ scc.merge] INFO Excluded PRs:
2024-04-30 00:37:12,082 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-04-30 00:37:12,082 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-04-30 00:37:12,083 [ scc.merge] INFO Already up to date.
2024-04-30 00:37:12,083 [ scc.merge] INFO
2024-04-30 00:37:12,083 [ scc.merge] INFO Merged PRs:
2024-04-30 00:37:12,083 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-04-30 00:37:12,083 [ scc.merge] INFO
2024-04-30 00:37:12,083 [ scc.merge] INFO Repository: ome/omero-py
2024-04-30 00:37:12,083 [ scc.merge] INFO Excluded PRs:
2024-04-30 00:37:12,083 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-04-30 00:37:12,083 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-04-30 00:37:12,083 [ scc.merge] INFO - PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
2024-04-30 00:37:12,083 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-04-30 00:37:12,083 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-04-30 00:37:12,083 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-04-30 00:37:12,083 [ scc.merge] INFO Already up to date.
2024-04-30 00:37:12,083 [ scc.merge] INFO
2024-04-30 00:37:12,083 [ scc.merge] INFO Merged PRs:
2024-04-30 00:37:12,083 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-04-30 00:37:12,083 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-04-30 00:37:12,083 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-04-30 00:37:12,083 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-04-30 00:37:12,083 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-04-30 00:37:12,083 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-04-30 00:37:12,083 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-04-30 00:37:12,083 [ scc.merge] INFO - PR 407 jburel 'Remove ref to ome channel for zeroc-ice'
2024-04-30 00:37:12,083 [ scc.merge] INFO
2024-04-30 00:37:12,083 [ scc.merge] INFO Repository: ome/omero-scripts
2024-04-30 00:37:12,083 [ scc.merge] INFO Excluded PRs:
2024-04-30 00:37:12,083 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-30 00:37:12,083 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-30 00:37:12,083 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-30 00:37:12,083 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-30 00:37:12,083 [ scc.merge] INFO Already up to date.
2024-04-30 00:37:12,083 [ scc.merge] INFO
2024-04-30 00:37:12,083 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-30 00:37:12,083 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-30 00:37:12,083 [ scc.merge] INFO
2024-04-30 00:37:12,083 [ scc.merge] INFO Repository: ome/omero-web
2024-04-30 00:37:12,083 [ scc.merge] INFO Excluded PRs:
2024-04-30 00:37:12,083 [ scc.merge] INFO - PR 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-04-30 00:37:12,084 [ scc.merge] INFO - PR 549 knabar 'Remove webgateway cache' (status: failure)
2024-04-30 00:37:12,084 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-04-30 00:37:12,084 [ scc.merge] INFO Already up to date.
2024-04-30 00:37:12,084 [ scc.merge] INFO
2024-04-30 00:37:12,084 [ scc.merge] INFO Merged PRs:
2024-04-30 00:37:12,084 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-04-30 00:37:12,084 [ scc.merge] INFO - PR 533 jburel 'use conda-forge channel'
2024-04-30 00:37:12,084 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-04-30 00:37:12,084 [ scc.merge] INFO - PR 536 will-moore 'imgData JSON with no stateful services'
2024-04-30 00:37:12,084 [ scc.merge] INFO - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-04-30 00:37:12,084 [ scc.merge] INFO - PR 543 knabar 'Block UI for some long running tasks'
2024-04-30 00:37:12,084 [ scc.merge] INFO
2024-04-30 00:37:12,084 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-30 00:37:12,084 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler'
2024-04-30 00:37:12,084 [ scc.merge] INFO
2024-04-30 00:37:12,084 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-30 00:37:12,084 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:37:12,088 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-04-30 00:37:12,089 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:37:12,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-30 00:37:12,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-04-30 00:37:12,092 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:37:12,097 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-30 00:37:12,097 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-04-30 00:37:12,097 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:37:12,102 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-30 00:37:12,102 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-04-30 00:37:12,102 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:37:12,107 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-30 00:37:12,107 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-04-30 00:37:12,107 [ scc.git] DEBUG Calling 'git remote'
2024-04-30 00:37:12,112 [ 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-30 00:37:42,361 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/03a0bb70/images/svgs/logo.svg){kind=logo}
