Console Output
+ export BASE_REPO=omero-python-superbuild.git
+ BASE_REPO=omero-python-superbuild.git
+ export BASE_BRANCH=master
+ BASE_BRANCH=master
+ export VERSION_LOG=/home/omero/workspace/OMERO-python-superbuild-push/build/version.tsv
+ VERSION_LOG=/home/omero/workspace/OMERO-python-superbuild-push/build/version.tsv
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ '[' '!' nondestructive = nondestructive ']'
++ VIRTUAL_ENV=/home/omero/workspace/OMERO-python-superbuild-push/build/venv
++ export VIRTUAL_ENV
++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ PATH=/home/omero/workspace/OMERO-python-superbuild-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ export PATH
++ '[' -n '' ']'
++ '[' -z '' ']'
++ _OLD_VIRTUAL_PS1=
++ PS1='(venv) '
++ export PS1
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
+ '[' merge_ci '!=' null ']'
+ export PUSH_BRANCH=merge_ci
+ PUSH_BRANCH=merge_ci
+ '[' null '!=' null ']'
+ export STATUS=success-only 'MERGE_OPTIONS=-vvv --no-ask --reset --comment'
+ STATUS=success-only
+ MERGE_OPTIONS='-vvv --no-ask --reset --comment'
+ bash build/build-infra-master/recursive-merge
Merge base repository (no submodule updates)
2024-05-08 00:32:42,150 [ scc.config] DEBUG Found github.token
2024-05-08 00:32:42,153 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-05-08 00:32:42,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:32:42,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:32:43,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-05-08 00:32:43,181 [ scc.gh] DEBUG 3315 remaining from 5000 (Reset at 01:05
2024-05-08 00:32:43,182 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-08 00:32:43,186 [ scc.git] DEBUG Check current status
2024-05-08 00:32:43,187 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-08 00:32:43,191 [ scc.git] DEBUG 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-05-08 00:32:43,191 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-08 00:32:43,234 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-05-08 00:32:43,237 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-08 00:32:43,241 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-05-08 00:32:43,244 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-08 00:32:43,305 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-08 00:32:43,310 [ scc.config] DEBUG Found remote.origin.url
2024-05-08 00:32:43,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-05-08 00:32:44,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-08 00:32:44,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-08 00:32:44,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-08 00:32:45,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-08 00:32:45,389 [ scc.git] DEBUG Resetting...
2024-05-08 00:32:45,389 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-05-08 00:32:45,396 [ scc.git] DEBUG HEAD is now at 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-05-08 00:32:45,396 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-05-08 00:32:45,449 [ scc.git] DEBUG Check current status
2024-05-08 00:32:45,449 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-08 00:32:45,454 [ scc.git] DEBUG 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-05-08 00:32:45,454 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-08 00:32:45,497 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-05-08 00:32:45,500 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-08 00:32:45,504 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-05-08 00:32:45,507 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-08 00:32:45,512 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-08 00:32:45,513 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-05-08 00:32:45,513 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-05-08 00:32:45,513 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-05-08 00:32:45,513 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-05-08 00:32:45,513 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-05-08 00:32:45,513 [ scc.repo] DEBUG ## PRs found:
2024-05-08 00:32:45,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-05-08 00:32:46,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/278 HTTP/1.1" 200 None
2024-05-08 00:32:46,350 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-08 00:32:46,350 [ scc.repo] DEBUG - PR 278 dependabot[bot] 'Bump omero-py from `52d9a6f` to `53a327b`'
2024-05-08 00:32:46,350 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:32:46,350 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:32:46,350 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:32:46,354 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-08 00:32:46,357 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:32:46,358 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-08 00:32:46,362 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-08 00:32:46,365 [ scc.git] DEBUG Already up to date.
2024-05-08 00:32:46,366 [ scc.git] DEBUG Calling 'git fetch origin pull/278/head'
2024-05-08 00:32:46,736 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-05-08 00:32:46,736 [ scc.git] DEBUG * branch refs/pull/278/head -> FETCH_HEAD
2024-05-08 00:32:46,741 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:32:46,741 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:32:46,741 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:32:46,745 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6c64259c4c9aea3f7c98e9736048d12500aa6fab'
2024-05-08 00:32:46,761 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:32:46,765 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 278 (Bump omero-py from `52d9a6f` to `53a327b`) 6c64259c4c9aea3f7c98e9736048d12500aa6fab'
2024-05-08 00:32:46,776 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:32:46,778 [ scc.git] DEBUG omero-py | 2 +-
2024-05-08 00:32:46,778 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-05-08 00:32:46,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:32:46,937 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:32:47,088 [ scc.git] DEBUG Submodule path 'omero-py': checked out '53a327b85034cf09ae5e7255e6fd70b59392b680'
2024-05-08 00:32:47,088 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:32:47,089 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:32:47,092 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:32:47,240 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8d1ef76460> has no local changes
2024-05-08 00:32:47,241 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone
Repository: ome/omero-python-superbuild
Already up to date.
Merged PRs:
- PR 278 dependabot[bot] 'Bump omero-py from `52d9a6f` to `53a327b`'
Generated by OMERO-python-superbuild-push#55 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/55/)'
2024-05-08 00:32:47,265 [ scc.git] DEBUG [detached HEAD f346b7b] merge master -Dorg -Snone
2024-05-08 00:32:47,265 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-05-08 00:32:47,266 [ scc.merge] INFO Already up to date.
2024-05-08 00:32:47,266 [ scc.merge] INFO
2024-05-08 00:32:47,266 [ scc.merge] INFO Merged PRs:
2024-05-08 00:32:47,266 [ scc.merge] INFO - PR 278 dependabot[bot] 'Bump omero-py from `52d9a6f` to `53a327b`'
2024-05-08 00:32:47,266 [ scc.merge] INFO
2024-05-08 00:32:47,266 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-08 00:32:47,266 [ scc.git] DEBUG Calling 'git remote'
Synchronizing submodule url for 'omero-dropbox'
Synchronizing submodule url for 'omero-marshal'
Synchronizing submodule url for 'omero-py'
Synchronizing submodule url for 'omero-scripts'
Synchronizing submodule url for 'omero-web'
Merge all submodules using repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-05-08 00:32:49,603 [ scc.config] DEBUG Found github.token
2024-05-08 00:32:49,605 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-05-08 00:32:49,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:32:50,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:32:50,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-05-08 00:32:50,671 [ scc.gh] DEBUG 3291 remaining from 5000 (Reset at 01:05
2024-05-08 00:32:50,672 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-08 00:32:50,676 [ scc.git] DEBUG Check current status
2024-05-08 00:32:50,676 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-08 00:32:50,679 [ scc.git] DEBUG f346b7b merge master -Dorg -Snone
2024-05-08 00:32:50,680 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-08 00:32:50,720 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-05-08 00:32:50,723 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-08 00:32:50,727 [ scc.git] DEBUG 53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8)
2024-05-08 00:32:50,730 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-08 00:32:50,734 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-08 00:32:50,738 [ scc.config] DEBUG Found remote.origin.url
2024-05-08 00:32:50,738 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-05-08 00:32:50,740 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-05-08 00:32:51,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-05-08 00:32:51,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-08 00:32:52,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-08 00:32:52,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-08 00:32:52,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-08 00:32:52,908 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:32:52,952 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-05-08 00:32:52,952 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-08 00:32:52,956 [ scc.git] DEBUG Check current status
2024-05-08 00:32:52,956 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-08 00:32:52,959 [ scc.git] DEBUG 5863350 Merge pull request #22 from sbesson/python311
2024-05-08 00:32:52,959 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-08 00:32:53,002 [ scc.config] DEBUG Found remote.origin.url
2024-05-08 00:32:53,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-05-08 00:32:53,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-08 00:32:54,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-08 00:32:54,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-08 00:32:55,133 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-08 00:32:55,134 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:32:55,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-08 00:32:55,173 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-05-08 00:32:55,173 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-08 00:32:55,176 [ scc.git] DEBUG Check current status
2024-05-08 00:32:55,176 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-08 00:32:55,179 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-05-08 00:32:55,180 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-08 00:32:55,221 [ scc.config] DEBUG Found remote.origin.url
2024-05-08 00:32:55,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-05-08 00:32:56,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-08 00:32:56,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-08 00:32:56,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-08 00:32:57,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-08 00:32:57,342 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:32:57,379 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-08 00:32:57,380 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-05-08 00:32:57,380 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-08 00:32:57,383 [ scc.git] DEBUG Check current status
2024-05-08 00:32:57,383 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-08 00:32:57,387 [ scc.git] DEBUG 53a327b8 Merge pull request #407 from jburel/install_conda_forge
2024-05-08 00:32:57,387 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-08 00:32:57,427 [ scc.config] DEBUG Found remote.origin.url
2024-05-08 00:32:57,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-05-08 00:32:58,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-08 00:32:58,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-08 00:32:59,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-08 00:32:59,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-08 00:32:59,526 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:32:59,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-08 00:32:59,569 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-05-08 00:32:59,570 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-08 00:32:59,574 [ scc.git] DEBUG Check current status
2024-05-08 00:32:59,574 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-08 00:32:59,578 [ scc.git] DEBUG 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-08 00:32:59,578 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-08 00:32:59,623 [ scc.config] DEBUG Found remote.origin.url
2024-05-08 00:32:59,624 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-05-08 00:33:00,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-05-08 00:33:00,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-08 00:33:00,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-08 00:33:01,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-08 00:33:01,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-08 00:33:01,767 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:33:01,808 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-08 00:33:01,809 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-05-08 00:33:01,809 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-08 00:33:01,814 [ scc.git] DEBUG Check current status
2024-05-08 00:33:01,814 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-08 00:33:01,818 [ scc.git] DEBUG e1b1355eb Merge pull request #540 from will-moore/django_template_context_processors_request
2024-05-08 00:33:01,818 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-08 00:33:01,864 [ scc.config] DEBUG Found remote.origin.url
2024-05-08 00:33:02,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-05-08 00:33:02,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-08 00:33:03,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-08 00:33:03,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-08 00:33:03,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-08 00:33:04,000 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:33:04,042 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-08 00:33:04,042 [ scc.git] DEBUG Resetting...
2024-05-08 00:33:04,042 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-05-08 00:33:04,048 [ scc.git] DEBUG HEAD is now at f346b7b merge master -Dorg -Snone
2024-05-08 00:33:04,048 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-05-08 00:33:04,101 [ scc.git] DEBUG Check current status
2024-05-08 00:33:04,101 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-08 00:33:04,105 [ scc.git] DEBUG f346b7b merge master -Dorg -Snone
2024-05-08 00:33:04,105 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-08 00:33:04,148 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-05-08 00:33:04,151 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-08 00:33:04,154 [ scc.git] DEBUG 53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8)
2024-05-08 00:33:04,158 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-08 00:33:04,161 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-08 00:33:04,162 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-05-08 00:33:04,162 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-05-08 00:33:04,162 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-05-08 00:33:04,162 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-05-08 00:33:04,162 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-05-08 00:33:04,162 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-05-08 00:33:04,162 [ scc.repo] DEBUG ## PRs found:
2024-05-08 00:33:04,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-05-08 00:33:04,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/278 HTTP/1.1" 200 None
2024-05-08 00:33:04,943 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-08 00:33:05,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/6c64259c4c9aea3f7c98e9736048d12500aa6fab HTTP/1.1" 200 None
2024-05-08 00:33:05,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/6c64259c4c9aea3f7c98e9736048d12500aa6fab/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:33:06,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/6c64259c4c9aea3f7c98e9736048d12500aa6fab HTTP/1.1" 200 None
2024-05-08 00:33:06,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/statuses/6c64259c4c9aea3f7c98e9736048d12500aa6fab?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:33:06,828 [ scc.repo] DEBUG - PR 278 dependabot[bot] 'Bump omero-py from `52d9a6f` to `53a327b`'
2024-05-08 00:33:06,828 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:33:06,829 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:33:06,829 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:33:06,833 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-08 00:33:06,837 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:33:06,837 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-08 00:33:06,843 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-08 00:33:06,848 [ scc.git] DEBUG Already up to date.
2024-05-08 00:33:06,849 [ scc.git] DEBUG Calling 'git fetch origin pull/278/head'
2024-05-08 00:33:07,216 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-05-08 00:33:07,217 [ scc.git] DEBUG * branch refs/pull/278/head -> FETCH_HEAD
2024-05-08 00:33:07,222 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:33:07,222 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:33:07,222 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:33:07,226 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6c64259c4c9aea3f7c98e9736048d12500aa6fab'
2024-05-08 00:33:07,231 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:33:07,234 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 278 (Bump omero-py from `52d9a6f` to `53a327b`) 6c64259c4c9aea3f7c98e9736048d12500aa6fab'
2024-05-08 00:33:07,238 [ scc.git] DEBUG Already up to date.
2024-05-08 00:33:07,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:33:07,401 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:33:07,442 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:33:07,443 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:33:07,447 [ scc.repo] DEBUG ## PRs found:
2024-05-08 00:33:07,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-05-08 00:33:08,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23 HTTP/1.1" 200 None
2024-05-08 00:33:08,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23/comments HTTP/1.1" 200 None
2024-05-08 00:33:09,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None
2024-05-08 00:33:09,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:33:10,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-08 00:33:10,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None
2024-05-08 00:33:11,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:33:11,193 [ scc.repo] DEBUG - PR 23 sbesson 'Remove python-future compatibility code'
2024-05-08 00:33:11,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-05-08 00:33:12,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-05-08 00:33:12,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-05-08 00:33:13,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:33:13,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-05-08 00:33:13,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:33:13,961 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-05-08 00:33:13,961 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:33:13,961 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-05-08 00:33:13,961 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:33:13,961 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:33:13,965 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-08 00:33:13,969 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:33:13,969 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-08 00:33:13,973 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-08 00:33:13,978 [ scc.git] DEBUG Already up to date.
2024-05-08 00:33:13,978 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-05-08 00:33:14,358 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-05-08 00:33:14,358 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-05-08 00:33:14,363 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head'
2024-05-08 00:33:14,749 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-05-08 00:33:14,749 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD
2024-05-08 00:33:14,756 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:33:14,756 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:33:14,756 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:33:14,760 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-05-08 00:33:14,764 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:33:14,768 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-05-08 00:33:14,831 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:33:14,835 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-05-08 00:33:14,835 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-05-08 00:33:14,835 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-05-08 00:33:14,835 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-05-08 00:33:14,835 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-05-08 00:33:14,835 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-05-08 00:33:14,837 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-05-08 00:33:14,837 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-05-08 00:33:14,837 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-05-08 00:33:14,838 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-05-08 00:33:15,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:33:15,007 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8'
2024-05-08 00:33:15,012 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:33:15,015 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 23 (Remove python-future compatibility code) 9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8'
2024-05-08 00:33:15,047 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-05-08 00:33:15,048 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-05-08 00:33:15,048 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-05-08 00:33:15,048 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-05-08 00:33:15,048 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-05-08 00:33:15,048 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-05-08 00:33:15,048 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-05-08 00:33:15,048 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-05-08 00:33:15,048 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-05-08 00:33:15,048 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:33:15,054 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-05-08 00:33:15,054 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++--
2024-05-08 00:33:15,054 [ scc.git] DEBUG .github/workflows/tox.yml | 5 ++--
2024-05-08 00:33:15,054 [ scc.git] DEBUG Dockerfile | 32 ----------------------
2024-05-08 00:33:15,054 [ scc.git] DEBUG setup.py | 2 +-
2024-05-08 00:33:15,054 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 1 -
2024-05-08 00:33:15,054 [ scc.git] DEBUG src/fsDirectory.py | 8 +-----
2024-05-08 00:33:15,054 [ scc.git] DEBUG src/fsDropBox.py | 8 +-----
2024-05-08 00:33:15,054 [ scc.git] DEBUG src/fsDropBoxMonitorClient.py | 11 +-------
2024-05-08 00:33:15,054 [ scc.git] DEBUG src/fsFileServer.py | 12 ++-------
2024-05-08 00:33:15,054 [ scc.git] DEBUG src/fsLists.py | 2 --
2024-05-08 00:33:15,055 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 9 +------
2024-05-08 00:33:15,055 [ scc.git] DEBUG src/fsMonitor.py | 2 --
2024-05-08 00:33:15,055 [ scc.git] DEBUG src/fsMonitorServer.py | 8 +++---
2024-05-08 00:33:15,055 [ scc.git] DEBUG src/fsNotificationScheduler.py | 3 ---
2024-05-08 00:33:15,055 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 21 +++++----------
2024-05-08 00:33:15,055 [ scc.git] DEBUG src/fsUtil.py | 9 +++----
2024-05-08 00:33:15,055 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 8 +-----
2024-05-08 00:33:15,055 [ scc.git] DEBUG test/conftest.py | 2 --
2024-05-08 00:33:15,055 [ scc.git] DEBUG test/drivers.py | 17 +++---------
2024-05-08 00:33:15,055 [ scc.git] DEBUG test/unit/test_drivers.py | 55 ++++++++++++++++----------------------
2024-05-08 00:33:15,055 [ scc.git] DEBUG test/unit/test_monitor.py | 2 --
2024-05-08 00:33:15,055 [ scc.git] DEBUG test/unit/test_replay.py | 8 +-----
2024-05-08 00:33:15,055 [ scc.git] DEBUG test/unit/test_state.py | 1 -
2024-05-08 00:33:15,055 [ scc.git] DEBUG tox.ini | 3 ++-
2024-05-08 00:33:15,055 [ scc.git] DEBUG 25 files changed, 59 insertions(+), 178 deletions(-)
2024-05-08 00:33:15,055 [ scc.git] DEBUG delete mode 100644 Dockerfile
2024-05-08 00:33:15,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:33:15,421 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:33:15,460 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:33:15,460 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:33:15,464 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:33:15,506 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:33:15,513 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f23350c3c10> has no local changes
2024-05-08 00:33:15,513 [ 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#55 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/55/)'
2024-05-08 00:33:15,522 [ scc.git] DEBUG [detached HEAD 96609c2] merge master -Dorg -Ssuccess-only
2024-05-08 00:33:15,523 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-08 00:33:15,523 [ scc.repo] DEBUG ## PRs found:
2024-05-08 00:33:15,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-05-08 00:33:16,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-05-08 00:33:16,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-05-08 00:33:17,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-05-08 00:33:17,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:33:18,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-08 00:33:18,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-05-08 00:33:19,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:33:19,108 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-05-08 00:33:19,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-05-08 00:33:20,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-05-08 00:33:20,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-05-08 00:33:20,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-05-08 00:33:20,984 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:33:20,984 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-05-08 00:33:20,984 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:33:20,984 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:33:21,004 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-08 00:33:21,018 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:33:21,018 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-08 00:33:21,026 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-08 00:33:21,031 [ scc.git] DEBUG Already up to date.
2024-05-08 00:33:21,032 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-05-08 00:33:21,435 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-05-08 00:33:21,436 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-05-08 00:33:21,440 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:33:21,440 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:33:21,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:33:21,444 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-05-08 00:33:21,449 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:33:21,453 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-05-08 00:33:21,464 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-05-08 00:33:21,464 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:33:21,467 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-05-08 00:33:21,467 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-05-08 00:33:21,467 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-05-08 00:33:21,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:33:21,628 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:33:21,669 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:33:21,669 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:33:21,673 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:33:21,713 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:33:21,719 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f233505e0d0> has no local changes
2024-05-08 00:33:21,719 [ 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#55 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/55/)'
2024-05-08 00:33:21,726 [ scc.git] DEBUG [detached HEAD e89acca] merge master -Dorg -Ssuccess-only
2024-05-08 00:33:21,727 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-08 00:33:21,727 [ scc.repo] DEBUG ## PRs found:
2024-05-08 00:33:22,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-05-08 00:33:22,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-05-08 00:33:23,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-05-08 00:33:23,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-05-08 00:33:24,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:33:24,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-08 00:33:24,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-05-08 00:33:25,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5b69af339bf34bd4adcf16a7f6a03fafa2921804?per_page=1 HTTP/1.1" 200 None
2024-05-08 00:33:25,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-05-08 00:33:26,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-05-08 00:33:26,335 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-05-08 00:33:26,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-05-08 00:33:27,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-05-08 00:33:27,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-05-08 00:33:28,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:33:28,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-08 00:33:29,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-05-08 00:33:29,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-05-08 00:33:30,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:33:30,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-08 00:33:30,956 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-05-08 00:33:31,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-05-08 00:33:31,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-05-08 00:33:32,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-05-08 00:33:32,262 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-05-08 00:33:32,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-05-08 00:33:32,740 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-05-08 00:33:33,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378 HTTP/1.1" 200 None
2024-05-08 00:33:33,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378/comments HTTP/1.1" 200 None
2024-05-08 00:33:34,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-05-08 00:33:34,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-05-08 00:33:35,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-05-08 00:33:35,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:33:35,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-05-08 00:33:36,295 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:33:36,296 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-05-08 00:33:36,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-05-08 00:33:37,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-05-08 00:33:37,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-05-08 00:33:38,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:33:38,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-08 00:33:39,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-05-08 00:33:39,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-05-08 00:33:39,989 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-05-08 00:33:40,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-05-08 00:33:40,418 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-05-08 00:33:40,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-05-08 00:33:41,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-05-08 00:33:41,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-05-08 00:33:42,315 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-05-08 00:33:42,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-05-08 00:33:43,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:33:43,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-05-08 00:33:44,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:33:44,092 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-05-08 00:33:44,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-05-08 00:33:45,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-05-08 00:33:45,446 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:33:45,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-05-08 00:33:46,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:33:46,355 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-05-08 00:33:46,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-05-08 00:33:47,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-05-08 00:33:47,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-05-08 00:33:48,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:33:48,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-05-08 00:33:49,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:33:49,079 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-05-08 00:33:49,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-05-08 00:33:50,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-05-08 00:33:50,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-05-08 00:33:50,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:33:51,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-05-08 00:33:51,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:33:51,716 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-05-08 00:33:52,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-05-08 00:33:52,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-05-08 00:33:53,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-05-08 00:33:53,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-05-08 00:33:53,751 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:33:53,751 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-05-08 00:33:53,751 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:33:53,751 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:33:53,756 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-08 00:33:53,760 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:33:53,761 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-08 00:33:53,766 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-08 00:33:53,771 [ scc.git] DEBUG Already up to date.
2024-05-08 00:33:53,771 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-05-08 00:33:54,333 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-08 00:33:54,333 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-05-08 00:33:54,340 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-05-08 00:33:54,752 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-08 00:33:54,752 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-05-08 00:33:54,757 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-05-08 00:33:55,173 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-08 00:33:55,173 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-05-08 00:33:55,177 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-05-08 00:33:55,570 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-08 00:33:55,571 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-05-08 00:33:55,575 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-05-08 00:33:56,020 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-08 00:33:56,021 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-05-08 00:33:56,027 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-05-08 00:33:56,403 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-08 00:33:56,403 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-05-08 00:33:56,409 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-05-08 00:33:56,790 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-08 00:33:56,790 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-05-08 00:33:56,797 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-05-08 00:33:57,247 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-08 00:33:57,248 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-05-08 00:33:57,252 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:33:57,252 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:33:57,252 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:33:57,257 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-05-08 00:33:57,268 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:33:57,272 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-05-08 00:33:57,320 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-05-08 00:33:57,320 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-05-08 00:33:57,320 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:33:57,324 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-05-08 00:33:57,324 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-05-08 00:33:57,324 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-05-08 00:33:57,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:33:57,481 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-05-08 00:33:57,492 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:33:57,497 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-05-08 00:33:57,638 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-05-08 00:33:57,638 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-05-08 00:33:57,639 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:33:57,647 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-05-08 00:33:57,647 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-05-08 00:33:57,647 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-05-08 00:33:57,903 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:33:57,904 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-05-08 00:33:57,916 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:33:57,921 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 266 (errors: use raise_error from cli plugins) df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-05-08 00:33:58,007 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-05-08 00:33:58,008 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:33:58,011 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-05-08 00:33:58,012 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-05-08 00:33:58,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:33:58,322 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-05-08 00:33:58,334 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:33:58,338 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 299 (Add parents and children to omero obj) 09ae8033d77faf0346255eb9644207e02c98709a'
2024-05-08 00:33:58,395 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-05-08 00:33:58,395 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-05-08 00:33:58,396 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:33:58,400 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-05-08 00:33:58,400 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-05-08 00:33:58,400 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-05-08 00:33:58,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:33:58,736 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-05-08 00:33:58,747 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:33:58,752 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-05-08 00:33:58,777 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:33:58,780 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-05-08 00:33:58,780 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-05-08 00:33:58,780 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-05-08 00:33:58,780 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-05-08 00:33:58,780 [ scc.git] DEBUG create mode 100644 connect.py
2024-05-08 00:33:59,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:33:59,213 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-05-08 00:33:59,226 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:33:59,231 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 337 (bulk.yml depth is passed to xargs) 0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-05-08 00:33:59,307 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-05-08 00:33:59,309 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:33:59,313 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-05-08 00:33:59,314 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-08 00:33:59,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:33:59,631 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-05-08 00:33:59,648 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:33:59,654 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-05-08 00:33:59,723 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-05-08 00:33:59,725 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:33:59,728 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-05-08 00:33:59,729 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-05-08 00:34:00,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:34:00,053 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-05-08 00:34:00,068 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:34:00,074 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-05-08 00:34:00,128 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-05-08 00:34:00,129 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:34:00,138 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-05-08 00:34:00,138 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-05-08 00:34:00,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:34:00,468 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:34:00,525 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:34:00,525 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:34:00,532 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:34:00,572 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:34:00,581 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f232ffe6760> has no local changes
2024-05-08 00:34:00,581 [ 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 408 jburel 'remove deprecated method'
Generated by OMERO-python-superbuild-push#55 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/55/)'
2024-05-08 00:34:00,593 [ scc.git] DEBUG [detached HEAD 260217d7] merge master -Dorg -Ssuccess-only
2024-05-08 00:34:00,593 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-08 00:34:00,594 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-08 00:34:00,594 [ scc.repo] DEBUG ## PRs found:
2024-05-08 00:34:01,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-08 00:34:01,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-08 00:34:02,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-08 00:34:02,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-08 00:34:02,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-08 00:34:03,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-08 00:34:03,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-08 00:34:04,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-08 00:34:04,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:34:05,178 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-08 00:34:05,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-05-08 00:34:05,602 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-08 00:34:06,095 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-08 00:34:06,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-08 00:34:07,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-08 00:34:07,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-08 00:34:07,648 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:34:07,648 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-05-08 00:34:07,649 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:34:07,649 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:34:07,654 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-08 00:34:07,658 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:34:07,658 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-08 00:34:07,663 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-08 00:34:07,669 [ scc.git] DEBUG Already up to date.
2024-05-08 00:34:07,670 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-08 00:34:08,162 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-05-08 00:34:08,163 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-08 00:34:08,167 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:34:08,167 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:34:08,168 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:34:08,172 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-08 00:34:08,179 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:34:08,183 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-08 00:34:08,240 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-08 00:34:08,240 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-08 00:34:08,240 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-08 00:34:08,240 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-08 00:34:08,246 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-08 00:34:08,252 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-08 00:34:08,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:34:08,410 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-08 00:34:08,417 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-08 00:34:08,422 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#55](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/55/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/55/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-08 00:34:08,426 [ scc.config] DEBUG Found github.token
2024-05-08 00:34:08,426 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-08 00:34:08,427 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:34:08,473 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:34:08,473 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:34:08,477 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:34:08,518 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:34:08,524 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f232ffcd640> has no local changes
2024-05-08 00:34:08,525 [ 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#55 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/55/)'
2024-05-08 00:34:08,533 [ scc.git] DEBUG [detached HEAD 8bc31ff] merge master -Dorg -Ssuccess-only
2024-05-08 00:34:08,533 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-08 00:34:08,533 [ scc.repo] DEBUG ## PRs found:
2024-05-08 00:34:09,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-05-08 00:34:09,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/553 HTTP/1.1" 200 None
2024-05-08 00:34:09,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549 HTTP/1.1" 200 None
2024-05-08 00:34:10,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549/comments HTTP/1.1" 200 None
2024-05-08 00:34:10,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/cdfac8b370264c2875799e26a2c49f31482124e6 HTTP/1.1" 200 None
2024-05-08 00:34:11,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/cdfac8b370264c2875799e26a2c49f31482124e6/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:34:11,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/cdfac8b370264c2875799e26a2c49f31482124e6/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-08 00:34:12,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/cdfac8b370264c2875799e26a2c49f31482124e6 HTTP/1.1" 200 None
2024-05-08 00:34:12,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/cdfac8b370264c2875799e26a2c49f31482124e6?per_page=1 HTTP/1.1" 200 None
2024-05-08 00:34:13,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/cdfac8b370264c2875799e26a2c49f31482124e6 HTTP/1.1" 200 None
2024-05-08 00:34:13,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/cdfac8b370264c2875799e26a2c49f31482124e6/status HTTP/1.1" 200 None
2024-05-08 00:34:13,733 [ scc.repo] DEBUG - PR 549 knabar 'Remove webgateway cache'
2024-05-08 00:34:14,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543 HTTP/1.1" 200 None
2024-05-08 00:34:14,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543/comments HTTP/1.1" 200 None
2024-05-08 00:34:15,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-05-08 00:34:15,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:34:16,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-08 00:34:16,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-05-08 00:34:16,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4?per_page=1 HTTP/1.1" 200 None
2024-05-08 00:34:17,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-05-08 00:34:17,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/status HTTP/1.1" 200 None
2024-05-08 00:34:17,855 [ scc.repo] DEBUG - PR 543 knabar 'Block UI for some long running tasks'
2024-05-08 00:34:18,326 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542 HTTP/1.1" 200 None
2024-05-08 00:34:18,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542/comments HTTP/1.1" 200 None
2024-05-08 00:34:18,828 [ scc.repo] DEBUG # ... Include label: include
2024-05-08 00:34:19,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-05-08 00:34:19,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:34:20,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-08 00:34:20,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-05-08 00:34:21,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/977f7b65169e6dee479197a9156993bbadd2d2e2?per_page=1 HTTP/1.1" 200 None
2024-05-08 00:34:21,493 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-05-08 00:34:21,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/status HTTP/1.1" 200 None
2024-05-08 00:34:21,941 [ scc.repo] DEBUG - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-05-08 00:34:22,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-05-08 00:34:22,871 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-05-08 00:34:23,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-05-08 00:34:23,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-05-08 00:34:24,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:34:24,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-08 00:34:25,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-05-08 00:34:25,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-05-08 00:34:26,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-05-08 00:34:26,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-05-08 00:34:26,623 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-05-08 00:34:27,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/533 HTTP/1.1" 200 None
2024-05-08 00:34:27,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/533/comments HTTP/1.1" 200 None
2024-05-08 00:34:28,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9a13dceec34523f81d5b6059c98b5ed05cada945 HTTP/1.1" 200 None
2024-05-08 00:34:28,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9a13dceec34523f81d5b6059c98b5ed05cada945/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:34:28,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9a13dceec34523f81d5b6059c98b5ed05cada945/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-08 00:34:29,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9a13dceec34523f81d5b6059c98b5ed05cada945 HTTP/1.1" 200 None
2024-05-08 00:34:29,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/9a13dceec34523f81d5b6059c98b5ed05cada945?per_page=1 HTTP/1.1" 200 None
2024-05-08 00:34:30,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9a13dceec34523f81d5b6059c98b5ed05cada945 HTTP/1.1" 200 None
2024-05-08 00:34:30,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/9a13dceec34523f81d5b6059c98b5ed05cada945/status HTTP/1.1" 200 None
2024-05-08 00:34:30,702 [ scc.repo] DEBUG - PR 533 jburel 'use conda-forge channel'
2024-05-08 00:34:31,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-05-08 00:34:31,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-05-08 00:34:32,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-05-08 00:34:32,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:34:33,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-08 00:34:33,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-05-08 00:34:33,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-05-08 00:34:34,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-05-08 00:34:34,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-05-08 00:34:34,806 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-05-08 00:34:35,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-05-08 00:34:35,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-05-08 00:34:36,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200 HTTP/1.1" 200 None
2024-05-08 00:34:36,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-08 00:34:37,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/06b0073db19eeccb9698860f75639084ad1b1200/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-08 00:34:37,248 [ scc.repo] DEBUG ## Branches found:
2024-05-08 00:34:37,249 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-05-08 00:34:37,249 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:34:37,249 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:34:37,254 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-08 00:34:37,259 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-08 00:34:37,259 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-08 00:34:37,264 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-08 00:34:37,270 [ scc.git] DEBUG Already up to date.
2024-05-08 00:34:37,270 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-05-08 00:34:37,811 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-08 00:34:37,811 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-05-08 00:34:37,817 [ scc.git] DEBUG Calling 'git fetch origin pull/533/head'
2024-05-08 00:34:38,370 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-08 00:34:38,370 [ scc.git] DEBUG * branch refs/pull/533/head -> FETCH_HEAD
2024-05-08 00:34:38,372 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-05-08 00:34:38,770 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-08 00:34:38,770 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-05-08 00:34:38,776 [ scc.git] DEBUG Calling 'git fetch origin pull/542/head'
2024-05-08 00:34:39,497 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-08 00:34:39,497 [ scc.git] DEBUG * branch refs/pull/542/head -> FETCH_HEAD
2024-05-08 00:34:39,501 [ scc.git] DEBUG Calling 'git fetch origin pull/543/head'
2024-05-08 00:34:40,302 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-08 00:34:40,302 [ scc.git] DEBUG * branch refs/pull/543/head -> FETCH_HEAD
2024-05-08 00:34:40,310 [ scc.git] DEBUG Calling 'git fetch origin pull/549/head'
2024-05-08 00:34:40,928 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-08 00:34:40,928 [ scc.git] DEBUG * branch refs/pull/549/head -> FETCH_HEAD
2024-05-08 00:34:40,931 [ scc.git] DEBUG ## Unique users: []
2024-05-08 00:34:40,931 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:34:40,931 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:34:40,937 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-05-08 00:34:40,943 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:34:40,947 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 527 (Add some initial CSP settings to test) 5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-05-08 00:34:40,988 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-05-08 00:34:40,988 [ scc.git] DEBUG Auto-merging setup.py
2024-05-08 00:34:40,989 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:34:40,993 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-05-08 00:34:40,993 [ scc.git] DEBUG setup.py | 1 +
2024-05-08 00:34:40,993 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-05-08 00:34:41,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:34:41,149 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9a13dceec34523f81d5b6059c98b5ed05cada945'
2024-05-08 00:34:41,155 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:34:41,160 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 533 (use conda-forge channel) 9a13dceec34523f81d5b6059c98b5ed05cada945'
2024-05-08 00:34:41,174 [ scc.git] DEBUG Auto-merging README.rst
2024-05-08 00:34:41,176 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:34:41,178 [ scc.git] DEBUG README.rst | 5 ++---
2024-05-08 00:34:41,178 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 3 deletions(-)
2024-05-08 00:34:41,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:34:41,556 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-05-08 00:34:41,564 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:34:41,568 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 534 (get strings from omero.cmd.ERR and omero.CmdError correctly) d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-05-08 00:34:41,607 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-05-08 00:34:41,608 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-05-08 00:34:41,608 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:34:41,612 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-05-08 00:34:41,612 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-05-08 00:34:41,612 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-05-08 00:34:41,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:34:41,972 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...977f7b65169e6dee479197a9156993bbadd2d2e2'
2024-05-08 00:34:41,979 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:34:41,984 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 542 (PlateAcquisition filtering with plate display) 977f7b65169e6dee479197a9156993bbadd2d2e2'
2024-05-08 00:34:42,101 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py
2024-05-08 00:34:42,102 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:34:42,110 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 13 +++-------
2024-05-08 00:34:42,110 [ scc.git] DEBUG .../webclient/templates/webclient/data/plate.html | 10 ++++----
2024-05-08 00:34:42,110 [ scc.git] DEBUG omeroweb/webclient/views.py | 17 ++++++++++++
2024-05-08 00:34:42,110 [ scc.git] DEBUG omeroweb/webgateway/plategrid.py | 30 +++++++++++++++++++---
2024-05-08 00:34:42,110 [ scc.git] DEBUG .../static/webgateway/js/ome.plateview.js | 16 +++++++-----
2024-05-08 00:34:42,110 [ scc.git] DEBUG omeroweb/webgateway/urls.py | 2 +-
2024-05-08 00:34:42,110 [ scc.git] DEBUG omeroweb/webgateway/views.py | 16 ++++++++++--
2024-05-08 00:34:42,110 [ scc.git] DEBUG 7 files changed, 78 insertions(+), 26 deletions(-)
2024-05-08 00:34:42,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:34:42,395 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4'
2024-05-08 00:34:42,404 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:34:42,409 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 543 (Block UI for some long running tasks) 8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4'
2024-05-08 00:34:42,448 [ scc.git] DEBUG Auto-merging omeroweb/webclient/templates/webclient/data/includes/center_plugin.thumbs.js.html
2024-05-08 00:34:42,450 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:34:42,457 [ scc.git] DEBUG .../webclient/javascript/ome.progress_overlay.js | 60 ++++++
2024-05-08 00:34:42,457 [ scc.git] DEBUG .../webclient/javascript/ome.webclient.actions.js | 112 +++++++-----
2024-05-08 00:34:42,457 [ scc.git] DEBUG .../webclient/annotations/metadata_preview.html | 51 +++---
2024-05-08 00:34:42,457 [ scc.git] DEBUG .../webclient/templates/webclient/base/base.html | 1 +
2024-05-08 00:34:42,458 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 2 +-
2024-05-08 00:34:42,458 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 16 +-
2024-05-08 00:34:42,458 [ scc.git] DEBUG .../static/webgateway/js/ome.gs_utils.js | 201 ---------------------
2024-05-08 00:34:42,458 [ scc.git] DEBUG .../webgateway/static/webgateway/js/ome.popup.js | 1 -
2024-05-08 00:34:42,458 [ scc.git] DEBUG .../webgateway/static/webgateway/js/omero_image.js | 35 ++--
2024-05-08 00:34:42,458 [ scc.git] DEBUG 9 files changed, 186 insertions(+), 293 deletions(-)
2024-05-08 00:34:42,458 [ scc.git] DEBUG create mode 100644 omeroweb/webclient/static/webclient/javascript/ome.progress_overlay.js
2024-05-08 00:34:42,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:34:42,806 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cdfac8b370264c2875799e26a2c49f31482124e6'
2024-05-08 00:34:42,813 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:34:42,817 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 549 (Remove webgateway cache) cdfac8b370264c2875799e26a2c49f31482124e6'
2024-05-08 00:34:42,848 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-05-08 00:34:42,848 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/views.py
2024-05-08 00:34:42,849 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-08 00:34:42,855 [ scc.git] DEBUG omeroweb/settings.py | 1 -
2024-05-08 00:34:42,855 [ scc.git] DEBUG omeroweb/webgateway/views.py | 118 +---
2024-05-08 00:34:42,855 [ scc.git] DEBUG omeroweb/webgateway/webgateway_cache.py | 1043 ----------------------------
2024-05-08 00:34:42,855 [ scc.git] DEBUG omeroweb/webgateway/webgateway_tempfile.py | 200 ++++++
2024-05-08 00:34:42,855 [ scc.git] DEBUG test/unit/test_webgateway.py | 271 +-------
2024-05-08 00:34:42,855 [ scc.git] DEBUG 5 files changed, 231 insertions(+), 1402 deletions(-)
2024-05-08 00:34:42,856 [ scc.git] DEBUG delete mode 100644 omeroweb/webgateway/webgateway_cache.py
2024-05-08 00:34:42,856 [ scc.git] DEBUG create mode 100644 omeroweb/webgateway/webgateway_tempfile.py
2024-05-08 00:34:43,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:34:43,213 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-08 00:34:43,253 [ scc.git] DEBUG Get sha1 of %s
2024-05-08 00:34:43,253 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-08 00:34:43,259 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:34:43,301 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:34:43,314 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f232fff8910> has no local changes
2024-05-08 00:34:43,314 [ 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 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 533 jburel 'use conda-forge channel'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
- PR 543 knabar 'Block UI for some long running tasks'
- PR 549 knabar 'Remove webgateway cache'
Generated by OMERO-python-superbuild-push#55 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/55/)'
2024-05-08 00:34:43,328 [ scc.git] DEBUG [detached HEAD 11d694d3a] merge master -Dorg -Ssuccess-only
2024-05-08 00:34:43,328 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-08 00:34:43,328 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-08 00:34:43,381 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-05-08 00:34:43,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:34:43,655 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-05-08 00:34:44,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:34:44,084 [ scc.config] DEBUG Found submodule.omero-py.url
2024-05-08 00:34:44,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:34:44,489 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-05-08 00:34:44,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:34:44,904 [ scc.config] DEBUG Found submodule.omero-web.url
2024-05-08 00:34:45,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-08 00:34:45,308 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-08 00:34:45,337 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2337479460> has local changes
2024-05-08 00:34:45,338 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-python-superbuild
Already up to date.
Merged PRs:
- PR 278 dependabot[bot] 'Bump omero-py from `52d9a6f` to `53a327b`'
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 408 jburel 'remove deprecated method'
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 535 will-moore 'Initial working browser history' (stage: draft)
- PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 533 jburel 'use conda-forge channel'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
- PR 543 knabar 'Block UI for some long running tasks'
- PR 549 knabar 'Remove webgateway cache'
Generated by OMERO-python-superbuild-push#55 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/55/)'
2024-05-08 00:34:45,347 [ scc.git] DEBUG [detached HEAD dbf7196] merge master -Dorg -Ssuccess-only
2024-05-08 00:34:45,348 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-05-08 00:34:45,348 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-05-08 00:34:45,348 [ scc.merge] INFO Already up to date.
2024-05-08 00:34:45,348 [ scc.merge] INFO
2024-05-08 00:34:45,348 [ scc.merge] INFO Merged PRs:
2024-05-08 00:34:45,348 [ scc.merge] INFO - PR 278 dependabot[bot] 'Bump omero-py from `52d9a6f` to `53a327b`'
2024-05-08 00:34:45,348 [ scc.merge] INFO
2024-05-08 00:34:45,348 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-05-08 00:34:45,348 [ scc.merge] INFO Already up to date.
2024-05-08 00:34:45,348 [ scc.merge] INFO
2024-05-08 00:34:45,348 [ scc.merge] INFO Merged PRs:
2024-05-08 00:34:45,348 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-05-08 00:34:45,348 [ scc.merge] INFO - PR 23 sbesson 'Remove python-future compatibility code'
2024-05-08 00:34:45,348 [ scc.merge] INFO
2024-05-08 00:34:45,348 [ scc.merge] INFO Repository: ome/omero-marshal
2024-05-08 00:34:45,348 [ scc.merge] INFO Excluded PRs:
2024-05-08 00:34:45,348 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-05-08 00:34:45,348 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-05-08 00:34:45,348 [ scc.merge] INFO Already up to date.
2024-05-08 00:34:45,348 [ scc.merge] INFO
2024-05-08 00:34:45,348 [ scc.merge] INFO Merged PRs:
2024-05-08 00:34:45,348 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-05-08 00:34:45,348 [ scc.merge] INFO
2024-05-08 00:34:45,348 [ scc.merge] INFO Repository: ome/omero-py
2024-05-08 00:34:45,349 [ scc.merge] INFO Excluded PRs:
2024-05-08 00:34:45,349 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-05-08 00:34:45,349 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-05-08 00:34:45,349 [ scc.merge] INFO - PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
2024-05-08 00:34:45,349 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-05-08 00:34:45,349 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-05-08 00:34:45,349 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-05-08 00:34:45,349 [ scc.merge] INFO Already up to date.
2024-05-08 00:34:45,349 [ scc.merge] INFO
2024-05-08 00:34:45,349 [ scc.merge] INFO Merged PRs:
2024-05-08 00:34:45,349 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-05-08 00:34:45,349 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-05-08 00:34:45,349 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-05-08 00:34:45,349 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-05-08 00:34:45,349 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-05-08 00:34:45,349 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-05-08 00:34:45,349 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-05-08 00:34:45,349 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-05-08 00:34:45,349 [ scc.merge] INFO
2024-05-08 00:34:45,349 [ scc.merge] INFO Repository: ome/omero-scripts
2024-05-08 00:34:45,349 [ scc.merge] INFO Excluded PRs:
2024-05-08 00:34:45,349 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-08 00:34:45,349 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-08 00:34:45,349 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-08 00:34:45,349 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-08 00:34:45,349 [ scc.merge] INFO Already up to date.
2024-05-08 00:34:45,349 [ scc.merge] INFO
2024-05-08 00:34:45,349 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-08 00:34:45,349 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-08 00:34:45,349 [ scc.merge] INFO
2024-05-08 00:34:45,349 [ scc.merge] INFO Repository: ome/omero-web
2024-05-08 00:34:45,349 [ scc.merge] INFO Excluded PRs:
2024-05-08 00:34:45,349 [ scc.merge] INFO - PR 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-08 00:34:45,349 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-05-08 00:34:45,349 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler' (status: failure)
2024-05-08 00:34:45,349 [ scc.merge] INFO Already up to date.
2024-05-08 00:34:45,349 [ scc.merge] INFO
2024-05-08 00:34:45,349 [ scc.merge] INFO Merged PRs:
2024-05-08 00:34:45,350 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-05-08 00:34:45,350 [ scc.merge] INFO - PR 533 jburel 'use conda-forge channel'
2024-05-08 00:34:45,350 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-05-08 00:34:45,350 [ scc.merge] INFO - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-05-08 00:34:45,350 [ scc.merge] INFO - PR 543 knabar 'Block UI for some long running tasks'
2024-05-08 00:34:45,350 [ scc.merge] INFO - PR 549 knabar 'Remove webgateway cache'
2024-05-08 00:34:45,350 [ scc.merge] INFO
2024-05-08 00:34:45,350 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-08 00:34:45,350 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:34:45,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-05-08 00:34:45,354 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:34:45,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-08 00:34:45,358 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-05-08 00:34:45,358 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:34:45,362 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-08 00:34:45,362 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-05-08 00:34:45,362 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:34:45,366 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-08 00:34:45,366 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-05-08 00:34:45,366 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:34:45,370 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-08 00:34:45,370 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-05-08 00:34:45,370 [ scc.git] DEBUG Calling 'git remote'
2024-05-08 00:34:45,374 [ 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 53a327b8
nothing to commit, working tree clean
Entering 'omero-scripts'
HEAD detached from 5a90893
nothing to commit, working tree clean
Entering 'omero-web'
HEAD detached from e1b1355eb
nothing to commit, working tree clean
HEAD detached from 9308a59
nothing to commit, working tree clean
2024-05-08 00:35:14,955 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/d0200910/images/svgs/logo.svg){kind=logo}
