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-07 00:34:06,539 [ scc.config] DEBUG Found github.token
2024-05-07 00:34:06,541 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-05-07 00:34:06,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:34:07,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:34:07,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-05-07 00:34:07,595 [ scc.gh] DEBUG 5000 remaining from 5000 (Reset at 01:05
2024-05-07 00:34:07,596 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-07 00:34:07,601 [ scc.git] DEBUG Check current status
2024-05-07 00:34:07,601 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-07 00:34:07,605 [ scc.git] DEBUG 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-05-07 00:34:07,606 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-07 00:34:07,669 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-05-07 00:34:07,672 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-07 00:34:07,690 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-05-07 00:34:07,694 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-07 00:34:07,840 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-07 00:34:07,846 [ scc.config] DEBUG Found remote.origin.url
2024-05-07 00:34:08,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-05-07 00:34:08,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-07 00:34:09,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-07 00:34:09,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-07 00:34:09,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-07 00:34:09,947 [ scc.git] DEBUG Resetting...
2024-05-07 00:34:09,947 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-05-07 00:34:09,954 [ scc.git] DEBUG HEAD is now at 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-05-07 00:34:09,954 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-05-07 00:34:10,002 [ scc.git] DEBUG Check current status
2024-05-07 00:34:10,003 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-07 00:34:10,008 [ scc.git] DEBUG 9308a59 Merge pull request #275 from ome/dependabot/submodules/omero-scripts-5a90893
2024-05-07 00:34:10,008 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-07 00:34:10,046 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-05-07 00:34:10,049 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-07 00:34:10,052 [ scc.git] DEBUG 52d9a6f42690aa033acaf808521612720dd50757 omero-py (v5.19.2-1-g52d9a6f4)
2024-05-07 00:34:10,055 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-07 00:34:10,058 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-07 00:34:10,059 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-05-07 00:34:10,059 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-05-07 00:34:10,059 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-05-07 00:34:10,059 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-05-07 00:34:10,059 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-05-07 00:34:10,059 [ scc.repo] DEBUG ## PRs found:
2024-05-07 00:34:10,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-05-07 00:34:10,896 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/278 HTTP/1.1" 200 None
2024-05-07 00:34:10,897 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-07 00:34:10,897 [ scc.repo] DEBUG - PR 278 dependabot[bot] 'Bump omero-py from `52d9a6f` to `53a327b`'
2024-05-07 00:34:10,897 [ scc.repo] DEBUG ## Branches found:
2024-05-07 00:34:10,897 [ scc.git] DEBUG Get sha1 of %s
2024-05-07 00:34:10,897 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:34:10,903 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-07 00:34:10,908 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-07 00:34:10,908 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-07 00:34:10,918 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-07 00:34:10,925 [ scc.git] DEBUG Already up to date.
2024-05-07 00:34:10,926 [ scc.git] DEBUG Calling 'git fetch origin pull/278/head'
2024-05-07 00:34:11,341 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-05-07 00:34:11,341 [ scc.git] DEBUG * branch refs/pull/278/head -> FETCH_HEAD
2024-05-07 00:34:11,348 [ scc.git] DEBUG ## Unique users: []
2024-05-07 00:34:11,348 [ scc.git] DEBUG Get sha1 of %s
2024-05-07 00:34:11,348 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:34:11,353 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6c64259c4c9aea3f7c98e9736048d12500aa6fab'
2024-05-07 00:34:11,365 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:34:11,370 [ 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-07 00:34:11,379 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-07 00:34:11,381 [ scc.git] DEBUG omero-py | 2 +-
2024-05-07 00:34:11,381 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-05-07 00:34:11,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:34:11,541 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-07 00:34:11,981 [ scc.git] DEBUG Submodule path 'omero-py': checked out '53a327b85034cf09ae5e7255e6fd70b59392b680'
2024-05-07 00:34:11,982 [ scc.git] DEBUG Get sha1 of %s
2024-05-07 00:34:11,982 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:34:11,987 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-07 00:34:12,228 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1a27ba6e80> has no local changes
2024-05-07 00:34:12,228 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/54/)'
2024-05-07 00:34:12,252 [ scc.git] DEBUG [detached HEAD fa87930] merge master -Dorg -Snone
2024-05-07 00:34:12,252 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-05-07 00:34:12,252 [ scc.merge] INFO Already up to date.
2024-05-07 00:34:12,252 [ scc.merge] INFO
2024-05-07 00:34:12,252 [ scc.merge] INFO Merged PRs:
2024-05-07 00:34:12,252 [ scc.merge] INFO - PR 278 dependabot[bot] 'Bump omero-py from `52d9a6f` to `53a327b`'
2024-05-07 00:34:12,252 [ scc.merge] INFO
2024-05-07 00:34:12,252 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-07 00:34:12,253 [ 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-07 00:34:14,647 [ scc.config] DEBUG Found github.token
2024-05-07 00:34:14,650 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-05-07 00:34:14,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:34:15,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:34:15,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-05-07 00:34:15,688 [ scc.gh] DEBUG 3269 remaining from 5000 (Reset at 01:05
2024-05-07 00:34:15,689 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-07 00:34:15,693 [ scc.git] DEBUG Check current status
2024-05-07 00:34:15,693 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-07 00:34:15,698 [ scc.git] DEBUG fa87930 merge master -Dorg -Snone
2024-05-07 00:34:15,698 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-07 00:34:15,747 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-05-07 00:34:15,750 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-07 00:34:15,754 [ scc.git] DEBUG 53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8)
2024-05-07 00:34:15,758 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-07 00:34:15,761 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-07 00:34:15,766 [ scc.config] DEBUG Found remote.origin.url
2024-05-07 00:34:15,767 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-05-07 00:34:15,768 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-05-07 00:34:16,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-05-07 00:34:16,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-07 00:34:17,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-07 00:34:17,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-07 00:34:17,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-07 00:34:17,848 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-07 00:34:17,898 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-05-07 00:34:17,898 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-07 00:34:17,902 [ scc.git] DEBUG Check current status
2024-05-07 00:34:17,902 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-07 00:34:17,905 [ scc.git] DEBUG 5863350 Merge pull request #22 from sbesson/python311
2024-05-07 00:34:17,905 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-07 00:34:17,952 [ scc.config] DEBUG Found remote.origin.url
2024-05-07 00:34:18,354 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-05-07 00:34:18,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-07 00:34:19,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-07 00:34:19,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-07 00:34:20,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-07 00:34:20,074 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-07 00:34:20,118 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-07 00:34:20,120 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-05-07 00:34:20,120 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-07 00:34:20,125 [ scc.git] DEBUG Check current status
2024-05-07 00:34:20,125 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-07 00:34:20,129 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-05-07 00:34:20,129 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-07 00:34:20,172 [ scc.config] DEBUG Found remote.origin.url
2024-05-07 00:34:20,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-05-07 00:34:21,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-07 00:34:21,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-07 00:34:21,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-07 00:34:22,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-07 00:34:22,292 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-07 00:34:22,331 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-07 00:34:22,333 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-05-07 00:34:22,333 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-07 00:34:22,337 [ scc.git] DEBUG Check current status
2024-05-07 00:34:22,338 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-07 00:34:22,356 [ scc.git] DEBUG 53a327b8 Merge pull request #407 from jburel/install_conda_forge
2024-05-07 00:34:22,356 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-07 00:34:22,403 [ scc.config] DEBUG Found remote.origin.url
2024-05-07 00:34:22,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-05-07 00:34:23,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-07 00:34:23,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-07 00:34:24,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-07 00:34:24,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-07 00:34:24,548 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-07 00:34:24,593 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-07 00:34:24,594 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-05-07 00:34:24,594 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-07 00:34:24,599 [ scc.git] DEBUG Check current status
2024-05-07 00:34:24,599 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-07 00:34:24,644 [ scc.git] DEBUG 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-07 00:34:24,644 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-07 00:34:24,691 [ scc.config] DEBUG Found remote.origin.url
2024-05-07 00:34:24,692 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-05-07 00:34:25,048 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-05-07 00:34:25,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-07 00:34:25,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-07 00:34:26,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-07 00:34:26,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-07 00:34:26,740 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-07 00:34:26,783 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-07 00:34:26,784 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-05-07 00:34:26,784 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-05-07 00:34:26,789 [ scc.git] DEBUG Check current status
2024-05-07 00:34:26,789 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-07 00:34:26,802 [ scc.git] DEBUG e1b1355eb Merge pull request #540 from will-moore/django_template_context_processors_request
2024-05-07 00:34:26,803 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-07 00:34:26,851 [ scc.config] DEBUG Found remote.origin.url
2024-05-07 00:34:27,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-05-07 00:34:27,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-05-07 00:34:28,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-05-07 00:34:28,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-05-07 00:34:29,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-05-07 00:34:29,037 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-07 00:34:29,083 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-07 00:34:29,083 [ scc.git] DEBUG Resetting...
2024-05-07 00:34:29,083 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-05-07 00:34:29,090 [ scc.git] DEBUG HEAD is now at fa87930 merge master -Dorg -Snone
2024-05-07 00:34:29,090 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-05-07 00:34:29,155 [ scc.git] DEBUG Check current status
2024-05-07 00:34:29,156 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-05-07 00:34:29,160 [ scc.git] DEBUG fa87930 merge master -Dorg -Snone
2024-05-07 00:34:29,161 [ scc.git] DEBUG Calling 'git submodule status'
2024-05-07 00:34:29,205 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-05-07 00:34:29,207 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-05-07 00:34:29,211 [ scc.git] DEBUG 53a327b85034cf09ae5e7255e6fd70b59392b680 omero-py (v5.19.2-5-g53a327b8)
2024-05-07 00:34:29,215 [ scc.git] DEBUG 5a908933161233015332dd416c325c60c5b8bd3a omero-scripts (v5.8.2-1-g5a90893)
2024-05-07 00:34:29,220 [ scc.git] DEBUG e1b1355ebd4f9de8b855dd2c55f59d86c061a81b omero-web (v5.25.0-9-ge1b1355eb)
2024-05-07 00:34:29,222 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-05-07 00:34:29,222 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-05-07 00:34:29,222 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-05-07 00:34:29,222 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-05-07 00:34:29,222 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-05-07 00:34:29,222 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-05-07 00:34:29,222 [ scc.repo] DEBUG ## PRs found:
2024-05-07 00:34:29,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-05-07 00:34:30,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/278 HTTP/1.1" 200 None
2024-05-07 00:34:30,039 [ scc.repo] DEBUG # ... Include label: dependencies
2024-05-07 00:34:30,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/6c64259c4c9aea3f7c98e9736048d12500aa6fab HTTP/1.1" 200 None
2024-05-07 00:34:30,938 [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-07 00:34:31,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/6c64259c4c9aea3f7c98e9736048d12500aa6fab HTTP/1.1" 200 None
2024-05-07 00:34:31,900 [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-07 00:34:31,900 [ scc.repo] DEBUG - PR 278 dependabot[bot] 'Bump omero-py from `52d9a6f` to `53a327b`'
2024-05-07 00:34:31,901 [ scc.repo] DEBUG ## Branches found:
2024-05-07 00:34:31,901 [ scc.git] DEBUG Get sha1 of %s
2024-05-07 00:34:31,901 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:34:31,906 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-07 00:34:31,910 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-07 00:34:31,910 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-07 00:34:31,915 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-07 00:34:31,920 [ scc.git] DEBUG Already up to date.
2024-05-07 00:34:31,920 [ scc.git] DEBUG Calling 'git fetch origin pull/278/head'
2024-05-07 00:34:32,295 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-05-07 00:34:32,295 [ scc.git] DEBUG * branch refs/pull/278/head -> FETCH_HEAD
2024-05-07 00:34:32,300 [ scc.git] DEBUG ## Unique users: []
2024-05-07 00:34:32,300 [ scc.git] DEBUG Get sha1 of %s
2024-05-07 00:34:32,300 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:34:32,307 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6c64259c4c9aea3f7c98e9736048d12500aa6fab'
2024-05-07 00:34:32,313 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:34:32,318 [ 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-07 00:34:32,323 [ scc.git] DEBUG Already up to date.
2024-05-07 00:34:32,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:34:32,484 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-07 00:34:32,530 [ scc.git] DEBUG Get sha1 of %s
2024-05-07 00:34:32,530 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:34:32,536 [ scc.repo] DEBUG ## PRs found:
2024-05-07 00:34:33,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-05-07 00:34:33,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23 HTTP/1.1" 200 None
2024-05-07 00:34:33,999 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23/comments HTTP/1.1" 200 None
2024-05-07 00:34:34,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None
2024-05-07 00:34:34,879 [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-07 00:34:35,372 [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-07 00:34:35,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None
2024-05-07 00:34:36,279 [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-07 00:34:36,279 [ scc.repo] DEBUG - PR 23 sbesson 'Remove python-future compatibility code'
2024-05-07 00:34:36,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-05-07 00:34:37,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-05-07 00:34:37,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-05-07 00:34:38,205 [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-07 00:34:38,663 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-05-07 00:34:39,077 [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-07 00:34:39,078 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-05-07 00:34:39,078 [ scc.repo] DEBUG ## Branches found:
2024-05-07 00:34:39,078 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-05-07 00:34:39,078 [ scc.git] DEBUG Get sha1 of %s
2024-05-07 00:34:39,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:34:39,083 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-07 00:34:39,087 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-07 00:34:39,087 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-07 00:34:39,092 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-07 00:34:39,099 [ scc.git] DEBUG Already up to date.
2024-05-07 00:34:39,099 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-05-07 00:34:39,523 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-05-07 00:34:39,523 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-05-07 00:34:39,528 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head'
2024-05-07 00:34:39,897 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-05-07 00:34:39,898 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD
2024-05-07 00:34:39,902 [ scc.git] DEBUG ## Unique users: []
2024-05-07 00:34:39,903 [ scc.git] DEBUG Get sha1 of %s
2024-05-07 00:34:39,903 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:34:39,907 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-05-07 00:34:39,912 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:34:39,918 [ 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-07 00:34:40,126 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-07 00:34:40,130 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-05-07 00:34:40,130 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-05-07 00:34:40,130 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-05-07 00:34:40,130 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-05-07 00:34:40,130 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-05-07 00:34:40,130 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-05-07 00:34:40,130 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-05-07 00:34:40,130 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-05-07 00:34:40,132 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-05-07 00:34:40,132 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-05-07 00:34:40,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:34:40,292 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8'
2024-05-07 00:34:40,297 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:34:40,302 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 23 (Remove python-future compatibility code) 9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8'
2024-05-07 00:34:40,405 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-05-07 00:34:40,405 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-05-07 00:34:40,405 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-05-07 00:34:40,405 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-05-07 00:34:40,405 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-05-07 00:34:40,405 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-05-07 00:34:40,405 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-05-07 00:34:40,405 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-05-07 00:34:40,405 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-05-07 00:34:40,406 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-07 00:34:40,412 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-05-07 00:34:40,412 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++--
2024-05-07 00:34:40,412 [ scc.git] DEBUG .github/workflows/tox.yml | 5 ++--
2024-05-07 00:34:40,412 [ scc.git] DEBUG Dockerfile | 32 ----------------------
2024-05-07 00:34:40,412 [ scc.git] DEBUG setup.py | 2 +-
2024-05-07 00:34:40,412 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 1 -
2024-05-07 00:34:40,412 [ scc.git] DEBUG src/fsDirectory.py | 8 +-----
2024-05-07 00:34:40,412 [ scc.git] DEBUG src/fsDropBox.py | 8 +-----
2024-05-07 00:34:40,412 [ scc.git] DEBUG src/fsDropBoxMonitorClient.py | 11 +-------
2024-05-07 00:34:40,412 [ scc.git] DEBUG src/fsFileServer.py | 12 ++-------
2024-05-07 00:34:40,412 [ scc.git] DEBUG src/fsLists.py | 2 --
2024-05-07 00:34:40,412 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 9 +------
2024-05-07 00:34:40,413 [ scc.git] DEBUG src/fsMonitor.py | 2 --
2024-05-07 00:34:40,413 [ scc.git] DEBUG src/fsMonitorServer.py | 8 +++---
2024-05-07 00:34:40,413 [ scc.git] DEBUG src/fsNotificationScheduler.py | 3 ---
2024-05-07 00:34:40,413 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 21 +++++----------
2024-05-07 00:34:40,413 [ scc.git] DEBUG src/fsUtil.py | 9 +++----
2024-05-07 00:34:40,413 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 8 +-----
2024-05-07 00:34:40,413 [ scc.git] DEBUG test/conftest.py | 2 --
2024-05-07 00:34:40,413 [ scc.git] DEBUG test/drivers.py | 17 +++---------
2024-05-07 00:34:40,413 [ scc.git] DEBUG test/unit/test_drivers.py | 55 ++++++++++++++++----------------------
2024-05-07 00:34:40,413 [ scc.git] DEBUG test/unit/test_monitor.py | 2 --
2024-05-07 00:34:40,413 [ scc.git] DEBUG test/unit/test_replay.py | 8 +-----
2024-05-07 00:34:40,413 [ scc.git] DEBUG test/unit/test_state.py | 1 -
2024-05-07 00:34:40,413 [ scc.git] DEBUG tox.ini | 3 ++-
2024-05-07 00:34:40,413 [ scc.git] DEBUG 25 files changed, 59 insertions(+), 178 deletions(-)
2024-05-07 00:34:40,413 [ scc.git] DEBUG delete mode 100644 Dockerfile
2024-05-07 00:34:40,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:34:40,711 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-07 00:34:40,760 [ scc.git] DEBUG Get sha1 of %s
2024-05-07 00:34:40,760 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:34:40,765 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-07 00:34:40,802 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-07 00:34:40,808 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa06ebf73d0> has no local changes
2024-05-07 00:34:40,808 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/54/)'
2024-05-07 00:34:40,816 [ scc.git] DEBUG [detached HEAD 8bb2f31] merge master -Dorg -Ssuccess-only
2024-05-07 00:34:40,816 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-07 00:34:40,816 [ scc.repo] DEBUG ## PRs found:
2024-05-07 00:34:41,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-05-07 00:34:41,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-05-07 00:34:42,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-05-07 00:34:42,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-05-07 00:34:43,101 [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-07 00:34:43,549 [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-07 00:34:44,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-05-07 00:34:44,452 [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-07 00:34:44,453 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-05-07 00:34:44,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-05-07 00:34:45,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-05-07 00:34:45,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-05-07 00:34:46,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-05-07 00:34:46,351 [ scc.repo] DEBUG ## Branches found:
2024-05-07 00:34:46,351 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-05-07 00:34:46,351 [ scc.git] DEBUG Get sha1 of %s
2024-05-07 00:34:46,351 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:34:46,356 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-07 00:34:46,359 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-07 00:34:46,359 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-07 00:34:46,364 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-07 00:34:46,368 [ scc.git] DEBUG Already up to date.
2024-05-07 00:34:46,368 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-05-07 00:34:46,890 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-05-07 00:34:46,891 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-05-07 00:34:46,896 [ scc.git] DEBUG ## Unique users: []
2024-05-07 00:34:46,896 [ scc.git] DEBUG Get sha1 of %s
2024-05-07 00:34:46,896 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:34:46,901 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-05-07 00:34:46,907 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:34:46,910 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-05-07 00:34:46,929 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-05-07 00:34:46,930 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-07 00:34:46,932 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-05-07 00:34:46,933 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-05-07 00:34:46,933 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-05-07 00:34:47,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:34:47,099 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-07 00:34:47,142 [ scc.git] DEBUG Get sha1 of %s
2024-05-07 00:34:47,143 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:34:47,148 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-07 00:34:47,186 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-07 00:34:47,192 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa06ebe88e0> has no local changes
2024-05-07 00:34:47,192 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/54/)'
2024-05-07 00:34:47,199 [ scc.git] DEBUG [detached HEAD 9766bb5] merge master -Dorg -Ssuccess-only
2024-05-07 00:34:47,199 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-07 00:34:47,199 [ scc.repo] DEBUG ## PRs found:
2024-05-07 00:34:47,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-05-07 00:34:48,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408 HTTP/1.1" 200 None
2024-05-07 00:34:48,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/408/comments HTTP/1.1" 200 None
2024-05-07 00:34:49,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-05-07 00:34:49,632 [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-07 00:34:50,100 [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-07 00:34:50,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-05-07 00:34:50,956 [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-07 00:34:51,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804 HTTP/1.1" 200 None
2024-05-07 00:34:51,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5b69af339bf34bd4adcf16a7f6a03fafa2921804/status HTTP/1.1" 200 None
2024-05-07 00:34:51,821 [ scc.repo] DEBUG - PR 408 jburel 'remove deprecated method'
2024-05-07 00:34:52,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-05-07 00:34:52,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-05-07 00:34:53,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-05-07 00:34:53,693 [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-07 00:34:54,154 [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-07 00:34:54,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-05-07 00:34:55,071 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-05-07 00:34:55,518 [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-07 00:34:56,000 [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-07 00:34:56,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-05-07 00:34:56,866 [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-07 00:34:57,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-05-07 00:34:57,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-05-07 00:34:57,753 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-05-07 00:34:58,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-05-07 00:34:58,207 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-05-07 00:34:58,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378 HTTP/1.1" 200 None
2024-05-07 00:34:59,143 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378/comments HTTP/1.1" 200 None
2024-05-07 00:34:59,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-05-07 00:35:00,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-05-07 00:35:00,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-05-07 00:35:01,038 [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-07 00:35:01,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-05-07 00:35:01,963 [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-07 00:35:01,964 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-05-07 00:35:02,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-05-07 00:35:02,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-05-07 00:35:03,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-05-07 00:35:03,846 [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-07 00:35:04,329 [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-07 00:35:04,779 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-05-07 00:35:05,214 [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-07 00:35:05,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-05-07 00:35:06,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-05-07 00:35:06,087 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-05-07 00:35:06,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-05-07 00:35:07,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-05-07 00:35:07,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-05-07 00:35:07,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-05-07 00:35:08,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-05-07 00:35:08,931 [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-07 00:35:09,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-05-07 00:35:09,788 [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-07 00:35:09,788 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-05-07 00:35:10,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-05-07 00:35:10,694 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-05-07 00:35:11,163 [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-07 00:35:11,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-05-07 00:35:12,068 [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-07 00:35:12,069 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-05-07 00:35:12,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-05-07 00:35:13,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-05-07 00:35:13,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-05-07 00:35:14,024 [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-07 00:35:14,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-05-07 00:35:14,923 [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-07 00:35:14,924 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-05-07 00:35:15,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-05-07 00:35:15,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-05-07 00:35:16,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-05-07 00:35:16,884 [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-07 00:35:17,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-05-07 00:35:17,740 [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-07 00:35:17,741 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-05-07 00:35:18,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-05-07 00:35:18,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-05-07 00:35:19,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-05-07 00:35:19,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-05-07 00:35:19,622 [ scc.repo] DEBUG ## Branches found:
2024-05-07 00:35:19,622 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-05-07 00:35:19,622 [ scc.git] DEBUG Get sha1 of %s
2024-05-07 00:35:19,623 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:35:19,628 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-07 00:35:19,634 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-07 00:35:19,635 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-07 00:35:19,641 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-07 00:35:19,648 [ scc.git] DEBUG Already up to date.
2024-05-07 00:35:19,648 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-05-07 00:35:20,377 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-07 00:35:20,377 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-05-07 00:35:20,382 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-05-07 00:35:20,854 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-07 00:35:20,854 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-05-07 00:35:20,859 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-05-07 00:35:21,373 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-07 00:35:21,373 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-05-07 00:35:21,378 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-05-07 00:35:21,783 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-07 00:35:21,783 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-05-07 00:35:21,789 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-05-07 00:35:22,280 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-07 00:35:22,281 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-05-07 00:35:22,286 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-05-07 00:35:22,664 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-07 00:35:22,664 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-05-07 00:35:22,669 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-05-07 00:35:23,090 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-07 00:35:23,090 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-05-07 00:35:23,095 [ scc.git] DEBUG Calling 'git fetch origin pull/408/head'
2024-05-07 00:35:23,595 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-05-07 00:35:23,596 [ scc.git] DEBUG * branch refs/pull/408/head -> FETCH_HEAD
2024-05-07 00:35:23,601 [ scc.git] DEBUG ## Unique users: []
2024-05-07 00:35:23,601 [ scc.git] DEBUG Get sha1 of %s
2024-05-07 00:35:23,601 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:35:23,606 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-05-07 00:35:23,616 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:35:23,622 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-05-07 00:35:23,757 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-05-07 00:35:23,758 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-05-07 00:35:23,758 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-07 00:35:23,763 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-05-07 00:35:23,763 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-05-07 00:35:23,763 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-05-07 00:35:23,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:35:23,925 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-05-07 00:35:23,938 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:35:23,943 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-05-07 00:35:24,238 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-05-07 00:35:24,238 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-05-07 00:35:24,239 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-07 00:35:24,246 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-05-07 00:35:24,246 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-05-07 00:35:24,246 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-05-07 00:35:24,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:35:24,408 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-05-07 00:35:24,420 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:35:24,424 [ 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-07 00:35:24,546 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-05-07 00:35:24,548 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-07 00:35:24,551 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-05-07 00:35:24,551 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-05-07 00:35:24,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:35:24,820 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-05-07 00:35:24,834 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:35:24,839 [ 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-07 00:35:25,063 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-05-07 00:35:25,063 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-05-07 00:35:25,064 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-07 00:35:25,068 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-05-07 00:35:25,068 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-05-07 00:35:25,068 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-05-07 00:35:25,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:35:25,231 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-05-07 00:35:25,243 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:35:25,248 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-05-07 00:35:25,305 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-07 00:35:25,308 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-05-07 00:35:25,308 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-05-07 00:35:25,308 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-05-07 00:35:25,308 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-05-07 00:35:25,308 [ scc.git] DEBUG create mode 100644 connect.py
2024-05-07 00:35:25,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:35:25,635 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-05-07 00:35:25,647 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:35:25,652 [ 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-07 00:35:25,806 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-05-07 00:35:25,807 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-07 00:35:25,811 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-05-07 00:35:25,811 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-05-07 00:35:26,043 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:35:26,045 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-05-07 00:35:26,056 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:35:26,060 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-05-07 00:35:26,180 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-05-07 00:35:26,181 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-07 00:35:26,185 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-05-07 00:35:26,186 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-05-07 00:35:26,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:35:26,456 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-05-07 00:35:26,468 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:35:26,473 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 408 (remove deprecated method) 5b69af339bf34bd4adcf16a7f6a03fafa2921804'
2024-05-07 00:35:26,544 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-05-07 00:35:26,545 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-07 00:35:26,552 [ scc.git] DEBUG src/omero/gateway/__init__.py | 36 ------------------------------------
2024-05-07 00:35:26,552 [ scc.git] DEBUG 1 file changed, 36 deletions(-)
2024-05-07 00:35:26,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:35:26,862 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-07 00:35:26,902 [ scc.git] DEBUG Get sha1 of %s
2024-05-07 00:35:26,902 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:35:26,907 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-07 00:35:26,948 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-07 00:35:26,957 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa06db23760> has no local changes
2024-05-07 00:35:26,958 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/54/)'
2024-05-07 00:35:26,969 [ scc.git] DEBUG [detached HEAD 5c729ae6] merge master -Dorg -Ssuccess-only
2024-05-07 00:35:26,970 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-07 00:35:26,970 [ scc.git] INFO Overriding base-branch from master to develop
2024-05-07 00:35:26,970 [ scc.repo] DEBUG ## PRs found:
2024-05-07 00:35:27,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-05-07 00:35:27,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-05-07 00:35:28,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-05-07 00:35:28,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-05-07 00:35:29,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-05-07 00:35:29,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-05-07 00:35:30,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-05-07 00:35:30,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-07 00:35:31,243 [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-07 00:35:31,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-05-07 00:35:32,084 [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-07 00:35:32,084 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-07 00:35:32,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-05-07 00:35:33,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-05-07 00:35:33,551 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-05-07 00:35:34,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-05-07 00:35:34,039 [ scc.repo] DEBUG ## Branches found:
2024-05-07 00:35:34,039 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-05-07 00:35:34,039 [ scc.git] DEBUG Get sha1 of %s
2024-05-07 00:35:34,040 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:35:34,045 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-05-07 00:35:34,049 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-07 00:35:34,050 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-05-07 00:35:34,055 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-05-07 00:35:34,060 [ scc.git] DEBUG Already up to date.
2024-05-07 00:35:34,061 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-05-07 00:35:34,556 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-05-07 00:35:34,556 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-05-07 00:35:34,561 [ scc.git] DEBUG ## Unique users: []
2024-05-07 00:35:34,561 [ scc.git] DEBUG Get sha1 of %s
2024-05-07 00:35:34,561 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:35:34,567 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-07 00:35:34,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:35:34,578 [ 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-07 00:35:34,650 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-05-07 00:35:34,650 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-05-07 00:35:34,650 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-07 00:35:34,651 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-07 00:35:34,656 [ scc.git] DEBUG Calling 'git reset --hard 5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-07 00:35:34,660 [ scc.git] DEBUG HEAD is now at 5a90893 Bump version: 5.8.2 → 5.8.3.dev0
2024-05-07 00:35:34,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:35:34,812 [ scc.git] DEBUG Calling 'git merge-base 5a908933161233015332dd416c325c60c5b8bd3a 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-05-07 00:35:34,818 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..5a908933161233015332dd416c325c60c5b8bd3a'
2024-05-07 00:35:34,823 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#54](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/54/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/54/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-05-07 00:35:34,826 [ scc.config] DEBUG Found github.token
2024-05-07 00:35:34,827 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-05-07 00:35:34,827 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-07 00:35:34,869 [ scc.git] DEBUG Get sha1 of %s
2024-05-07 00:35:34,869 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:35:34,873 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-07 00:35:34,910 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-07 00:35:34,915 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa06db19640> has no local changes
2024-05-07 00:35:34,915 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/54/)'
2024-05-07 00:35:34,922 [ scc.git] DEBUG [detached HEAD d2c84b0] merge master -Dorg -Ssuccess-only
2024-05-07 00:35:34,923 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-07 00:35:34,923 [ scc.repo] DEBUG ## PRs found:
2024-05-07 00:35:35,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-05-07 00:35:35,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/553 HTTP/1.1" 200 None
2024-05-07 00:35:36,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549 HTTP/1.1" 200 None
2024-05-07 00:35:36,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549/comments HTTP/1.1" 200 None
2024-05-07 00:35:37,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ade7fa1b5839e9b17878c38efd4f6404a5857712 HTTP/1.1" 200 None
2024-05-07 00:35:37,621 [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-07 00:35:38,101 [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-07 00:35:38,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543 HTTP/1.1" 200 None
2024-05-07 00:35:38,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543/comments HTTP/1.1" 200 None
2024-05-07 00:35:39,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-05-07 00:35:39,910 [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-07 00:35:40,354 [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-07 00:35:40,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-05-07 00:35:41,260 [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-07 00:35:41,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4 HTTP/1.1" 200 None
2024-05-07 00:35:42,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4/status HTTP/1.1" 200 None
2024-05-07 00:35:42,126 [ scc.repo] DEBUG - PR 543 knabar 'Block UI for some long running tasks'
2024-05-07 00:35:42,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542 HTTP/1.1" 200 None
2024-05-07 00:35:43,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542/comments HTTP/1.1" 200 None
2024-05-07 00:35:43,094 [ scc.repo] DEBUG # ... Include label: include
2024-05-07 00:35:43,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-05-07 00:35:43,985 [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-07 00:35:44,501 [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-07 00:35:44,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-05-07 00:35:45,395 [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-07 00:35:45,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-05-07 00:35:46,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/status HTTP/1.1" 200 None
2024-05-07 00:35:46,276 [ scc.repo] DEBUG - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-05-07 00:35:46,737 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-05-07 00:35:47,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-05-07 00:35:47,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-05-07 00:35:48,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-05-07 00:35:48,586 [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-07 00:35:49,045 [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-07 00:35:49,546 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-05-07 00:35:49,968 [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-07 00:35:50,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-05-07 00:35:50,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-05-07 00:35:50,820 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-05-07 00:35:51,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/533 HTTP/1.1" 200 None
2024-05-07 00:35:51,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-05-07 00:35:52,210 [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-07 00:35:52,675 [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-07 00:35:53,135 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-05-07 00:35:53,559 [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-07 00:35:53,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-05-07 00:35:54,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545/status HTTP/1.1" 200 None
2024-05-07 00:35:54,412 [ scc.repo] DEBUG - PR 533 jburel 'use conda-forge channel'
2024-05-07 00:35:54,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-05-07 00:35:55,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-05-07 00:35:55,846 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-05-07 00:35:56,329 [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-07 00:35:56,796 [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-07 00:35:57,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-05-07 00:35:57,709 [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-07 00:35:58,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-05-07 00:35:58,590 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-05-07 00:35:58,591 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-05-07 00:35:59,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-05-07 00:35:59,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-05-07 00:36:00,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615 HTTP/1.1" 200 None
2024-05-07 00:36:00,513 [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-07 00:36:00,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615 HTTP/1.1" 200 None
2024-05-07 00:36:01,425 [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-07 00:36:01,426 [ scc.repo] DEBUG - PR 168 stick 'Changes to nginx @maintenance handler'
2024-05-07 00:36:01,426 [ scc.repo] DEBUG ## Branches found:
2024-05-07 00:36:01,426 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-05-07 00:36:01,427 [ scc.git] DEBUG Get sha1 of %s
2024-05-07 00:36:01,427 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:36:01,433 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-05-07 00:36:01,436 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-05-07 00:36:01,437 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-05-07 00:36:01,441 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-05-07 00:36:01,445 [ scc.git] DEBUG Already up to date.
2024-05-07 00:36:01,445 [ scc.git] DEBUG Calling 'git fetch origin pull/168/head'
2024-05-07 00:36:02,036 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-07 00:36:02,036 [ scc.git] DEBUG * branch refs/pull/168/head -> FETCH_HEAD
2024-05-07 00:36:02,041 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-05-07 00:36:02,620 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-07 00:36:02,621 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-05-07 00:36:02,625 [ scc.git] DEBUG Calling 'git fetch origin pull/533/head'
2024-05-07 00:36:03,055 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-07 00:36:03,055 [ scc.git] DEBUG * branch refs/pull/533/head -> FETCH_HEAD
2024-05-07 00:36:03,059 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-05-07 00:36:03,475 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-07 00:36:03,475 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-05-07 00:36:03,479 [ scc.git] DEBUG Calling 'git fetch origin pull/542/head'
2024-05-07 00:36:04,407 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-07 00:36:04,407 [ scc.git] DEBUG * branch refs/pull/542/head -> FETCH_HEAD
2024-05-07 00:36:04,412 [ scc.git] DEBUG Calling 'git fetch origin pull/543/head'
2024-05-07 00:36:05,600 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-05-07 00:36:05,600 [ scc.git] DEBUG * branch refs/pull/543/head -> FETCH_HEAD
2024-05-07 00:36:05,604 [ scc.git] DEBUG ## Unique users: []
2024-05-07 00:36:05,604 [ scc.git] DEBUG Get sha1 of %s
2024-05-07 00:36:05,605 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:36:05,609 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-05-07 00:36:05,623 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:36:05,628 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 168 (Changes to nginx @maintenance handler) 219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-05-07 00:36:05,705 [ scc.git] DEBUG Auto-merging test/unit/test_web.py
2024-05-07 00:36:05,705 [ scc.git] DEBUG CONFLICT (content): Merge conflict in test/unit/test_web.py
2024-05-07 00:36:05,706 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-05-07 00:36:05,706 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-05-07 00:36:05,714 [ scc.git] DEBUG Calling 'git reset --hard e1b1355ebd4f9de8b855dd2c55f59d86c061a81b'
2024-05-07 00:36:05,724 [ scc.git] DEBUG HEAD is now at e1b1355eb Merge pull request #540 from will-moore/django_template_context_processors_request
2024-05-07 00:36:05,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:36:05,894 [ scc.git] DEBUG Calling 'git merge-base e1b1355ebd4f9de8b855dd2c55f59d86c061a81b 219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-05-07 00:36:05,908 [ scc.git] DEBUG Calling 'git diff --name-only 632d14a9cab5319c6b1bd9190d441a95e457103b..e1b1355ebd4f9de8b855dd2c55f59d86c061a81b'
2024-05-07 00:36:06,005 [ scc.git] INFO - PR 168 stick 'Changes to nginx @maintenance handler'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#54](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/54/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/54/consoleText) for more details.
Possible conflicts:
- Upstream changes
- test/unit/test_web.py
--conflicts
2024-05-07 00:36:06,009 [ scc.config] DEBUG Found github.token
2024-05-07 00:36:06,009 [ scc.git] DEBUG Not adding comment to issue #168, already --conflicts.
2024-05-07 00:36:06,009 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-05-07 00:36:06,014 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:36:06,018 [ 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-07 00:36:06,079 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-05-07 00:36:06,079 [ scc.git] DEBUG Auto-merging setup.py
2024-05-07 00:36:06,080 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-07 00:36:06,083 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-05-07 00:36:06,084 [ scc.git] DEBUG setup.py | 1 +
2024-05-07 00:36:06,084 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-05-07 00:36:06,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:36:06,305 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e335980be1e7197826687f6c322a60c61b4aa545'
2024-05-07 00:36:06,311 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:36:06,315 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 533 (use conda-forge channel) e335980be1e7197826687f6c322a60c61b4aa545'
2024-05-07 00:36:06,330 [ scc.git] DEBUG Auto-merging README.rst
2024-05-07 00:36:06,331 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-07 00:36:06,334 [ scc.git] DEBUG README.rst | 3 +--
2024-05-07 00:36:06,334 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 2 deletions(-)
2024-05-07 00:36:06,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:36:06,723 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-05-07 00:36:06,729 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:36:06,733 [ 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-07 00:36:06,851 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-05-07 00:36:06,851 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-05-07 00:36:06,852 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-07 00:36:06,856 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-05-07 00:36:06,856 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-05-07 00:36:06,856 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-05-07 00:36:07,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:36:07,137 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...977f7b65169e6dee479197a9156993bbadd2d2e2'
2024-05-07 00:36:07,144 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:36:07,148 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 542 (PlateAcquisition filtering with plate display) 977f7b65169e6dee479197a9156993bbadd2d2e2'
2024-05-07 00:36:07,394 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py
2024-05-07 00:36:07,397 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-07 00:36:07,409 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 13 +++-------
2024-05-07 00:36:07,409 [ scc.git] DEBUG .../webclient/templates/webclient/data/plate.html | 10 ++++----
2024-05-07 00:36:07,409 [ scc.git] DEBUG omeroweb/webclient/views.py | 17 ++++++++++++
2024-05-07 00:36:07,409 [ scc.git] DEBUG omeroweb/webgateway/plategrid.py | 30 +++++++++++++++++++---
2024-05-07 00:36:07,409 [ scc.git] DEBUG .../static/webgateway/js/ome.plateview.js | 16 +++++++-----
2024-05-07 00:36:07,409 [ scc.git] DEBUG omeroweb/webgateway/urls.py | 2 +-
2024-05-07 00:36:07,409 [ scc.git] DEBUG omeroweb/webgateway/views.py | 16 ++++++++++--
2024-05-07 00:36:07,410 [ scc.git] DEBUG 7 files changed, 78 insertions(+), 26 deletions(-)
2024-05-07 00:36:07,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:36:07,564 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8481f4cb5c44e8f8ba676e6fcb6bd9f83419eea4'
2024-05-07 00:36:07,585 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:36:07,590 [ 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-07 00:36:07,710 [ scc.git] DEBUG Auto-merging omeroweb/webclient/templates/webclient/data/includes/center_plugin.thumbs.js.html
2024-05-07 00:36:07,711 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-05-07 00:36:07,717 [ scc.git] DEBUG .../webclient/javascript/ome.progress_overlay.js | 60 ++++++
2024-05-07 00:36:07,717 [ scc.git] DEBUG .../webclient/javascript/ome.webclient.actions.js | 112 +++++++-----
2024-05-07 00:36:07,717 [ scc.git] DEBUG .../webclient/annotations/metadata_preview.html | 51 +++---
2024-05-07 00:36:07,717 [ scc.git] DEBUG .../webclient/templates/webclient/base/base.html | 1 +
2024-05-07 00:36:07,717 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 2 +-
2024-05-07 00:36:07,717 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 16 +-
2024-05-07 00:36:07,717 [ scc.git] DEBUG .../static/webgateway/js/ome.gs_utils.js | 201 ---------------------
2024-05-07 00:36:07,717 [ scc.git] DEBUG .../webgateway/static/webgateway/js/ome.popup.js | 1 -
2024-05-07 00:36:07,717 [ scc.git] DEBUG .../webgateway/static/webgateway/js/omero_image.js | 35 ++--
2024-05-07 00:36:07,717 [ scc.git] DEBUG 9 files changed, 186 insertions(+), 293 deletions(-)
2024-05-07 00:36:07,717 [ scc.git] DEBUG create mode 100644 omeroweb/webclient/static/webclient/javascript/ome.progress_overlay.js
2024-05-07 00:36:07,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:36:07,977 [ scc.git] DEBUG Calling 'git submodule update'
2024-05-07 00:36:08,020 [ scc.git] DEBUG Get sha1 of %s
2024-05-07 00:36:08,020 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-05-07 00:36:08,024 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-07 00:36:08,064 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-07 00:36:08,075 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa06db44910> has no local changes
2024-05-07 00:36:08,075 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/54/)'
2024-05-07 00:36:08,086 [ scc.git] DEBUG [detached HEAD 623f14a15] merge master -Dorg -Ssuccess-only
2024-05-07 00:36:08,086 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-07 00:36:08,086 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-05-07 00:36:08,138 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-05-07 00:36:08,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:36:08,404 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-05-07 00:36:08,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:36:08,816 [ scc.config] DEBUG Found submodule.omero-py.url
2024-05-07 00:36:09,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:36:09,223 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-05-07 00:36:09,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:36:09,638 [ scc.config] DEBUG Found submodule.omero-web.url
2024-05-07 00:36:10,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-05-07 00:36:10,046 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-05-07 00:36:10,072 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa06ec8be80> has local changes
2024-05-07 00:36:10,072 [ 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#54 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/54/)'
2024-05-07 00:36:10,081 [ scc.git] DEBUG [detached HEAD 5026ec0] merge master -Dorg -Ssuccess-only
2024-05-07 00:36:10,081 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-05-07 00:36:10,081 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-05-07 00:36:10,081 [ scc.merge] INFO Already up to date.
2024-05-07 00:36:10,081 [ scc.merge] INFO
2024-05-07 00:36:10,081 [ scc.merge] INFO Merged PRs:
2024-05-07 00:36:10,081 [ scc.merge] INFO - PR 278 dependabot[bot] 'Bump omero-py from `52d9a6f` to `53a327b`'
2024-05-07 00:36:10,081 [ scc.merge] INFO
2024-05-07 00:36:10,082 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-05-07 00:36:10,082 [ scc.merge] INFO Already up to date.
2024-05-07 00:36:10,082 [ scc.merge] INFO
2024-05-07 00:36:10,082 [ scc.merge] INFO Merged PRs:
2024-05-07 00:36:10,082 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-05-07 00:36:10,082 [ scc.merge] INFO - PR 23 sbesson 'Remove python-future compatibility code'
2024-05-07 00:36:10,082 [ scc.merge] INFO
2024-05-07 00:36:10,082 [ scc.merge] INFO Repository: ome/omero-marshal
2024-05-07 00:36:10,082 [ scc.merge] INFO Excluded PRs:
2024-05-07 00:36:10,082 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-05-07 00:36:10,082 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-05-07 00:36:10,082 [ scc.merge] INFO Already up to date.
2024-05-07 00:36:10,082 [ scc.merge] INFO
2024-05-07 00:36:10,082 [ scc.merge] INFO Merged PRs:
2024-05-07 00:36:10,082 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-05-07 00:36:10,082 [ scc.merge] INFO
2024-05-07 00:36:10,082 [ scc.merge] INFO Repository: ome/omero-py
2024-05-07 00:36:10,082 [ scc.merge] INFO Excluded PRs:
2024-05-07 00:36:10,082 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-05-07 00:36:10,082 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-05-07 00:36:10,082 [ scc.merge] INFO - PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
2024-05-07 00:36:10,082 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-05-07 00:36:10,082 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-05-07 00:36:10,082 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-05-07 00:36:10,082 [ scc.merge] INFO Already up to date.
2024-05-07 00:36:10,082 [ scc.merge] INFO
2024-05-07 00:36:10,082 [ scc.merge] INFO Merged PRs:
2024-05-07 00:36:10,082 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-05-07 00:36:10,082 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-05-07 00:36:10,082 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-05-07 00:36:10,082 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-05-07 00:36:10,082 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-05-07 00:36:10,082 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-05-07 00:36:10,082 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-05-07 00:36:10,082 [ scc.merge] INFO - PR 408 jburel 'remove deprecated method'
2024-05-07 00:36:10,083 [ scc.merge] INFO
2024-05-07 00:36:10,083 [ scc.merge] INFO Repository: ome/omero-scripts
2024-05-07 00:36:10,083 [ scc.merge] INFO Excluded PRs:
2024-05-07 00:36:10,083 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-05-07 00:36:10,083 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-05-07 00:36:10,083 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-05-07 00:36:10,083 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-05-07 00:36:10,083 [ scc.merge] INFO Already up to date.
2024-05-07 00:36:10,083 [ scc.merge] INFO
2024-05-07 00:36:10,083 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-07 00:36:10,083 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-05-07 00:36:10,083 [ scc.merge] INFO
2024-05-07 00:36:10,083 [ scc.merge] INFO Repository: ome/omero-web
2024-05-07 00:36:10,083 [ scc.merge] INFO Excluded PRs:
2024-05-07 00:36:10,083 [ scc.merge] INFO - PR 553 pre-commit-ci[bot] '[pre-commit.ci] pre-commit autoupdate' (user: pre-commit-ci[bot])
2024-05-07 00:36:10,083 [ scc.merge] INFO - PR 549 knabar 'Remove webgateway cache' (status: failure)
2024-05-07 00:36:10,083 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-05-07 00:36:10,083 [ scc.merge] INFO Already up to date.
2024-05-07 00:36:10,083 [ scc.merge] INFO
2024-05-07 00:36:10,083 [ scc.merge] INFO Merged PRs:
2024-05-07 00:36:10,083 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-05-07 00:36:10,083 [ scc.merge] INFO - PR 533 jburel 'use conda-forge channel'
2024-05-07 00:36:10,083 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-05-07 00:36:10,083 [ scc.merge] INFO - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-05-07 00:36:10,083 [ scc.merge] INFO - PR 543 knabar 'Block UI for some long running tasks'
2024-05-07 00:36:10,083 [ scc.merge] INFO
2024-05-07 00:36:10,083 [ scc.merge] INFO Conflicting PRs (not included):
2024-05-07 00:36:10,083 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler'
2024-05-07 00:36:10,083 [ scc.merge] INFO
2024-05-07 00:36:10,083 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-05-07 00:36:10,083 [ scc.git] DEBUG Calling 'git remote'
2024-05-07 00:36:10,087 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-05-07 00:36:10,087 [ scc.git] DEBUG Calling 'git remote'
2024-05-07 00:36:10,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-07 00:36:10,092 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-05-07 00:36:10,092 [ scc.git] DEBUG Calling 'git remote'
2024-05-07 00:36:10,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-07 00:36:10,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-05-07 00:36:10,096 [ scc.git] DEBUG Calling 'git remote'
2024-05-07 00:36:10,100 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-07 00:36:10,100 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-05-07 00:36:10,100 [ scc.git] DEBUG Calling 'git remote'
2024-05-07 00:36:10,104 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-05-07 00:36:10,104 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-05-07 00:36:10,104 [ scc.git] DEBUG Calling 'git remote'
2024-05-07 00:36:10,108 [ 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-07 00:36:39,813 [ 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}
