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-03 00:35:44,001 [ scc.config] DEBUG Found github.token
2024-05-03 00:35:44,003 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-05-03 00:35:44,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:35:44,638 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:35:45,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-05-03 00:35:45,040 [ scc.gh] DEBUG 4028 remaining from 5000 (Reset at 00:05
2024-05-03 00:35:45,041 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-03 00:35:45,045 [ scc.git] DEBUG Check current status
2024-05-03 00:35:45,045 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-03 00:35:45,048 [ scc.git] DEBUG 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-05-03 00:35:45,048 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-03 00:35:45,105 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-05-03 00:35:45,108 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-03 00:35:45,142 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-05-03 00:35:45,146 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-03 00:35:45,329 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-03 00:35:45,334 [ scc.config] DEBUG Found remote.origin.url
2024-05-03 00:35:45,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-05-03 00:35:46,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-03 00:35:46,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-03 00:35:46,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-03 00:35:47,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-03 00:35:47,271 [ scc.git] DEBUG Resetting...
2024-05-03 00:35:47,271 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-05-03 00:35:47,277 [ scc.git] DEBUG HEAD is now at 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-05-03 00:35:47,278 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-05-03 00:35:47,331 [ scc.git] DEBUG Check current status
2024-05-03 00:35:47,331 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-03 00:35:47,335 [ scc.git] DEBUG 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-05-03 00:35:47,336 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-03 00:35:47,373 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-05-03 00:35:47,376 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-03 00:35:47,380 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-05-03 00:35:47,383 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-03 00:35:47,387 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-03 00:35:47,388 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-05-03 00:35:47,388 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-05-03 00:35:47,388 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-05-03 00:35:47,388 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-05-03 00:35:47,388 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-05-03 00:35:47,388 [ scc.repo] DEBUG ## PRs found:
2024-05-03 00:35:47,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-05-03 00:35:48,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/278 HTTP/1.1" 200 None
2024-05-03 00:35:48,229 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-03 00:35:48,229 [ scc.repo] DEBUG - PR 278 dependabot[bot] 'Bump omero-py from `52d9a6f` to `53a327b`'
2024-05-03 00:35:48,229 [ scc.repo] DEBUG ## Branches found:
2024-05-03 00:35:48,230 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 00:35:48,230 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:35:48,234 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 00:35:48,238 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 00:35:48,238 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 00:35:48,242 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 00:35:48,246 [ scc.git] DEBUG Already up to date.
2024-05-03 00:35:48,247 [ scc.git] DEBUG Calling 'git fetch origin pull/278/head'
2024-05-03 00:35:48,626 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-05-03 00:35:48,626 [ scc.git] DEBUG * branch refs/pull/278/head -> FETCH_HEAD
2024-05-03 00:35:48,631 [ scc.git] DEBUG ## Unique users: []
2024-05-03 00:35:48,631 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 00:35:48,632 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:35:48,636 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6c64259c4c9aea3f7c98e9736048d12500aa6fab'
2024-05-03 00:35:48,640 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:35:48,644 [ 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-03 00:35:48,654 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 00:35:48,656 [ scc.git] DEBUG omero-py | 2 +-
2024-05-03 00:35:48,656 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-05-03 00:35:48,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:35:48,827 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 00:35:49,040 [ scc.git] DEBUG Submodule path 'omero-py': checked out '53a327b85034cf09ae5e7255e6fd70b59392b680'
2024-05-03 00:35:49,041 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 00:35:49,041 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:35:49,045 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 00:35:49,212 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8e5a54a460> has no local changes
2024-05-03 00:35:49,212 [ 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#50 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/50/)'
2024-05-03 00:35:49,239 [ scc.git] DEBUG [detached HEAD 55e34f7] merge master -Dorg -Snone
2024-05-03 00:35:49,240 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-05-03 00:35:49,240 [ scc.merge] INFO Already up to date.
2024-05-03 00:35:49,240 [ scc.merge] INFO
2024-05-03 00:35:49,240 [ scc.merge] INFO Merged PRs:
2024-05-03 00:35:49,240 [ scc.merge] INFO - PR 278 dependabot[bot] 'Bump omero-py from `52d9a6f` to `53a327b`'
2024-05-03 00:35:49,240 [ scc.merge] INFO
2024-05-03 00:35:49,240 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-03 00:35:49,240 [ 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-03 00:35:51,698 [ scc.config] DEBUG Found github.token
2024-05-03 00:35:51,701 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-05-03 00:35:51,955 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:35:52,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:35:52,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-05-03 00:35:52,769 [ scc.gh] DEBUG 4018 remaining from 5000 (Reset at 00:05
2024-05-03 00:35:52,769 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-03 00:35:52,773 [ scc.git] DEBUG Check current status
2024-05-03 00:35:52,774 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-03 00:35:52,777 [ scc.git] DEBUG 55e34f7 merge master -Dorg -Snone
2024-05-03 00:35:52,777 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-03 00:35:52,817 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-05-03 00:35:52,820 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-03 00:35:52,823 [ scc.git] DEBUG 53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8)
2024-05-03 00:35:52,827 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-03 00:35:52,830 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-03 00:35:52,836 [ scc.config] DEBUG Found remote.origin.url
2024-05-03 00:35:52,836 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-05-03 00:35:52,840 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-05-03 00:35:53,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-05-03 00:35:53,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-03 00:35:54,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-03 00:35:54,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-03 00:35:55,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-03 00:35:55,012 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 00:35:55,061 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-05-03 00:35:55,061 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-03 00:35:55,065 [ scc.git] DEBUG Check current status
2024-05-03 00:35:55,065 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-03 00:35:55,069 [ scc.git] DEBUG 5863350 Merge pull request #22 from sbesson/python311
2024-05-03 00:35:55,069 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-03 00:35:55,111 [ scc.config] DEBUG Found remote.origin.url
2024-05-03 00:35:55,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-05-03 00:35:55,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-03 00:35:56,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-03 00:35:56,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-03 00:35:57,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-03 00:35:57,194 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 00:35:57,235 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-03 00:35:57,236 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-05-03 00:35:57,236 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-03 00:35:57,240 [ scc.git] DEBUG Check current status
2024-05-03 00:35:57,240 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-03 00:35:57,244 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-05-03 00:35:57,245 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-03 00:35:57,288 [ scc.config] DEBUG Found remote.origin.url
2024-05-03 00:35:57,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-05-03 00:35:58,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-03 00:35:58,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-03 00:35:59,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-03 00:35:59,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-03 00:35:59,491 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 00:35:59,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-03 00:35:59,535 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-05-03 00:35:59,535 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-03 00:35:59,540 [ scc.git] DEBUG Check current status
2024-05-03 00:35:59,540 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-03 00:35:59,555 [ scc.git] DEBUG 53a327b8 Merge pull request #407 from jburel/install_conda_forge
2024-05-03 00:35:59,555 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-03 00:35:59,599 [ scc.config] DEBUG Found remote.origin.url
2024-05-03 00:35:59,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-05-03 00:36:00,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-03 00:36:00,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-03 00:36:01,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-03 00:36:01,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-03 00:36:01,716 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 00:36:01,783 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-03 00:36:01,784 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-05-03 00:36:01,784 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-03 00:36:01,788 [ scc.git] DEBUG Check current status
2024-05-03 00:36:01,788 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-03 00:36:01,792 [ scc.git] DEBUG 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-03 00:36:01,792 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-03 00:36:01,854 [ scc.config] DEBUG Found remote.origin.url
2024-05-03 00:36:01,854 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-05-03 00:36:02,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-05-03 00:36:02,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-03 00:36:03,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-03 00:36:03,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-03 00:36:03,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-03 00:36:03,930 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 00:36:03,973 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-03 00:36:03,974 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-05-03 00:36:03,974 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-03 00:36:03,980 [ scc.git] DEBUG Check current status
2024-05-03 00:36:03,980 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-03 00:36:03,984 [ scc.git] DEBUG e1b1355eb Merge pull request #540 from will-moore/django_template_context_processors_request
2024-05-03 00:36:03,984 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-03 00:36:04,029 [ scc.config] DEBUG Found remote.origin.url
2024-05-03 00:36:04,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-05-03 00:36:04,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-03 00:36:05,297 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-03 00:36:05,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-03 00:36:06,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-03 00:36:06,120 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 00:36:06,161 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-03 00:36:06,161 [ scc.git] DEBUG Resetting...
2024-05-03 00:36:06,161 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-05-03 00:36:06,168 [ scc.git] DEBUG HEAD is now at 55e34f7 merge master -Dorg -Snone
2024-05-03 00:36:06,169 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-05-03 00:36:06,225 [ scc.git] DEBUG Check current status
2024-05-03 00:36:06,225 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-03 00:36:06,230 [ scc.git] DEBUG 55e34f7 merge master -Dorg -Snone
2024-05-03 00:36:06,231 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-03 00:36:06,285 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-05-03 00:36:06,288 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-03 00:36:06,292 [ scc.git] DEBUG 53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8)
2024-05-03 00:36:06,296 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-03 00:36:06,300 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-03 00:36:06,301 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-05-03 00:36:06,301 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-05-03 00:36:06,301 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-05-03 00:36:06,301 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-05-03 00:36:06,301 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-05-03 00:36:06,301 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-05-03 00:36:06,301 [ scc.repo] DEBUG ## PRs found:
2024-05-03 00:36:06,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-05-03 00:36:07,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/278 HTTP/1.1" 200 None
2024-05-03 00:36:07,064 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-03 00:36:07,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/6c64259c4c9aea3f7c98e9736048d12500aa6fab HTTP/1.1" 200 None
2024-05-03 00:36:08,060 [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-03 00:36:08,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/6c64259c4c9aea3f7c98e9736048d12500aa6fab HTTP/1.1" 200 None
2024-05-03 00:36:08,960 [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-03 00:36:08,961 [ scc.repo] DEBUG - PR 278 dependabot[bot] 'Bump omero-py from `52d9a6f` to `53a327b`'
2024-05-03 00:36:08,961 [ scc.repo] DEBUG ## Branches found:
2024-05-03 00:36:08,961 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 00:36:08,961 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:36:08,966 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 00:36:08,970 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 00:36:08,970 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 00:36:08,975 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 00:36:08,980 [ scc.git] DEBUG Already up to date.
2024-05-03 00:36:08,981 [ scc.git] DEBUG Calling 'git fetch origin pull/278/head'
2024-05-03 00:36:09,366 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-05-03 00:36:09,366 [ scc.git] DEBUG * branch refs/pull/278/head -> FETCH_HEAD
2024-05-03 00:36:09,372 [ scc.git] DEBUG ## Unique users: []
2024-05-03 00:36:09,372 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 00:36:09,372 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:36:09,377 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6c64259c4c9aea3f7c98e9736048d12500aa6fab'
2024-05-03 00:36:09,383 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:36:09,387 [ 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-03 00:36:09,392 [ scc.git] DEBUG Already up to date.
2024-05-03 00:36:09,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:36:09,533 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 00:36:09,574 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 00:36:09,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:36:09,579 [ scc.repo] DEBUG ## PRs found:
2024-05-03 00:36:10,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-05-03 00:36:10,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23 HTTP/1.1" 200 None
2024-05-03 00:36:11,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23/comments HTTP/1.1" 200 None
2024-05-03 00:36:11,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None
2024-05-03 00:36:12,005 [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-03 00:36:12,463 [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-03 00:36:12,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None
2024-05-03 00:36:13,333 [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-03 00:36:13,334 [ scc.repo] DEBUG - PR 23 sbesson 'Remove python-future compatibility code'
2024-05-03 00:36:13,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-05-03 00:36:14,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-05-03 00:36:14,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-05-03 00:36:15,195 [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-03 00:36:15,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-05-03 00:36:16,053 [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-03 00:36:16,054 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-05-03 00:36:16,054 [ scc.repo] DEBUG ## Branches found:
2024-05-03 00:36:16,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-05-03 00:36:16,054 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 00:36:16,054 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:36:16,060 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 00:36:16,063 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 00:36:16,064 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 00:36:16,069 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 00:36:16,074 [ scc.git] DEBUG Already up to date.
2024-05-03 00:36:16,074 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-05-03 00:36:16,469 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-05-03 00:36:16,470 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-05-03 00:36:16,474 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head'
2024-05-03 00:36:16,854 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-05-03 00:36:16,854 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD
2024-05-03 00:36:16,860 [ scc.git] DEBUG ## Unique users: []
2024-05-03 00:36:16,860 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 00:36:16,860 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:36:16,865 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-05-03 00:36:16,870 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:36:16,875 [ 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-03 00:36:16,938 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 00:36:16,943 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-05-03 00:36:16,943 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-05-03 00:36:16,943 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-05-03 00:36:16,943 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-05-03 00:36:16,943 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-05-03 00:36:16,945 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-05-03 00:36:16,945 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-05-03 00:36:16,945 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-05-03 00:36:16,945 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-05-03 00:36:16,945 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-05-03 00:36:17,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:36:17,107 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8'
2024-05-03 00:36:17,113 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:36:17,117 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 23 (Remove python-future compatibility code) 9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8'
2024-05-03 00:36:17,187 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-05-03 00:36:17,188 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-05-03 00:36:17,188 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-05-03 00:36:17,188 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-05-03 00:36:17,188 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-05-03 00:36:17,188 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-05-03 00:36:17,188 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-05-03 00:36:17,188 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-05-03 00:36:17,188 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-05-03 00:36:17,188 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 00:36:17,194 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-05-03 00:36:17,194 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++--
2024-05-03 00:36:17,194 [ scc.git] DEBUG .github/workflows/tox.yml | 5 ++--
2024-05-03 00:36:17,194 [ scc.git] DEBUG Dockerfile | 32 ----------------------
2024-05-03 00:36:17,195 [ scc.git] DEBUG setup.py | 2 +-
2024-05-03 00:36:17,195 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 1 -
2024-05-03 00:36:17,195 [ scc.git] DEBUG src/fsDirectory.py | 8 +-----
2024-05-03 00:36:17,195 [ scc.git] DEBUG src/fsDropBox.py | 8 +-----
2024-05-03 00:36:17,195 [ scc.git] DEBUG src/fsDropBoxMonitorClient.py | 11 +-------
2024-05-03 00:36:17,195 [ scc.git] DEBUG src/fsFileServer.py | 12 ++-------
2024-05-03 00:36:17,195 [ scc.git] DEBUG src/fsLists.py | 2 --
2024-05-03 00:36:17,195 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 9 +------
2024-05-03 00:36:17,195 [ scc.git] DEBUG src/fsMonitor.py | 2 --
2024-05-03 00:36:17,195 [ scc.git] DEBUG src/fsMonitorServer.py | 8 +++---
2024-05-03 00:36:17,195 [ scc.git] DEBUG src/fsNotificationScheduler.py | 3 ---
2024-05-03 00:36:17,196 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 21 +++++----------
2024-05-03 00:36:17,196 [ scc.git] DEBUG src/fsUtil.py | 9 +++----
2024-05-03 00:36:17,196 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 8 +-----
2024-05-03 00:36:17,196 [ scc.git] DEBUG test/conftest.py | 2 --
2024-05-03 00:36:17,196 [ scc.git] DEBUG test/drivers.py | 17 +++---------
2024-05-03 00:36:17,196 [ scc.git] DEBUG test/unit/test_drivers.py | 55 ++++++++++++++++----------------------
2024-05-03 00:36:17,196 [ scc.git] DEBUG test/unit/test_monitor.py | 2 --
2024-05-03 00:36:17,196 [ scc.git] DEBUG test/unit/test_replay.py | 8 +-----
2024-05-03 00:36:17,196 [ scc.git] DEBUG test/unit/test_state.py | 1 -
2024-05-03 00:36:17,196 [ scc.git] DEBUG tox.ini | 3 ++-
2024-05-03 00:36:17,196 [ scc.git] DEBUG 25 files changed, 59 insertions(+), 178 deletions(-)
2024-05-03 00:36:17,196 [ scc.git] DEBUG delete mode 100644 Dockerfile
2024-05-03 00:36:17,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:36:17,555 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 00:36:17,595 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 00:36:17,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:36:17,600 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 00:36:17,640 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 00:36:17,648 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff171ac3c10> has no local changes
2024-05-03 00:36:17,648 [ 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#50 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/50/)'
2024-05-03 00:36:17,659 [ scc.git] DEBUG [detached HEAD f003a5e] merge master -Dorg -Ssuccess-only
2024-05-03 00:36:17,659 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-03 00:36:17,659 [ scc.repo] DEBUG ## PRs found:
2024-05-03 00:36:18,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-05-03 00:36:18,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-05-03 00:36:19,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-05-03 00:36:19,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-05-03 00:36:20,032 [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-03 00:36:20,499 [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-03 00:36:21,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-05-03 00:36:21,439 [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-03 00:36:21,440 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-05-03 00:36:21,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-05-03 00:36:22,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-05-03 00:36:22,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-05-03 00:36:23,320 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-05-03 00:36:23,322 [ scc.repo] DEBUG ## Branches found:
2024-05-03 00:36:23,322 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-05-03 00:36:23,322 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 00:36:23,322 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:36:23,328 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 00:36:23,333 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 00:36:23,333 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 00:36:23,338 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 00:36:23,343 [ scc.git] DEBUG Already up to date.
2024-05-03 00:36:23,343 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-05-03 00:36:23,790 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-05-03 00:36:23,790 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-05-03 00:36:23,795 [ scc.git] DEBUG ## Unique users: []
2024-05-03 00:36:23,795 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 00:36:23,795 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:36:23,800 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-05-03 00:36:23,806 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:36:23,813 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-05-03 00:36:23,846 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-05-03 00:36:23,846 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 00:36:23,849 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-05-03 00:36:23,849 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-05-03 00:36:23,849 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-05-03 00:36:24,010 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:36:24,011 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 00:36:24,052 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 00:36:24,052 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:36:24,058 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 00:36:24,098 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 00:36:24,104 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff171a5e0d0> has no local changes
2024-05-03 00:36:24,104 [ 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#50 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/50/)'
2024-05-03 00:36:24,111 [ scc.git] DEBUG [detached HEAD f3e6437] merge master -Dorg -Ssuccess-only
2024-05-03 00:36:24,111 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-03 00:36:24,112 [ scc.repo] DEBUG ## PRs found:
2024-05-03 00:36:24,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-05-03 00:36:25,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-05-03 00:36:25,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-05-03 00:36:26,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-05-03 00:36:26,627 [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-03 00:36:27,089 [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-03 00:36:27,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-05-03 00:36:27,957 [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-03 00:36:28,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-05-03 00:36:28,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-05-03 00:36:28,807 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-05-03 00:36:29,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-05-03 00:36:29,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-05-03 00:36:30,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-05-03 00:36:30,767 [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-03 00:36:31,233 [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-03 00:36:31,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-05-03 00:36:32,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-05-03 00:36:32,679 [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-03 00:36:33,173 [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-03 00:36:33,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-05-03 00:36:34,045 [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-03 00:36:34,511 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-05-03 00:36:34,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-05-03 00:36:34,949 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-05-03 00:36:35,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-05-03 00:36:35,395 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-05-03 00:36:35,886 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378 HTTP/1.1" 200 None
2024-05-03 00:36:36,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378/comments HTTP/1.1" 200 None
2024-05-03 00:36:36,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-05-03 00:36:37,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-05-03 00:36:37,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-05-03 00:36:38,209 [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-03 00:36:38,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-05-03 00:36:39,141 [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-03 00:36:39,142 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-05-03 00:36:39,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-05-03 00:36:40,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-05-03 00:36:40,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-05-03 00:36:41,052 [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-03 00:36:41,525 [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-03 00:36:42,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-05-03 00:36:42,434 [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-03 00:36:42,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-05-03 00:36:43,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-05-03 00:36:43,320 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-05-03 00:36:43,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-05-03 00:36:44,302 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-05-03 00:36:44,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-05-03 00:36:45,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-05-03 00:36:45,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-05-03 00:36:46,164 [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-03 00:36:46,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-05-03 00:36:47,098 [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-03 00:36:47,098 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-05-03 00:36:47,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-05-03 00:36:48,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-05-03 00:36:48,535 [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-03 00:36:49,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-05-03 00:36:49,421 [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-03 00:36:49,422 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-05-03 00:36:49,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-05-03 00:36:50,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-05-03 00:36:50,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-05-03 00:36:51,349 [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-03 00:36:51,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-05-03 00:36:52,279 [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-03 00:36:52,280 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-05-03 00:36:52,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-05-03 00:36:53,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-05-03 00:36:53,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-05-03 00:36:54,165 [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-03 00:36:54,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-05-03 00:36:55,120 [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-03 00:36:55,121 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-05-03 00:36:55,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-05-03 00:36:56,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-05-03 00:36:56,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-05-03 00:36:56,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-05-03 00:36:56,951 [ scc.repo] DEBUG ## Branches found:
2024-05-03 00:36:56,951 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-05-03 00:36:56,952 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 00:36:56,952 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:36:56,957 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 00:36:56,961 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 00:36:56,961 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 00:36:56,966 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 00:36:56,972 [ scc.git] DEBUG Already up to date.
2024-05-03 00:36:56,972 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-05-03 00:36:57,738 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-03 00:36:57,738 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-05-03 00:36:57,743 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-05-03 00:36:58,235 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-03 00:36:58,236 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-05-03 00:36:58,242 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-05-03 00:36:58,697 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-03 00:36:58,697 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-05-03 00:36:58,703 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-05-03 00:36:59,204 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-03 00:36:59,205 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-05-03 00:36:59,211 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-05-03 00:36:59,690 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-03 00:36:59,690 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-05-03 00:36:59,699 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-05-03 00:37:00,128 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-03 00:37:00,128 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-05-03 00:37:00,135 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-05-03 00:37:00,559 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-03 00:37:00,559 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-05-03 00:37:00,566 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-05-03 00:37:01,032 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-03 00:37:01,032 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-05-03 00:37:01,038 [ scc.git] DEBUG ## Unique users: []
2024-05-03 00:37:01,038 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 00:37:01,038 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:37:01,045 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-05-03 00:37:01,062 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:37:01,067 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-05-03 00:37:01,169 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-05-03 00:37:01,170 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-05-03 00:37:01,181 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 00:37:01,185 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-05-03 00:37:01,185 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-05-03 00:37:01,185 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-05-03 00:37:01,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:37:01,347 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-05-03 00:37:01,358 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:37:01,363 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-05-03 00:37:01,536 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-05-03 00:37:01,537 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-05-03 00:37:01,537 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 00:37:01,545 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-05-03 00:37:01,545 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-05-03 00:37:01,545 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-05-03 00:37:01,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:37:01,757 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-05-03 00:37:01,768 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:37:01,773 [ 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-03 00:37:01,888 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-05-03 00:37:01,889 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 00:37:01,893 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-05-03 00:37:01,894 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-05-03 00:37:02,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:37:02,167 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-05-03 00:37:02,179 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:37:02,183 [ 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-03 00:37:02,305 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-05-03 00:37:02,305 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-05-03 00:37:02,306 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 00:37:02,309 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-05-03 00:37:02,310 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-05-03 00:37:02,310 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-05-03 00:37:02,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:37:02,573 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-05-03 00:37:02,584 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:37:02,589 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-05-03 00:37:02,639 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 00:37:02,642 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-05-03 00:37:02,642 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-05-03 00:37:02,642 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-05-03 00:37:02,642 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-05-03 00:37:02,642 [ scc.git] DEBUG create mode 100644 connect.py
2024-05-03 00:37:02,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:37:02,991 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-05-03 00:37:03,009 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:37:03,022 [ 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-03 00:37:03,162 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-05-03 00:37:03,163 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 00:37:03,167 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-05-03 00:37:03,167 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-03 00:37:03,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:37:03,398 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-05-03 00:37:03,415 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:37:03,430 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-05-03 00:37:03,559 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-05-03 00:37:03,560 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 00:37:03,564 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-05-03 00:37:03,564 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-05-03 00:37:03,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:37:03,800 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-05-03 00:37:03,815 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:37:03,821 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-05-03 00:37:03,903 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-05-03 00:37:03,904 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 00:37:03,912 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-05-03 00:37:03,912 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-05-03 00:37:04,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:37:04,254 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 00:37:04,305 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 00:37:04,305 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:37:04,312 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 00:37:04,350 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 00:37:04,360 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff170a018b0> has no local changes
2024-05-03 00:37:04,360 [ 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#50 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/50/)'
2024-05-03 00:37:04,375 [ scc.git] DEBUG [detached HEAD f6e233d8] merge master -Dorg -Ssuccess-only
2024-05-03 00:37:04,376 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-03 00:37:04,377 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-03 00:37:04,377 [ scc.repo] DEBUG ## PRs found:
2024-05-03 00:37:04,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-03 00:37:05,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-03 00:37:05,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-03 00:37:06,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-03 00:37:06,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-03 00:37:07,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-03 00:37:07,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-03 00:37:08,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-03 00:37:08,659 [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-03 00:37:09,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-03 00:37:09,608 [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-03 00:37:09,609 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-03 00:37:10,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-03 00:37:10,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-03 00:37:11,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-03 00:37:11,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-03 00:37:11,631 [ scc.repo] DEBUG ## Branches found:
2024-05-03 00:37:11,631 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-05-03 00:37:11,632 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 00:37:11,632 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:37:11,638 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-03 00:37:11,642 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 00:37:11,642 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-03 00:37:11,647 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-03 00:37:11,652 [ scc.git] DEBUG Already up to date.
2024-05-03 00:37:11,653 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-03 00:37:12,127 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-05-03 00:37:12,128 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-03 00:37:12,135 [ scc.git] DEBUG ## Unique users: []
2024-05-03 00:37:12,135 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 00:37:12,136 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:37:12,142 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-03 00:37:12,154 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:37:12,159 [ 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-03 00:37:12,219 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-03 00:37:12,220 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-03 00:37:12,220 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-03 00:37:12,220 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-03 00:37:12,227 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-03 00:37:12,233 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-03 00:37:12,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:37:12,390 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-03 00:37:12,398 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-03 00:37:12,404 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#50](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/50/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/50/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-03 00:37:12,407 [ scc.config] DEBUG Found github.token
2024-05-03 00:37:12,407 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-03 00:37:12,408 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 00:37:12,447 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 00:37:12,448 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:37:12,453 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 00:37:12,494 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 00:37:12,500 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff1709e6640> has no local changes
2024-05-03 00:37:12,501 [ 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#50 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/50/)'
2024-05-03 00:37:12,509 [ scc.git] DEBUG [detached HEAD 1f7ca92] merge master -Dorg -Ssuccess-only
2024-05-03 00:37:12,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-03 00:37:12,510 [ scc.repo] DEBUG ## PRs found:
2024-05-03 00:37:13,006 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-05-03 00:37:13,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/553 HTTP/1.1" 200 None
2024-05-03 00:37:13,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549 HTTP/1.1" 200 None
2024-05-03 00:37:14,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549/comments HTTP/1.1" 200 None
2024-05-03 00:37:14,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ade7fa1b5839e9b17878c38efd4f6404a5857712 HTTP/1.1" 200 None
2024-05-03 00:37:15,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ade7fa1b5839e9b17878c38efd4f6404a5857712/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-03 00:37:15,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ade7fa1b5839e9b17878c38efd4f6404a5857712/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-03 00:37:16,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543 HTTP/1.1" 200 None
2024-05-03 00:37:16,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543/comments HTTP/1.1" 200 None
2024-05-03 00:37:17,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-05-03 00:37:17,834 [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-03 00:37:18,294 [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-03 00:37:18,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-05-03 00:37:19,254 [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-03 00:37:19,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-05-03 00:37:20,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/status HTTP/1.1" 200 None
2024-05-03 00:37:20,146 [ scc.repo] DEBUG - PR 543 knabar 'Block UI for some long running tasks'
2024-05-03 00:37:20,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542 HTTP/1.1" 200 None
2024-05-03 00:37:21,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542/comments HTTP/1.1" 200 None
2024-05-03 00:37:21,088 [ scc.repo] DEBUG # ... Include label: include
2024-05-03 00:37:21,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-05-03 00:37:22,085 [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-03 00:37:22,572 [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-03 00:37:23,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-05-03 00:37:23,446 [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-03 00:37:23,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-05-03 00:37:24,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/status HTTP/1.1" 200 None
2024-05-03 00:37:24,359 [ scc.repo] DEBUG - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-05-03 00:37:24,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-05-03 00:37:25,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-05-03 00:37:25,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-05-03 00:37:26,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-05-03 00:37:26,759 [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-03 00:37:27,255 [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-03 00:37:27,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-05-03 00:37:28,126 [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-03 00:37:28,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-05-03 00:37:28,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-05-03 00:37:28,996 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-05-03 00:37:29,505 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/533 HTTP/1.1" 200 None
2024-05-03 00:37:30,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-05-03 00:37:30,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-03 00:37:30,944 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-05-03 00:37:31,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-05-03 00:37:31,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/e335980be1e7197826687f6c322a60c61b4aa545?per_page=1 HTTP/1.1" 200 None
2024-05-03 00:37:32,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-05-03 00:37:32,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545/status HTTP/1.1" 200 None
2024-05-03 00:37:32,730 [ scc.repo] DEBUG - PR 533 jburel 'use conda-forge channel'
2024-05-03 00:37:33,200 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-05-03 00:37:33,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-05-03 00:37:34,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-05-03 00:37:34,639 [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-03 00:37:35,131 [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-03 00:37:35,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-05-03 00:37:36,004 [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-03 00:37:36,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-05-03 00:37:36,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-05-03 00:37:36,927 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-05-03 00:37:37,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-05-03 00:37:37,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-05-03 00:37:38,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615 HTTP/1.1" 200 None
2024-05-03 00:37:38,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-05-03 00:37:39,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615 HTTP/1.1" 200 None
2024-05-03 00:37:39,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/219d9e721304a4c46b4d73ef9ff3777549d69615?per_page=1 HTTP/1.1" 200 2
2024-05-03 00:37:39,836 [ scc.repo] DEBUG - PR 168 stick 'Changes to nginx @maintenance handler'
2024-05-03 00:37:39,837 [ scc.repo] DEBUG ## Branches found:
2024-05-03 00:37:39,837 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-05-03 00:37:39,837 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 00:37:39,837 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:37:39,842 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-03 00:37:39,845 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-03 00:37:39,846 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-03 00:37:39,850 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-03 00:37:39,854 [ scc.git] DEBUG Already up to date.
2024-05-03 00:37:39,854 [ scc.git] DEBUG Calling 'git fetch origin pull/168/head'
2024-05-03 00:37:40,567 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-03 00:37:40,568 [ scc.git] DEBUG * branch refs/pull/168/head -> FETCH_HEAD
2024-05-03 00:37:40,573 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-05-03 00:37:41,137 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-03 00:37:41,137 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-05-03 00:37:41,142 [ scc.git] DEBUG Calling 'git fetch origin pull/533/head'
2024-05-03 00:37:41,551 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-03 00:37:41,552 [ scc.git] DEBUG * branch refs/pull/533/head -> FETCH_HEAD
2024-05-03 00:37:41,556 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-05-03 00:37:42,002 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-03 00:37:42,002 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-05-03 00:37:42,008 [ scc.git] DEBUG Calling 'git fetch origin pull/542/head'
2024-05-03 00:37:42,807 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-03 00:37:42,808 [ scc.git] DEBUG * branch refs/pull/542/head -> FETCH_HEAD
2024-05-03 00:37:42,814 [ scc.git] DEBUG Calling 'git fetch origin pull/543/head'
2024-05-03 00:37:44,019 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-03 00:37:44,020 [ scc.git] DEBUG * branch refs/pull/543/head -> FETCH_HEAD
2024-05-03 00:37:44,025 [ scc.git] DEBUG ## Unique users: []
2024-05-03 00:37:44,025 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 00:37:44,025 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:37:44,030 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-05-03 00:37:44,045 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:37:44,051 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 168 (Changes to nginx @maintenance handler) 219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-05-03 00:37:44,152 [ scc.git] DEBUG Auto-merging test/unit/test_web.py
2024-05-03 00:37:44,152 [ scc.git] DEBUG CONFLICT (content): Merge conflict in test/unit/test_web.py
2024-05-03 00:37:44,152 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-03 00:37:44,154 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-03 00:37:44,163 [ scc.git] DEBUG Calling 'git reset --hard e1b1355ebd4f9de8b855dd2c55f59d86c061a81b'
2024-05-03 00:37:44,175 [ scc.git] DEBUG HEAD is now at e1b1355eb Merge pull request #540 from will-moore/django_template_context_processors_request
2024-05-03 00:37:44,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:37:44,368 [ scc.git] DEBUG Calling 'git merge-base e1b1355ebd4f9de8b855dd2c55f59d86c061a81b 219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-05-03 00:37:44,385 [ scc.git] DEBUG Calling 'git diff --name-only 632d14a9cab5319c6b1bd9190d441a95e457103b..e1b1355ebd4f9de8b855dd2c55f59d86c061a81b'
2024-05-03 00:37:44,518 [ scc.git] INFO - PR 168 stick 'Changes to nginx @maintenance handler'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#50](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/50/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/50/consoleText) for more details.
Possible conflicts:
- Upstream changes
- test/unit/test_web.py
--conflicts
2024-05-03 00:37:44,523 [ scc.config] DEBUG Found github.token
2024-05-03 00:37:44,523 [ scc.git] DEBUG Not adding comment to issue #168, already --conflicts.
2024-05-03 00:37:44,523 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-05-03 00:37:44,529 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:37:44,533 [ 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-03 00:37:44,595 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-05-03 00:37:44,595 [ scc.git] DEBUG Auto-merging setup.py
2024-05-03 00:37:44,596 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 00:37:44,601 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-05-03 00:37:44,601 [ scc.git] DEBUG setup.py | 1 +
2024-05-03 00:37:44,601 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-05-03 00:37:44,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:37:44,782 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e335980be1e7197826687f6c322a60c61b4aa545'
2024-05-03 00:37:44,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:37:44,792 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 533 (use conda-forge channel) e335980be1e7197826687f6c322a60c61b4aa545'
2024-05-03 00:37:44,826 [ scc.git] DEBUG Auto-merging README.rst
2024-05-03 00:37:44,827 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 00:37:44,831 [ scc.git] DEBUG README.rst | 3 +--
2024-05-03 00:37:44,831 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 2 deletions(-)
2024-05-03 00:37:45,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:37:45,194 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-05-03 00:37:45,201 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:37:45,205 [ 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-03 00:37:45,327 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-05-03 00:37:45,328 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-05-03 00:37:45,329 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 00:37:45,333 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-05-03 00:37:45,334 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-05-03 00:37:45,334 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-05-03 00:37:45,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:37:45,607 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...977f7b65169e6dee479197a9156993bbadd2d2e2'
2024-05-03 00:37:45,614 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:37:45,618 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 542 (PlateAcquisition filtering with plate display) 977f7b65169e6dee479197a9156993bbadd2d2e2'
2024-05-03 00:37:45,789 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py
2024-05-03 00:37:45,791 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 00:37:45,798 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 13 +++-------
2024-05-03 00:37:45,798 [ scc.git] DEBUG .../webclient/templates/webclient/data/plate.html | 10 ++++----
2024-05-03 00:37:45,798 [ scc.git] DEBUG omeroweb/webclient/views.py | 17 ++++++++++++
2024-05-03 00:37:45,799 [ scc.git] DEBUG omeroweb/webgateway/plategrid.py | 30 +++++++++++++++++++---
2024-05-03 00:37:45,799 [ scc.git] DEBUG .../static/webgateway/js/ome.plateview.js | 16 +++++++-----
2024-05-03 00:37:45,799 [ scc.git] DEBUG omeroweb/webgateway/urls.py | 2 +-
2024-05-03 00:37:45,799 [ scc.git] DEBUG omeroweb/webgateway/views.py | 16 ++++++++++--
2024-05-03 00:37:45,799 [ scc.git] DEBUG 7 files changed, 78 insertions(+), 26 deletions(-)
2024-05-03 00:37:46,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:37:46,015 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4'
2024-05-03 00:37:46,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:37:46,028 [ 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-03 00:37:46,147 [ scc.git] DEBUG Auto-merging omeroweb/webclient/templates/webclient/data/includes/center_plugin.thumbs.js.html
2024-05-03 00:37:46,149 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-03 00:37:46,155 [ scc.git] DEBUG .../webclient/javascript/ome.progress_overlay.js | 60 ++++++
2024-05-03 00:37:46,155 [ scc.git] DEBUG .../webclient/javascript/ome.webclient.actions.js | 112 +++++++-----
2024-05-03 00:37:46,155 [ scc.git] DEBUG .../webclient/annotations/metadata_preview.html | 51 +++---
2024-05-03 00:37:46,155 [ scc.git] DEBUG .../webclient/templates/webclient/base/base.html | 1 +
2024-05-03 00:37:46,155 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 2 +-
2024-05-03 00:37:46,155 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 16 +-
2024-05-03 00:37:46,155 [ scc.git] DEBUG .../static/webgateway/js/ome.gs_utils.js | 201 ---------------------
2024-05-03 00:37:46,155 [ scc.git] DEBUG .../webgateway/static/webgateway/js/ome.popup.js | 1 -
2024-05-03 00:37:46,155 [ scc.git] DEBUG .../webgateway/static/webgateway/js/omero_image.js | 35 ++--
2024-05-03 00:37:46,155 [ scc.git] DEBUG 9 files changed, 186 insertions(+), 293 deletions(-)
2024-05-03 00:37:46,156 [ scc.git] DEBUG create mode 100644 omeroweb/webclient/static/webclient/javascript/ome.progress_overlay.js
2024-05-03 00:37:46,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:37:46,498 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-03 00:37:46,542 [ scc.git] DEBUG Get sha1 of %s
2024-05-03 00:37:46,543 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-03 00:37:46,548 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 00:37:46,591 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 00:37:46,603 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff170a14910> has no local changes
2024-05-03 00:37:46,603 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
- PR 549 knabar 'Remove webgateway cache' (status: failure)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 533 jburel 'use conda-forge channel'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
- PR 543 knabar 'Block UI for some long running tasks'
Conflicting PRs (not included):
- PR 168 stick 'Changes to nginx @maintenance handler'
Generated by OMERO-python-superbuild-push#50 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/50/)'
2024-05-03 00:37:46,617 [ scc.git] DEBUG [detached HEAD 99f26fa4c] merge master -Dorg -Ssuccess-only
2024-05-03 00:37:46,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-03 00:37:46,618 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-03 00:37:46,673 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-05-03 00:37:46,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:37:46,936 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-05-03 00:37:47,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:37:47,343 [ scc.config] DEBUG Found submodule.omero-py.url
2024-05-03 00:37:47,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:37:47,749 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-05-03 00:37:48,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:37:48,163 [ scc.config] DEBUG Found submodule.omero-web.url
2024-05-03 00:37:48,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-03 00:37:48,559 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-03 00:37:48,590 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff173e70460> has local changes
2024-05-03 00:37:48,590 [ 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 549 knabar 'Remove webgateway cache' (status: failure)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 533 jburel 'use conda-forge channel'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
- PR 543 knabar 'Block UI for some long running tasks'
Conflicting PRs (not included):
- PR 168 stick 'Changes to nginx @maintenance handler'
Generated by OMERO-python-superbuild-push#50 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/50/)'
2024-05-03 00:37:48,600 [ scc.git] DEBUG [detached HEAD 18bdd9a] merge master -Dorg -Ssuccess-only
2024-05-03 00:37:48,600 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-05-03 00:37:48,601 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-05-03 00:37:48,601 [ scc.merge] INFO Already up to date.
2024-05-03 00:37:48,601 [ scc.merge] INFO
2024-05-03 00:37:48,601 [ scc.merge] INFO Merged PRs:
2024-05-03 00:37:48,601 [ scc.merge] INFO - PR 278 dependabot[bot] 'Bump omero-py from `52d9a6f` to `53a327b`'
2024-05-03 00:37:48,601 [ scc.merge] INFO
2024-05-03 00:37:48,601 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-05-03 00:37:48,601 [ scc.merge] INFO Already up to date.
2024-05-03 00:37:48,601 [ scc.merge] INFO
2024-05-03 00:37:48,601 [ scc.merge] INFO Merged PRs:
2024-05-03 00:37:48,601 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-05-03 00:37:48,601 [ scc.merge] INFO - PR 23 sbesson 'Remove python-future compatibility code'
2024-05-03 00:37:48,601 [ scc.merge] INFO
2024-05-03 00:37:48,601 [ scc.merge] INFO Repository: ome/omero-marshal
2024-05-03 00:37:48,601 [ scc.merge] INFO Excluded PRs:
2024-05-03 00:37:48,601 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-05-03 00:37:48,601 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-05-03 00:37:48,601 [ scc.merge] INFO Already up to date.
2024-05-03 00:37:48,601 [ scc.merge] INFO
2024-05-03 00:37:48,601 [ scc.merge] INFO Merged PRs:
2024-05-03 00:37:48,601 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-05-03 00:37:48,601 [ scc.merge] INFO
2024-05-03 00:37:48,601 [ scc.merge] INFO Repository: ome/omero-py
2024-05-03 00:37:48,601 [ scc.merge] INFO Excluded PRs:
2024-05-03 00:37:48,602 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-05-03 00:37:48,602 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-05-03 00:37:48,602 [ scc.merge] INFO - PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
2024-05-03 00:37:48,602 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-05-03 00:37:48,602 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-05-03 00:37:48,602 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-05-03 00:37:48,602 [ scc.merge] INFO Already up to date.
2024-05-03 00:37:48,602 [ scc.merge] INFO
2024-05-03 00:37:48,602 [ scc.merge] INFO Merged PRs:
2024-05-03 00:37:48,602 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-05-03 00:37:48,602 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-05-03 00:37:48,602 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-05-03 00:37:48,602 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-05-03 00:37:48,602 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-05-03 00:37:48,602 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-05-03 00:37:48,602 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-05-03 00:37:48,602 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-05-03 00:37:48,602 [ scc.merge] INFO
2024-05-03 00:37:48,602 [ scc.merge] INFO Repository: ome/omero-scripts
2024-05-03 00:37:48,602 [ scc.merge] INFO Excluded PRs:
2024-05-03 00:37:48,602 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-03 00:37:48,602 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-03 00:37:48,602 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-03 00:37:48,602 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-03 00:37:48,602 [ scc.merge] INFO Already up to date.
2024-05-03 00:37:48,602 [ scc.merge] INFO
2024-05-03 00:37:48,602 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-03 00:37:48,602 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-03 00:37:48,602 [ scc.merge] INFO
2024-05-03 00:37:48,602 [ scc.merge] INFO Repository: ome/omero-web
2024-05-03 00:37:48,602 [ scc.merge] INFO Excluded PRs:
2024-05-03 00:37:48,602 [ scc.merge] INFO - PR 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-03 00:37:48,602 [ scc.merge] INFO - PR 549 knabar 'Remove webgateway cache' (status: failure)
2024-05-03 00:37:48,602 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-05-03 00:37:48,602 [ scc.merge] INFO Already up to date.
2024-05-03 00:37:48,602 [ scc.merge] INFO
2024-05-03 00:37:48,603 [ scc.merge] INFO Merged PRs:
2024-05-03 00:37:48,603 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-05-03 00:37:48,603 [ scc.merge] INFO - PR 533 jburel 'use conda-forge channel'
2024-05-03 00:37:48,603 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-05-03 00:37:48,603 [ scc.merge] INFO - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-05-03 00:37:48,603 [ scc.merge] INFO - PR 543 knabar 'Block UI for some long running tasks'
2024-05-03 00:37:48,603 [ scc.merge] INFO
2024-05-03 00:37:48,603 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-03 00:37:48,603 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler'
2024-05-03 00:37:48,603 [ scc.merge] INFO
2024-05-03 00:37:48,603 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-03 00:37:48,603 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 00:37:48,608 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-05-03 00:37:48,608 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 00:37:48,613 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-03 00:37:48,613 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-05-03 00:37:48,613 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 00:37:48,618 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-03 00:37:48,618 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-05-03 00:37:48,618 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 00:37:48,622 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-03 00:37:48,622 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-05-03 00:37:48,622 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 00:37:48,626 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-03 00:37:48,626 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-05-03 00:37:48,626 [ scc.git] DEBUG Calling 'git remote'
2024-05-03 00:37:48,630 [ 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-03 00:38:19,020 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/03a0bb70/images/svgs/logo.svg){kind=logo}
