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-03-27 00:31:14,474 [ scc.config] DEBUG Found github.token
2024-03-27 00:31:14,477 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-03-27 00:31:14,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:31:15,146 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:31:15,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-03-27 00:31:15,541 [ scc.gh] DEBUG 4998 remaining from 5000 (Reset at 01:03
2024-03-27 00:31:15,541 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-27 00:31:15,544 [ scc.git] DEBUG Check current status
2024-03-27 00:31:15,545 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-27 00:31:15,548 [ scc.git] DEBUG 2363a53 Merge pull request #270 from ome/dependabot/submodules/omero-web-bb3ae5c
2024-03-27 00:31:15,548 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-27 00:31:15,582 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-03-27 00:31:15,584 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-03-27 00:31:15,587 [ scc.git] DEBUG 0dc60bd67a5f9281e2063a0a3aeeaa119c14447d omero-py (v5.19.0-1-g0dc60bd6)
2024-03-27 00:31:15,590 [ scc.git] DEBUG 2078ac72dbf11f2733e685000a274eff81c2ac2d omero-scripts (v5.8.0-1-g2078ac7)
2024-03-27 00:31:15,593 [ scc.git] DEBUG bb3ae5cab33420ff9992e07de8614f5a5c0e234a omero-web (v5.25.0-3-gbb3ae5cab)
2024-03-27 00:31:15,596 [ scc.config] DEBUG Found remote.origin.url
2024-03-27 00:31:16,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-03-27 00:31:16,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-27 00:31:16,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-27 00:31:17,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-27 00:31:17,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-27 00:31:17,696 [ scc.git] DEBUG Resetting...
2024-03-27 00:31:17,696 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-03-27 00:31:17,700 [ scc.git] DEBUG HEAD is now at 2363a53 Merge pull request #270 from ome/dependabot/submodules/omero-web-bb3ae5c
2024-03-27 00:31:17,701 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-03-27 00:31:17,744 [ scc.git] DEBUG Check current status
2024-03-27 00:31:17,745 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-27 00:31:17,748 [ scc.git] DEBUG 2363a53 Merge pull request #270 from ome/dependabot/submodules/omero-web-bb3ae5c
2024-03-27 00:31:17,748 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-27 00:31:17,781 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-03-27 00:31:17,783 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-03-27 00:31:17,786 [ scc.git] DEBUG 0dc60bd67a5f9281e2063a0a3aeeaa119c14447d omero-py (v5.19.0-1-g0dc60bd6)
2024-03-27 00:31:17,789 [ scc.git] DEBUG 2078ac72dbf11f2733e685000a274eff81c2ac2d omero-scripts (v5.8.0-1-g2078ac7)
2024-03-27 00:31:17,792 [ scc.git] DEBUG bb3ae5cab33420ff9992e07de8614f5a5c0e234a omero-web (v5.25.0-3-gbb3ae5cab)
2024-03-27 00:31:17,792 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-03-27 00:31:17,792 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-03-27 00:31:17,792 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-03-27 00:31:17,793 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-03-27 00:31:17,793 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-03-27 00:31:17,793 [ scc.repo] DEBUG ## PRs found:
2024-03-27 00:31:18,175 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-03-27 00:31:18,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/271 HTTP/1.1" 200 None
2024-03-27 00:31:18,666 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-27 00:31:18,666 [ scc.repo] DEBUG - PR 271 dependabot[bot] 'Bump omero-py from `0dc60bd` to `d76e17a`'
2024-03-27 00:31:18,666 [ scc.repo] DEBUG ## Branches found:
2024-03-27 00:31:18,666 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:31:18,666 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:31:18,669 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-27 00:31:18,672 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-27 00:31:18,672 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-27 00:31:18,675 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-27 00:31:18,678 [ scc.git] DEBUG Already up to date.
2024-03-27 00:31:18,679 [ scc.git] DEBUG Calling 'git fetch origin pull/271/head'
2024-03-27 00:31:19,059 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-03-27 00:31:19,059 [ scc.git] DEBUG * branch refs/pull/271/head -> FETCH_HEAD
2024-03-27 00:31:19,063 [ scc.git] DEBUG ## Unique users: []
2024-03-27 00:31:19,063 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:31:19,063 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:31:19,066 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6d73f720475e69673bcf92482ad89a4541be5803'
2024-03-27 00:31:19,070 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:31:19,072 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 271 (Bump omero-py from `0dc60bd` to `d76e17a`) 6d73f720475e69673bcf92482ad89a4541be5803'
2024-03-27 00:31:19,080 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:31:19,082 [ scc.git] DEBUG omero-py | 2 +-
2024-03-27 00:31:19,082 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-03-27 00:31:19,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:31:19,255 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:31:19,583 [ scc.git] DEBUG Submodule path 'omero-py': checked out 'd76e17aa58ca755d239e9e8005712cd78239c62e'
2024-03-27 00:31:19,584 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:31:19,584 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:31:19,586 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:31:19,719 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0d74ebe4f0> has no local changes
2024-03-27 00:31:19,719 [ 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 271 dependabot[bot] 'Bump omero-py from `0dc60bd` to `d76e17a`'
Generated by OMERO-python-superbuild-push#13 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/13/)'
2024-03-27 00:31:19,740 [ scc.git] DEBUG [detached HEAD b7f5e40] merge master -Dorg -Snone
2024-03-27 00:31:19,740 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-03-27 00:31:19,740 [ scc.merge] INFO Already up to date.
2024-03-27 00:31:19,740 [ scc.merge] INFO
2024-03-27 00:31:19,740 [ scc.merge] INFO Merged PRs:
2024-03-27 00:31:19,740 [ scc.merge] INFO - PR 271 dependabot[bot] 'Bump omero-py from `0dc60bd` to `d76e17a`'
2024-03-27 00:31:19,740 [ scc.merge] INFO
2024-03-27 00:31:19,740 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-03-27 00:31:19,740 [ 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-03-27 00:31:22,655 [ scc.config] DEBUG Found github.token
2024-03-27 00:31:22,658 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-03-27 00:31:22,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:31:23,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:31:23,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-03-27 00:31:23,735 [ scc.gh] DEBUG 4988 remaining from 5000 (Reset at 01:03
2024-03-27 00:31:23,736 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-27 00:31:23,739 [ scc.git] DEBUG Check current status
2024-03-27 00:31:23,739 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-27 00:31:23,742 [ scc.git] DEBUG b7f5e40 merge master -Dorg -Snone
2024-03-27 00:31:23,743 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-27 00:31:23,777 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-03-27 00:31:23,779 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-03-27 00:31:23,782 [ scc.git] DEBUG d76e17aa58ca755d239e9e8005712cd78239c62e omero-py (v5.19.1-1-gd76e17aa)
2024-03-27 00:31:23,785 [ scc.git] DEBUG 2078ac72dbf11f2733e685000a274eff81c2ac2d omero-scripts (v5.8.0-1-g2078ac7)
2024-03-27 00:31:23,788 [ scc.git] DEBUG bb3ae5cab33420ff9992e07de8614f5a5c0e234a omero-web (v5.25.0-3-gbb3ae5cab)
2024-03-27 00:31:23,791 [ scc.config] DEBUG Found remote.origin.url
2024-03-27 00:31:23,791 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-03-27 00:31:23,793 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-03-27 00:31:24,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-03-27 00:31:24,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-27 00:31:25,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-27 00:31:25,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-27 00:31:25,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-27 00:31:25,916 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:31:25,955 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-03-27 00:31:25,955 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-27 00:31:25,958 [ scc.git] DEBUG Check current status
2024-03-27 00:31:25,958 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-27 00:31:25,961 [ scc.git] DEBUG 5863350 Merge pull request #22 from sbesson/python311
2024-03-27 00:31:25,961 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-27 00:31:25,996 [ scc.config] DEBUG Found remote.origin.url
2024-03-27 00:31:26,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-03-27 00:31:26,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-27 00:31:27,319 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-27 00:31:27,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-27 00:31:28,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-27 00:31:28,125 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:31:28,158 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-03-27 00:31:28,159 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-03-27 00:31:28,159 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-27 00:31:28,162 [ scc.git] DEBUG Check current status
2024-03-27 00:31:28,162 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-27 00:31:28,165 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-03-27 00:31:28,165 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-27 00:31:28,199 [ scc.config] DEBUG Found remote.origin.url
2024-03-27 00:31:28,596 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-03-27 00:31:29,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-27 00:31:29,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-27 00:31:29,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-27 00:31:30,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-27 00:31:30,305 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:31:30,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-03-27 00:31:30,340 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-03-27 00:31:30,340 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-27 00:31:30,343 [ scc.git] DEBUG Check current status
2024-03-27 00:31:30,344 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-27 00:31:30,347 [ scc.git] DEBUG d76e17aa Bump version: 5.19.1 → 5.19.2.dev0
2024-03-27 00:31:30,347 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-27 00:31:30,381 [ scc.config] DEBUG Found remote.origin.url
2024-03-27 00:31:30,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-03-27 00:31:31,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-27 00:31:31,674 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-27 00:31:32,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-27 00:31:32,485 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-27 00:31:32,486 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:31:32,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-03-27 00:31:32,520 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-03-27 00:31:32,520 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-27 00:31:32,523 [ scc.git] DEBUG Check current status
2024-03-27 00:31:32,523 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-27 00:31:32,526 [ scc.git] DEBUG 2078ac7 Bump version: 5.8.0 → 5.8.1.dev0
2024-03-27 00:31:32,526 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-27 00:31:32,562 [ scc.config] DEBUG Found remote.origin.url
2024-03-27 00:31:32,563 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-03-27 00:31:32,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-03-27 00:31:33,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-27 00:31:33,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-27 00:31:34,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-27 00:31:34,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-27 00:31:34,694 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:31:34,727 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-03-27 00:31:34,728 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-03-27 00:31:34,728 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-27 00:31:34,731 [ scc.git] DEBUG Check current status
2024-03-27 00:31:34,731 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-27 00:31:34,735 [ scc.git] DEBUG bb3ae5cab Merge pull request #544 from ome/pre-commit-ci-update-config
2024-03-27 00:31:34,736 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-27 00:31:34,771 [ scc.config] DEBUG Found remote.origin.url
2024-03-27 00:31:35,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-03-27 00:31:35,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-27 00:31:36,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-27 00:31:36,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-27 00:31:36,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-27 00:31:36,906 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:31:36,940 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-03-27 00:31:36,940 [ scc.git] DEBUG Resetting...
2024-03-27 00:31:36,940 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-03-27 00:31:36,945 [ scc.git] DEBUG HEAD is now at b7f5e40 merge master -Dorg -Snone
2024-03-27 00:31:36,945 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-03-27 00:31:36,990 [ scc.git] DEBUG Check current status
2024-03-27 00:31:36,990 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-27 00:31:36,993 [ scc.git] DEBUG b7f5e40 merge master -Dorg -Snone
2024-03-27 00:31:36,993 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-27 00:31:37,027 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-03-27 00:31:37,030 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-03-27 00:31:37,032 [ scc.git] DEBUG d76e17aa58ca755d239e9e8005712cd78239c62e omero-py (v5.19.1-1-gd76e17aa)
2024-03-27 00:31:37,036 [ scc.git] DEBUG 2078ac72dbf11f2733e685000a274eff81c2ac2d omero-scripts (v5.8.0-1-g2078ac7)
2024-03-27 00:31:37,038 [ scc.git] DEBUG bb3ae5cab33420ff9992e07de8614f5a5c0e234a omero-web (v5.25.0-3-gbb3ae5cab)
2024-03-27 00:31:37,039 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-03-27 00:31:37,039 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-03-27 00:31:37,039 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-03-27 00:31:37,039 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-03-27 00:31:37,039 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-03-27 00:31:37,039 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-03-27 00:31:37,039 [ scc.repo] DEBUG ## PRs found:
2024-03-27 00:31:37,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-03-27 00:31:37,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/271 HTTP/1.1" 200 None
2024-03-27 00:31:37,823 [ scc.repo] DEBUG # ... Include label: dependencies
2024-03-27 00:31:38,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/6d73f720475e69673bcf92482ad89a4541be5803 HTTP/1.1" 200 None
2024-03-27 00:31:38,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/6d73f720475e69673bcf92482ad89a4541be5803/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-27 00:31:39,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/6d73f720475e69673bcf92482ad89a4541be5803 HTTP/1.1" 200 None
2024-03-27 00:31:39,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/statuses/6d73f720475e69673bcf92482ad89a4541be5803?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:31:39,828 [ scc.repo] DEBUG - PR 271 dependabot[bot] 'Bump omero-py from `0dc60bd` to `d76e17a`'
2024-03-27 00:31:39,828 [ scc.repo] DEBUG ## Branches found:
2024-03-27 00:31:39,828 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:31:39,828 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:31:39,832 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-27 00:31:39,835 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-27 00:31:39,835 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-27 00:31:39,838 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-27 00:31:39,842 [ scc.git] DEBUG Already up to date.
2024-03-27 00:31:39,842 [ scc.git] DEBUG Calling 'git fetch origin pull/271/head'
2024-03-27 00:31:40,238 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-03-27 00:31:40,238 [ scc.git] DEBUG * branch refs/pull/271/head -> FETCH_HEAD
2024-03-27 00:31:40,242 [ scc.git] DEBUG ## Unique users: []
2024-03-27 00:31:40,242 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:31:40,242 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:31:40,245 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6d73f720475e69673bcf92482ad89a4541be5803'
2024-03-27 00:31:40,249 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:31:40,252 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 271 (Bump omero-py from `0dc60bd` to `d76e17a`) 6d73f720475e69673bcf92482ad89a4541be5803'
2024-03-27 00:31:40,255 [ scc.git] DEBUG Already up to date.
2024-03-27 00:31:40,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:31:40,418 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:31:40,452 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:31:40,452 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:31:40,455 [ scc.repo] DEBUG ## PRs found:
2024-03-27 00:31:40,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-03-27 00:31:41,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23 HTTP/1.1" 200 None
2024-03-27 00:31:41,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23/comments HTTP/1.1" 200 None
2024-03-27 00:31:42,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None
2024-03-27 00:31:42,958 [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-03-27 00:31:43,444 [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-03-27 00:31:43,929 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None
2024-03-27 00:31:44,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:31:44,339 [ scc.repo] DEBUG - PR 23 sbesson 'Remove python-future compatibility code'
2024-03-27 00:31:44,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-03-27 00:31:45,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-03-27 00:31:45,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-03-27 00:31:46,228 [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-03-27 00:31:46,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-03-27 00:31:47,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-03-27 00:31:47,077 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-03-27 00:31:47,077 [ scc.repo] DEBUG ## Branches found:
2024-03-27 00:31:47,078 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-03-27 00:31:47,078 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:31:47,078 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:31:47,082 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-27 00:31:47,085 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-27 00:31:47,085 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-27 00:31:47,089 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-27 00:31:47,092 [ scc.git] DEBUG Already up to date.
2024-03-27 00:31:47,093 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-03-27 00:31:47,463 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-03-27 00:31:47,464 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-03-27 00:31:47,467 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head'
2024-03-27 00:31:47,850 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-03-27 00:31:47,850 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD
2024-03-27 00:31:47,853 [ scc.git] DEBUG ## Unique users: []
2024-03-27 00:31:47,853 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:31:47,853 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:31:47,856 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-03-27 00:31:47,860 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:31:47,863 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-03-27 00:31:47,875 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:31:47,878 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-03-27 00:31:47,878 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-03-27 00:31:47,878 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-03-27 00:31:47,878 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-03-27 00:31:47,878 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-03-27 00:31:47,878 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-03-27 00:31:47,880 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-03-27 00:31:47,880 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-03-27 00:31:47,880 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-03-27 00:31:47,880 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-03-27 00:31:48,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:31:48,038 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8'
2024-03-27 00:31:48,042 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:31:48,045 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 23 (Remove python-future compatibility code) 9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8'
2024-03-27 00:31:48,067 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-03-27 00:31:48,067 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-03-27 00:31:48,067 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-03-27 00:31:48,067 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-03-27 00:31:48,067 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-03-27 00:31:48,067 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-03-27 00:31:48,067 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-03-27 00:31:48,067 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-03-27 00:31:48,067 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-03-27 00:31:48,067 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:31:48,072 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-03-27 00:31:48,072 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++--
2024-03-27 00:31:48,072 [ scc.git] DEBUG .github/workflows/tox.yml | 5 ++--
2024-03-27 00:31:48,072 [ scc.git] DEBUG Dockerfile | 32 ----------------------
2024-03-27 00:31:48,072 [ scc.git] DEBUG setup.py | 2 +-
2024-03-27 00:31:48,072 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 1 -
2024-03-27 00:31:48,072 [ scc.git] DEBUG src/fsDirectory.py | 8 +-----
2024-03-27 00:31:48,072 [ scc.git] DEBUG src/fsDropBox.py | 8 +-----
2024-03-27 00:31:48,073 [ scc.git] DEBUG src/fsDropBoxMonitorClient.py | 11 +-------
2024-03-27 00:31:48,073 [ scc.git] DEBUG src/fsFileServer.py | 12 ++-------
2024-03-27 00:31:48,073 [ scc.git] DEBUG src/fsLists.py | 2 --
2024-03-27 00:31:48,073 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 9 +------
2024-03-27 00:31:48,073 [ scc.git] DEBUG src/fsMonitor.py | 2 --
2024-03-27 00:31:48,073 [ scc.git] DEBUG src/fsMonitorServer.py | 8 +++---
2024-03-27 00:31:48,073 [ scc.git] DEBUG src/fsNotificationScheduler.py | 3 ---
2024-03-27 00:31:48,073 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 21 +++++----------
2024-03-27 00:31:48,073 [ scc.git] DEBUG src/fsUtil.py | 9 +++----
2024-03-27 00:31:48,073 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 8 +-----
2024-03-27 00:31:48,073 [ scc.git] DEBUG test/conftest.py | 2 --
2024-03-27 00:31:48,073 [ scc.git] DEBUG test/drivers.py | 17 +++---------
2024-03-27 00:31:48,073 [ scc.git] DEBUG test/unit/test_drivers.py | 55 ++++++++++++++++----------------------
2024-03-27 00:31:48,073 [ scc.git] DEBUG test/unit/test_monitor.py | 2 --
2024-03-27 00:31:48,073 [ scc.git] DEBUG test/unit/test_replay.py | 8 +-----
2024-03-27 00:31:48,073 [ scc.git] DEBUG test/unit/test_state.py | 1 -
2024-03-27 00:31:48,073 [ scc.git] DEBUG tox.ini | 3 ++-
2024-03-27 00:31:48,073 [ scc.git] DEBUG 25 files changed, 59 insertions(+), 178 deletions(-)
2024-03-27 00:31:48,073 [ scc.git] DEBUG delete mode 100644 Dockerfile
2024-03-27 00:31:48,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:31:48,438 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:31:48,471 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:31:48,472 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:31:48,475 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:31:48,507 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:31:48,512 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1ea44d8130> has no local changes
2024-03-27 00:31:48,512 [ 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#13 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/13/)'
2024-03-27 00:31:48,519 [ scc.git] DEBUG [detached HEAD 621f27e] merge master -Dorg -Ssuccess-only
2024-03-27 00:31:48,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-03-27 00:31:48,519 [ scc.repo] DEBUG ## PRs found:
2024-03-27 00:31:48,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-03-27 00:31:49,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-03-27 00:31:49,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-03-27 00:31:50,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-03-27 00:31:50,863 [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-03-27 00:31:51,320 [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-03-27 00:31:51,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-03-27 00:31:52,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:31:52,311 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-03-27 00:31:52,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-03-27 00:31:53,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-03-27 00:31:53,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-03-27 00:31:54,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-03-27 00:31:54,158 [ scc.repo] DEBUG ## Branches found:
2024-03-27 00:31:54,158 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-03-27 00:31:54,158 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:31:54,158 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:31:54,163 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-27 00:31:54,166 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-27 00:31:54,166 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-27 00:31:54,170 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-27 00:31:54,173 [ scc.git] DEBUG Already up to date.
2024-03-27 00:31:54,174 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-03-27 00:31:54,655 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-03-27 00:31:54,655 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-03-27 00:31:54,659 [ scc.git] DEBUG ## Unique users: []
2024-03-27 00:31:54,659 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:31:54,659 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:31:54,662 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-03-27 00:31:54,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:31:54,670 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-03-27 00:31:54,678 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-03-27 00:31:54,679 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:31:54,681 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-03-27 00:31:54,682 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-03-27 00:31:54,682 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-03-27 00:31:54,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:31:54,833 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:31:54,866 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:31:54,866 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:31:54,869 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:31:54,902 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:31:54,906 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1ea44d87f0> has no local changes
2024-03-27 00:31:54,906 [ 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#13 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/13/)'
2024-03-27 00:31:54,913 [ scc.git] DEBUG [detached HEAD 12b6c52] merge master -Dorg -Ssuccess-only
2024-03-27 00:31:54,913 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-03-27 00:31:54,913 [ scc.repo] DEBUG ## PRs found:
2024-03-27 00:31:55,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-03-27 00:31:56,084 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/403 HTTP/1.1" 200 None
2024-03-27 00:31:56,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/403/comments HTTP/1.1" 200 None
2024-03-27 00:31:57,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/61489cddb9009af5f6f914e39ef9b02b4019f13d HTTP/1.1" 200 None
2024-03-27 00:31:57,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/61489cddb9009af5f6f914e39ef9b02b4019f13d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-27 00:31:58,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/61489cddb9009af5f6f914e39ef9b02b4019f13d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-27 00:31:58,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/61489cddb9009af5f6f914e39ef9b02b4019f13d HTTP/1.1" 200 None
2024-03-27 00:31:58,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/61489cddb9009af5f6f914e39ef9b02b4019f13d?per_page=1 HTTP/1.1" 200 None
2024-03-27 00:31:59,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/61489cddb9009af5f6f914e39ef9b02b4019f13d HTTP/1.1" 200 None
2024-03-27 00:31:59,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/61489cddb9009af5f6f914e39ef9b02b4019f13d/status HTTP/1.1" 200 None
2024-03-27 00:31:59,855 [ scc.repo] DEBUG - PR 403 sbesson 'Consume pre-build Ice Python wheel packages on Windows builds'
2024-03-27 00:32:00,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/400 HTTP/1.1" 200 None
2024-03-27 00:32:00,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/400/comments HTTP/1.1" 200 None
2024-03-27 00:32:01,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/704e50f6d170439a1b6976b64bb641b248ec0add HTTP/1.1" 200 None
2024-03-27 00:32:01,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/704e50f6d170439a1b6976b64bb641b248ec0add/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-27 00:32:02,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/704e50f6d170439a1b6976b64bb641b248ec0add/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-27 00:32:02,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/704e50f6d170439a1b6976b64bb641b248ec0add HTTP/1.1" 200 None
2024-03-27 00:32:03,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/704e50f6d170439a1b6976b64bb641b248ec0add?per_page=1 HTTP/1.1" 200 None
2024-03-27 00:32:03,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/704e50f6d170439a1b6976b64bb641b248ec0add HTTP/1.1" 200 None
2024-03-27 00:32:04,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/704e50f6d170439a1b6976b64bb641b248ec0add/status HTTP/1.1" 200 None
2024-03-27 00:32:04,063 [ scc.repo] DEBUG - PR 400 jburel 'Session ID and constructor'
2024-03-27 00:32:04,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/398 HTTP/1.1" 200 None
2024-03-27 00:32:05,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/bbf54d740f70baee1e5fd5d3fb396699af5095b3 HTTP/1.1" 200 None
2024-03-27 00:32:05,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/bbf54d740f70baee1e5fd5d3fb396699af5095b3/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-27 00:32:05,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/bbf54d740f70baee1e5fd5d3fb396699af5095b3/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-27 00:32:06,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/bbf54d740f70baee1e5fd5d3fb396699af5095b3 HTTP/1.1" 200 None
2024-03-27 00:32:06,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/bbf54d740f70baee1e5fd5d3fb396699af5095b3?per_page=1 HTTP/1.1" 200 None
2024-03-27 00:32:07,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/bbf54d740f70baee1e5fd5d3fb396699af5095b3 HTTP/1.1" 200 None
2024-03-27 00:32:07,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/bbf54d740f70baee1e5fd5d3fb396699af5095b3/status HTTP/1.1" 200 None
2024-03-27 00:32:07,796 [ scc.repo] DEBUG - PR 398 will-moore 'getGridSize() handles plates with no Wells'
2024-03-27 00:32:08,259 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-03-27 00:32:08,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-03-27 00:32:09,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-03-27 00:32:09,755 [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-03-27 00:32:10,202 [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-03-27 00:32:10,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/394 HTTP/1.1" 200 None
2024-03-27 00:32:11,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/394/comments HTTP/1.1" 200 None
2024-03-27 00:32:11,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-03-27 00:32:12,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-03-27 00:32:12,734 [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-03-27 00:32:13,263 [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-03-27 00:32:13,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-03-27 00:32:14,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-03-27 00:32:14,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-03-27 00:32:15,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-03-27 00:32:15,139 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-03-27 00:32:15,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-03-27 00:32:15,603 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-03-27 00:32:16,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378 HTTP/1.1" 200 None
2024-03-27 00:32:16,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378/comments HTTP/1.1" 200 None
2024-03-27 00:32:16,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-03-27 00:32:17,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-03-27 00:32:17,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-03-27 00:32:18,424 [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-03-27 00:32:18,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-03-27 00:32:19,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:32:19,322 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-03-27 00:32:19,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-03-27 00:32:20,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-03-27 00:32:20,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-03-27 00:32:21,287 [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-03-27 00:32:21,802 [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-03-27 00:32:22,256 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-03-27 00:32:22,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-03-27 00:32:23,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-03-27 00:32:23,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-03-27 00:32:23,687 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-03-27 00:32:24,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-03-27 00:32:24,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-03-27 00:32:25,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-03-27 00:32:25,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-03-27 00:32:26,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-03-27 00:32:26,488 [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-03-27 00:32:26,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-03-27 00:32:27,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:32:27,428 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-03-27 00:32:27,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-03-27 00:32:28,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-03-27 00:32:28,894 [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-03-27 00:32:29,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-03-27 00:32:29,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:32:29,778 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-03-27 00:32:30,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-03-27 00:32:30,714 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-03-27 00:32:31,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-03-27 00:32:31,785 [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-03-27 00:32:32,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-03-27 00:32:32,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:32:32,825 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-03-27 00:32:33,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-03-27 00:32:33,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-03-27 00:32:34,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-03-27 00:32:34,677 [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-03-27 00:32:35,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-03-27 00:32:35,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:32:35,579 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-03-27 00:32:36,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-03-27 00:32:36,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-03-27 00:32:36,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-03-27 00:32:37,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-03-27 00:32:37,437 [ scc.repo] DEBUG ## Branches found:
2024-03-27 00:32:37,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-03-27 00:32:37,437 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:32:37,437 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:32:37,442 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-27 00:32:37,445 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-27 00:32:37,445 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-27 00:32:37,449 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-27 00:32:37,453 [ scc.git] DEBUG Already up to date.
2024-03-27 00:32:37,453 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-03-27 00:32:37,848 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-03-27 00:32:37,848 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-03-27 00:32:37,851 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-03-27 00:32:38,241 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-03-27 00:32:38,241 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-03-27 00:32:38,244 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-03-27 00:32:38,616 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-03-27 00:32:38,616 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-03-27 00:32:38,620 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-03-27 00:32:39,011 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-03-27 00:32:39,011 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-03-27 00:32:39,014 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-03-27 00:32:39,461 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-03-27 00:32:39,461 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-03-27 00:32:39,465 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-03-27 00:32:39,855 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-03-27 00:32:39,855 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-03-27 00:32:39,859 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-03-27 00:32:40,250 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-03-27 00:32:40,250 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-03-27 00:32:40,254 [ scc.git] DEBUG Calling 'git fetch origin pull/398/head'
2024-03-27 00:32:40,667 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-03-27 00:32:40,667 [ scc.git] DEBUG * branch refs/pull/398/head -> FETCH_HEAD
2024-03-27 00:32:40,670 [ scc.git] DEBUG Calling 'git fetch origin pull/400/head'
2024-03-27 00:32:41,765 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-03-27 00:32:41,765 [ scc.git] DEBUG * branch refs/pull/400/head -> FETCH_HEAD
2024-03-27 00:32:41,769 [ scc.git] DEBUG Calling 'git fetch origin pull/403/head'
2024-03-27 00:32:42,196 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-03-27 00:32:42,196 [ scc.git] DEBUG * branch refs/pull/403/head -> FETCH_HEAD
2024-03-27 00:32:42,200 [ scc.git] DEBUG ## Unique users: []
2024-03-27 00:32:42,200 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:32:42,200 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:32:42,203 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-03-27 00:32:42,212 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:32:42,215 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-03-27 00:32:42,261 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-03-27 00:32:42,261 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-03-27 00:32:42,262 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:32:42,265 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-03-27 00:32:42,265 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-03-27 00:32:42,265 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-03-27 00:32:42,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:32:42,433 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-03-27 00:32:42,442 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:32:42,445 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-03-27 00:32:42,545 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-03-27 00:32:42,545 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-03-27 00:32:42,546 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:32:42,550 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-03-27 00:32:42,551 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-03-27 00:32:42,551 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-03-27 00:32:42,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:32:42,843 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-03-27 00:32:42,851 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:32:42,854 [ 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-03-27 00:32:42,920 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-03-27 00:32:42,921 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:32:42,923 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-03-27 00:32:42,923 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-03-27 00:32:43,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:32:43,236 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-03-27 00:32:43,245 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:32:43,249 [ 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-03-27 00:32:43,316 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-03-27 00:32:43,316 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-03-27 00:32:43,317 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:32:43,320 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-03-27 00:32:43,320 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-03-27 00:32:43,320 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-03-27 00:32:43,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:32:43,651 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-03-27 00:32:43,660 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:32:43,663 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-03-27 00:32:43,697 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:32:43,699 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-03-27 00:32:43,699 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-03-27 00:32:43,700 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-03-27 00:32:43,700 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-03-27 00:32:43,700 [ scc.git] DEBUG create mode 100644 connect.py
2024-03-27 00:32:44,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:32:44,057 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-03-27 00:32:44,066 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:32:44,069 [ 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-03-27 00:32:44,144 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-03-27 00:32:44,145 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:32:44,147 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-03-27 00:32:44,147 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-03-27 00:32:44,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:32:44,550 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-03-27 00:32:44,558 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:32:44,561 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-03-27 00:32:44,595 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-03-27 00:32:44,596 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:32:44,598 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-03-27 00:32:44,599 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-03-27 00:32:44,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:32:44,989 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bbf54d740f70baee1e5fd5d3fb396699af5095b3'
2024-03-27 00:32:44,998 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:32:45,001 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 398 (getGridSize() handles plates with no Wells) bbf54d740f70baee1e5fd5d3fb396699af5095b3'
2024-03-27 00:32:45,041 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-03-27 00:32:45,042 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:32:45,047 [ scc.git] DEBUG src/omero/gateway/__init__.py | 6 +++++-
2024-03-27 00:32:45,047 [ scc.git] DEBUG 1 file changed, 5 insertions(+), 1 deletion(-)
2024-03-27 00:32:45,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:32:45,423 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...704e50f6d170439a1b6976b64bb641b248ec0add'
2024-03-27 00:32:45,432 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:32:45,435 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 400 (Session ID and constructor) 704e50f6d170439a1b6976b64bb641b248ec0add'
2024-03-27 00:32:45,475 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-03-27 00:32:45,475 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:32:45,481 [ scc.git] DEBUG src/omero/gateway/__init__.py | 29 ++++++++++++++++++++++++++---
2024-03-27 00:32:45,481 [ scc.git] DEBUG src/omero/gateway/scripts/dbhelpers.py | 3 ++-
2024-03-27 00:32:45,481 [ scc.git] DEBUG 2 files changed, 28 insertions(+), 4 deletions(-)
2024-03-27 00:32:45,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:32:45,832 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...61489cddb9009af5f6f914e39ef9b02b4019f13d'
2024-03-27 00:32:45,841 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:32:45,844 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 403 (Consume pre-build Ice Python wheel packages on Windows builds) 61489cddb9009af5f6f914e39ef9b02b4019f13d'
2024-03-27 00:32:45,862 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:32:45,864 [ scc.git] DEBUG .github/workflows/workflow.yml | 3 +--
2024-03-27 00:32:45,865 [ scc.git] DEBUG tox.ini | 5 +++++
2024-03-27 00:32:45,865 [ scc.git] DEBUG 2 files changed, 6 insertions(+), 2 deletions(-)
2024-03-27 00:32:46,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:32:46,241 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:32:46,274 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:32:46,274 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:32:46,277 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:32:46,310 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:32:46,317 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1ea23daaf0> has no local changes
2024-03-27 00:32:46,317 [ 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 394 jo-mueller 'added `_repr_html_` method for `_ImageWrapper`' (user: jo-mueller)
- 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 398 will-moore 'getGridSize() handles plates with no Wells'
- PR 400 jburel 'Session ID and constructor'
- PR 403 sbesson 'Consume pre-build Ice Python wheel packages on Windows builds'
Generated by OMERO-python-superbuild-push#13 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/13/)'
2024-03-27 00:32:46,324 [ scc.git] DEBUG [detached HEAD 7dbcdfdd] merge master -Dorg -Ssuccess-only
2024-03-27 00:32:46,324 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-03-27 00:32:46,324 [ scc.git] INFO Overriding base-branch from master to develop
2024-03-27 00:32:46,324 [ scc.repo] DEBUG ## PRs found:
2024-03-27 00:32:46,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-03-27 00:32:47,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-03-27 00:32:47,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-03-27 00:32:48,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-03-27 00:32:48,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-03-27 00:32:49,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-03-27 00:32:49,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-03-27 00:32:50,264 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-03-27 00:32:50,725 [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-03-27 00:32:51,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-03-27 00:32:51,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:32:51,608 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-03-27 00:32:52,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-03-27 00:32:52,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-03-27 00:32:53,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-03-27 00:32:53,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-03-27 00:32:53,805 [ scc.repo] DEBUG ## Branches found:
2024-03-27 00:32:53,805 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-03-27 00:32:53,805 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:32:53,806 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:32:53,809 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-03-27 00:32:53,812 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-27 00:32:53,813 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-03-27 00:32:53,816 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-03-27 00:32:53,820 [ scc.git] DEBUG Already up to date.
2024-03-27 00:32:53,820 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-03-27 00:32:54,252 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-03-27 00:32:54,252 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-03-27 00:32:54,255 [ scc.git] DEBUG ## Unique users: []
2024-03-27 00:32:54,255 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:32:54,255 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:32:54,259 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-03-27 00:32:54,264 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:32:54,267 [ 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-03-27 00:32:54,293 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-03-27 00:32:54,293 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-03-27 00:32:54,293 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-27 00:32:54,294 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-27 00:32:54,297 [ scc.git] DEBUG Calling 'git reset --hard 2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-03-27 00:32:54,301 [ scc.git] DEBUG HEAD is now at 2078ac7 Bump version: 5.8.0 → 5.8.1.dev0
2024-03-27 00:32:54,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:32:54,466 [ scc.git] DEBUG Calling 'git merge-base 2078ac72dbf11f2733e685000a274eff81c2ac2d 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-03-27 00:32:54,471 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-03-27 00:32:54,475 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#13](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/13/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/13/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-03-27 00:32:54,478 [ scc.config] DEBUG Found github.token
2024-03-27 00:32:54,478 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-03-27 00:32:54,478 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:32:54,511 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:32:54,511 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:32:54,514 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:32:54,546 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:32:54,550 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1ea348a5e0> has no local changes
2024-03-27 00:32:54,550 [ 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#13 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/13/)'
2024-03-27 00:32:54,556 [ scc.git] DEBUG [detached HEAD b56157c] merge master -Dorg -Ssuccess-only
2024-03-27 00:32:54,557 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-03-27 00:32:54,557 [ scc.repo] DEBUG ## PRs found:
2024-03-27 00:32:55,056 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-03-27 00:32:55,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/547 HTTP/1.1" 200 None
2024-03-27 00:32:55,503 [ scc.repo] DEBUG # ... Include label: include
2024-03-27 00:32:56,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0d40a57843e298e3a4351415fc60c78495f0d705 HTTP/1.1" 200 None
2024-03-27 00:32:56,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0d40a57843e298e3a4351415fc60c78495f0d705/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-27 00:32:56,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0d40a57843e298e3a4351415fc60c78495f0d705/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-27 00:32:57,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0d40a57843e298e3a4351415fc60c78495f0d705 HTTP/1.1" 200 None
2024-03-27 00:32:57,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/0d40a57843e298e3a4351415fc60c78495f0d705?per_page=1 HTTP/1.1" 200 None
2024-03-27 00:32:58,335 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0d40a57843e298e3a4351415fc60c78495f0d705 HTTP/1.1" 200 None
2024-03-27 00:32:58,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/0d40a57843e298e3a4351415fc60c78495f0d705/status HTTP/1.1" 200 None
2024-03-27 00:32:58,766 [ scc.repo] DEBUG - PR 547 asherkhb 'Fix image path resolution in ome.chgrp.js'
2024-03-27 00:32:59,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543 HTTP/1.1" 200 None
2024-03-27 00:32:59,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542 HTTP/1.1" 200 None
2024-03-27 00:33:00,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542/comments HTTP/1.1" 200 None
2024-03-27 00:33:00,107 [ scc.repo] DEBUG # ... Include label: include
2024-03-27 00:33:00,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-03-27 00:33:01,136 [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-03-27 00:33:01,639 [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-03-27 00:33:02,166 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-03-27 00:33:02,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/977f7b65169e6dee479197a9156993bbadd2d2e2?per_page=1 HTTP/1.1" 200 None
2024-03-27 00:33:03,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-03-27 00:33:03,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/status HTTP/1.1" 200 None
2024-03-27 00:33:03,521 [ scc.repo] DEBUG - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-03-27 00:33:03,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/540 HTTP/1.1" 200 None
2024-03-27 00:33:04,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ee785db51c334b1be62c14ab36414993a2319a30 HTTP/1.1" 200 None
2024-03-27 00:33:04,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ee785db51c334b1be62c14ab36414993a2319a30/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-27 00:33:05,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ee785db51c334b1be62c14ab36414993a2319a30/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-27 00:33:05,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ee785db51c334b1be62c14ab36414993a2319a30 HTTP/1.1" 200 None
2024-03-27 00:33:06,363 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/ee785db51c334b1be62c14ab36414993a2319a30?per_page=1 HTTP/1.1" 200 None
2024-03-27 00:33:06,841 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ee785db51c334b1be62c14ab36414993a2319a30 HTTP/1.1" 200 None
2024-03-27 00:33:07,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ee785db51c334b1be62c14ab36414993a2319a30/status HTTP/1.1" 200 None
2024-03-27 00:33:07,274 [ scc.repo] DEBUG - PR 540 will-moore 'Add 'django.template.context_processors.request' to TEMPLATES'
2024-03-27 00:33:07,756 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/536 HTTP/1.1" 200 None
2024-03-27 00:33:08,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/536/comments HTTP/1.1" 200 None
2024-03-27 00:33:08,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/069e5c60afeaeca105e5209b14c37c87b49c2342 HTTP/1.1" 200 None
2024-03-27 00:33:09,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/069e5c60afeaeca105e5209b14c37c87b49c2342/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-27 00:33:09,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/069e5c60afeaeca105e5209b14c37c87b49c2342/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-27 00:33:10,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/069e5c60afeaeca105e5209b14c37c87b49c2342 HTTP/1.1" 200 None
2024-03-27 00:33:10,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/069e5c60afeaeca105e5209b14c37c87b49c2342?per_page=1 HTTP/1.1" 200 None
2024-03-27 00:33:11,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/069e5c60afeaeca105e5209b14c37c87b49c2342 HTTP/1.1" 200 None
2024-03-27 00:33:11,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/069e5c60afeaeca105e5209b14c37c87b49c2342/status HTTP/1.1" 200 None
2024-03-27 00:33:11,662 [ scc.repo] DEBUG - PR 536 will-moore 'imgData JSON with no stateful services'
2024-03-27 00:33:12,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-03-27 00:33:12,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-03-27 00:33:13,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-03-27 00:33:13,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-03-27 00:33:14,163 [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-03-27 00:33:14,652 [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-03-27 00:33:15,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-03-27 00:33:15,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-03-27 00:33:16,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-03-27 00:33:16,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-03-27 00:33:16,610 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-03-27 00:33:17,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/533 HTTP/1.1" 200 None
2024-03-27 00:33:17,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-03-27 00:33:18,108 [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-03-27 00:33:18,584 [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-03-27 00:33:19,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-03-27 00:33:19,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/e335980be1e7197826687f6c322a60c61b4aa545?per_page=1 HTTP/1.1" 200 None
2024-03-27 00:33:19,970 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-03-27 00:33:20,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545/status HTTP/1.1" 200 None
2024-03-27 00:33:20,415 [ scc.repo] DEBUG - PR 533 jburel 'use conda-forge channel'
2024-03-27 00:33:20,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-03-27 00:33:21,346 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-03-27 00:33:21,822 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-03-27 00:33:22,330 [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-03-27 00:33:22,821 [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-03-27 00:33:23,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-03-27 00:33:23,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-03-27 00:33:24,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-03-27 00:33:24,558 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-03-27 00:33:24,558 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-03-27 00:33:25,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/399 HTTP/1.1" 200 None
2024-03-27 00:33:25,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/225 HTTP/1.1" 200 None
2024-03-27 00:33:26,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/225/comments HTTP/1.1" 200 None
2024-03-27 00:33:26,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/200678050/issues/225/comments?page=2 HTTP/1.1" 200 None
2024-03-27 00:33:27,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-03-27 00:33:27,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-03-27 00:33:28,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615 HTTP/1.1" 200 None
2024-03-27 00:33:28,588 [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-03-27 00:33:29,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615 HTTP/1.1" 200 None
2024-03-27 00:33:29,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/219d9e721304a4c46b4d73ef9ff3777549d69615?per_page=1 HTTP/1.1" 200 2
2024-03-27 00:33:29,458 [ scc.repo] DEBUG - PR 168 stick 'Changes to nginx @maintenance handler'
2024-03-27 00:33:29,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/17 HTTP/1.1" 200 None
2024-03-27 00:33:30,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/17/comments HTTP/1.1" 200 None
2024-03-27 00:33:30,399 [ scc.repo] DEBUG ## Branches found:
2024-03-27 00:33:30,399 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-03-27 00:33:30,399 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:33:30,399 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:33:30,404 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-27 00:33:30,407 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-27 00:33:30,408 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-27 00:33:30,411 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-27 00:33:30,416 [ scc.git] DEBUG Already up to date.
2024-03-27 00:33:30,416 [ scc.git] DEBUG Calling 'git fetch origin pull/168/head'
2024-03-27 00:33:31,152 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-03-27 00:33:31,153 [ scc.git] DEBUG * branch refs/pull/168/head -> FETCH_HEAD
2024-03-27 00:33:31,156 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-03-27 00:33:31,595 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-03-27 00:33:31,595 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-03-27 00:33:31,598 [ scc.git] DEBUG Calling 'git fetch origin pull/533/head'
2024-03-27 00:33:32,044 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-03-27 00:33:32,044 [ scc.git] DEBUG * branch refs/pull/533/head -> FETCH_HEAD
2024-03-27 00:33:32,047 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-03-27 00:33:32,440 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-03-27 00:33:32,440 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-03-27 00:33:32,443 [ scc.git] DEBUG Calling 'git fetch origin pull/536/head'
2024-03-27 00:33:33,357 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-03-27 00:33:33,358 [ scc.git] DEBUG * branch refs/pull/536/head -> FETCH_HEAD
2024-03-27 00:33:33,361 [ scc.git] DEBUG Calling 'git fetch origin pull/540/head'
2024-03-27 00:33:33,753 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-03-27 00:33:33,753 [ scc.git] DEBUG * branch refs/pull/540/head -> FETCH_HEAD
2024-03-27 00:33:33,756 [ scc.git] DEBUG Calling 'git fetch origin pull/542/head'
2024-03-27 00:33:34,525 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-03-27 00:33:34,525 [ scc.git] DEBUG * branch refs/pull/542/head -> FETCH_HEAD
2024-03-27 00:33:34,528 [ scc.git] DEBUG Calling 'git fetch origin pull/547/head'
2024-03-27 00:33:35,107 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-03-27 00:33:35,107 [ scc.git] DEBUG * branch refs/pull/547/head -> FETCH_HEAD
2024-03-27 00:33:35,109 [ scc.git] DEBUG ## Unique users: []
2024-03-27 00:33:35,109 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:33:35,109 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:33:35,113 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-03-27 00:33:35,125 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:33:35,129 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 168 (Changes to nginx @maintenance handler) 219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-03-27 00:33:35,160 [ scc.git] DEBUG Auto-merging test/unit/test_web.py
2024-03-27 00:33:35,160 [ scc.git] DEBUG CONFLICT (content): Merge conflict in test/unit/test_web.py
2024-03-27 00:33:35,160 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-27 00:33:35,161 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-27 00:33:35,166 [ scc.git] DEBUG Calling 'git reset --hard bb3ae5cab33420ff9992e07de8614f5a5c0e234a'
2024-03-27 00:33:35,173 [ scc.git] DEBUG HEAD is now at bb3ae5cab Merge pull request #544 from ome/pre-commit-ci-update-config
2024-03-27 00:33:35,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:33:35,334 [ scc.git] DEBUG Calling 'git merge-base bb3ae5cab33420ff9992e07de8614f5a5c0e234a 219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-03-27 00:33:35,346 [ scc.git] DEBUG Calling 'git diff --name-only 632d14a9cab5319c6b1bd9190d441a95e457103b..bb3ae5cab33420ff9992e07de8614f5a5c0e234a'
2024-03-27 00:33:35,405 [ scc.git] INFO - PR 168 stick 'Changes to nginx @maintenance handler'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#13](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/13/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/13/consoleText) for more details.
Possible conflicts:
- Upstream changes
- test/unit/test_web.py
--conflicts
2024-03-27 00:33:35,408 [ scc.config] DEBUG Found github.token
2024-03-27 00:33:35,408 [ scc.git] DEBUG Not adding comment to issue #168, already --conflicts.
2024-03-27 00:33:35,408 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-03-27 00:33:35,413 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:33:35,416 [ 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-03-27 00:33:35,431 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-03-27 00:33:35,431 [ scc.git] DEBUG Auto-merging setup.py
2024-03-27 00:33:35,432 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:33:35,434 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-03-27 00:33:35,434 [ scc.git] DEBUG setup.py | 1 +
2024-03-27 00:33:35,434 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-03-27 00:33:35,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:33:35,759 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e335980be1e7197826687f6c322a60c61b4aa545'
2024-03-27 00:33:35,764 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:33:35,767 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 533 (use conda-forge channel) e335980be1e7197826687f6c322a60c61b4aa545'
2024-03-27 00:33:35,780 [ scc.git] DEBUG Auto-merging README.rst
2024-03-27 00:33:35,781 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:33:35,783 [ scc.git] DEBUG README.rst | 3 +--
2024-03-27 00:33:35,783 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 2 deletions(-)
2024-03-27 00:33:36,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:33:36,192 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-03-27 00:33:36,197 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:33:36,200 [ 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-03-27 00:33:36,217 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-03-27 00:33:36,217 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-03-27 00:33:36,218 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:33:36,221 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-03-27 00:33:36,221 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-03-27 00:33:36,221 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-03-27 00:33:36,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:33:36,622 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...069e5c60afeaeca105e5209b14c37c87b49c2342'
2024-03-27 00:33:36,627 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:33:36,631 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 536 (imgData JSON with no stateful services) 069e5c60afeaeca105e5209b14c37c87b49c2342'
2024-03-27 00:33:36,713 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py
2024-03-27 00:33:36,713 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-03-27 00:33:36,714 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:33:36,718 [ scc.git] DEBUG omeroweb/webclient/views.py | 4 +-
2024-03-27 00:33:36,718 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 132 +++++++++++++++++++++++++++++++++++++----
2024-03-27 00:33:36,718 [ scc.git] DEBUG omeroweb/webgateway/util.py | 38 ++++++++++++
2024-03-27 00:33:36,718 [ scc.git] DEBUG 3 files changed, 163 insertions(+), 11 deletions(-)
2024-03-27 00:33:37,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:33:37,048 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ee785db51c334b1be62c14ab36414993a2319a30'
2024-03-27 00:33:37,053 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:33:37,056 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 540 (Add 'django.template.context_processors.request' to TEMPLATES) ee785db51c334b1be62c14ab36414993a2319a30'
2024-03-27 00:33:37,082 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-03-27 00:33:37,083 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:33:37,086 [ scc.git] DEBUG omeroweb/settings.py | 1 +
2024-03-27 00:33:37,086 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2024-03-27 00:33:37,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:33:37,480 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...977f7b65169e6dee479197a9156993bbadd2d2e2'
2024-03-27 00:33:37,486 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:33:37,489 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 542 (PlateAcquisition filtering with plate display) 977f7b65169e6dee479197a9156993bbadd2d2e2'
2024-03-27 00:33:37,511 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py
2024-03-27 00:33:37,513 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:33:37,519 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 13 +++-------
2024-03-27 00:33:37,519 [ scc.git] DEBUG .../webclient/templates/webclient/data/plate.html | 10 ++++----
2024-03-27 00:33:37,519 [ scc.git] DEBUG omeroweb/webclient/views.py | 17 ++++++++++++
2024-03-27 00:33:37,519 [ scc.git] DEBUG omeroweb/webgateway/plategrid.py | 30 +++++++++++++++++++---
2024-03-27 00:33:37,519 [ scc.git] DEBUG .../static/webgateway/js/ome.plateview.js | 16 +++++++-----
2024-03-27 00:33:37,519 [ scc.git] DEBUG omeroweb/webgateway/urls.py | 2 +-
2024-03-27 00:33:37,519 [ scc.git] DEBUG omeroweb/webgateway/views.py | 16 ++++++++++--
2024-03-27 00:33:37,519 [ scc.git] DEBUG 7 files changed, 78 insertions(+), 26 deletions(-)
2024-03-27 00:33:37,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:33:37,911 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0d40a57843e298e3a4351415fc60c78495f0d705'
2024-03-27 00:33:37,916 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:33:37,919 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 547 (Fix image path resolution in ome.chgrp.js) 0d40a57843e298e3a4351415fc60c78495f0d705'
2024-03-27 00:33:37,937 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-27 00:33:37,940 [ scc.git] DEBUG omeroweb/webclient/static/webclient/javascript/ome.chgrp.js | 8 ++++----
2024-03-27 00:33:37,940 [ scc.git] DEBUG 1 file changed, 4 insertions(+), 4 deletions(-)
2024-03-27 00:33:38,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:33:38,329 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-27 00:33:38,362 [ scc.git] DEBUG Get sha1 of %s
2024-03-27 00:33:38,362 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-27 00:33:38,365 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:33:38,397 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:33:38,407 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1ea348bbb0> has no local changes
2024-03-27 00:33:38,407 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 543 knabar 'Make long-running tasks like "Save to all" more robust' (stage: draft)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 399 will-moore 'Handle chgrp dry-run LogicalChannel[ID] to show images' (stage: draft)
- PR 225 will-moore 'Query string ids' (exclude comment)
- PR 17 will-moore 'Right panel performance fixes' (exclude comment)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 533 jburel 'use conda-forge channel'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 536 will-moore 'imgData JSON with no stateful services'
- PR 540 will-moore 'Add 'django.template.context_processors.request' to TEMPLATES'
- PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
- PR 547 asherkhb 'Fix image path resolution in ome.chgrp.js'
Conflicting PRs (not included):
- PR 168 stick 'Changes to nginx @maintenance handler'
Generated by OMERO-python-superbuild-push#13 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/13/)'
2024-03-27 00:33:38,415 [ scc.git] DEBUG [detached HEAD 020c42ac7] merge master -Dorg -Ssuccess-only
2024-03-27 00:33:38,415 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-03-27 00:33:38,415 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-27 00:33:38,456 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-03-27 00:33:38,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:33:38,742 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-03-27 00:33:39,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:33:39,168 [ scc.config] DEBUG Found submodule.omero-py.url
2024-03-27 00:33:39,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:33:39,595 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-03-27 00:33:40,018 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:33:40,028 [ scc.config] DEBUG Found submodule.omero-web.url
2024-03-27 00:33:40,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-27 00:33:40,457 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-27 00:33:40,481 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1ea673cd30> has local changes
2024-03-27 00:33:40,481 [ 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 271 dependabot[bot] 'Bump omero-py from `0dc60bd` to `d76e17a`'
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 394 jo-mueller 'added `_repr_html_` method for `_ImageWrapper`' (user: jo-mueller)
- 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 398 will-moore 'getGridSize() handles plates with no Wells'
- PR 400 jburel 'Session ID and constructor'
- PR 403 sbesson 'Consume pre-build Ice Python wheel packages on Windows builds'
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 543 knabar 'Make long-running tasks like "Save to all" more robust' (stage: draft)
- PR 535 will-moore 'Initial working browser history' (stage: draft)
- PR 399 will-moore 'Handle chgrp dry-run LogicalChannel[ID] to show images' (stage: draft)
- PR 225 will-moore 'Query string ids' (exclude comment)
- PR 17 will-moore 'Right panel performance fixes' (exclude comment)
Already up to date.
Merged PRs:
- PR 527 will-moore 'Add some initial CSP settings to test'
- PR 533 jburel 'use conda-forge channel'
- PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
- PR 536 will-moore 'imgData JSON with no stateful services'
- PR 540 will-moore 'Add 'django.template.context_processors.request' to TEMPLATES'
- PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
- PR 547 asherkhb 'Fix image path resolution in ome.chgrp.js'
Conflicting PRs (not included):
- PR 168 stick 'Changes to nginx @maintenance handler'
Generated by OMERO-python-superbuild-push#13 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/13/)'
2024-03-27 00:33:40,488 [ scc.git] DEBUG [detached HEAD 7725ae2] merge master -Dorg -Ssuccess-only
2024-03-27 00:33:40,488 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-03-27 00:33:40,489 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-03-27 00:33:40,489 [ scc.merge] INFO Already up to date.
2024-03-27 00:33:40,489 [ scc.merge] INFO
2024-03-27 00:33:40,489 [ scc.merge] INFO Merged PRs:
2024-03-27 00:33:40,489 [ scc.merge] INFO - PR 271 dependabot[bot] 'Bump omero-py from `0dc60bd` to `d76e17a`'
2024-03-27 00:33:40,489 [ scc.merge] INFO
2024-03-27 00:33:40,489 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-03-27 00:33:40,489 [ scc.merge] INFO Already up to date.
2024-03-27 00:33:40,489 [ scc.merge] INFO
2024-03-27 00:33:40,489 [ scc.merge] INFO Merged PRs:
2024-03-27 00:33:40,489 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-03-27 00:33:40,489 [ scc.merge] INFO - PR 23 sbesson 'Remove python-future compatibility code'
2024-03-27 00:33:40,489 [ scc.merge] INFO
2024-03-27 00:33:40,489 [ scc.merge] INFO Repository: ome/omero-marshal
2024-03-27 00:33:40,489 [ scc.merge] INFO Excluded PRs:
2024-03-27 00:33:40,489 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-03-27 00:33:40,489 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-03-27 00:33:40,489 [ scc.merge] INFO Already up to date.
2024-03-27 00:33:40,489 [ scc.merge] INFO
2024-03-27 00:33:40,489 [ scc.merge] INFO Merged PRs:
2024-03-27 00:33:40,489 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-03-27 00:33:40,489 [ scc.merge] INFO
2024-03-27 00:33:40,489 [ scc.merge] INFO Repository: ome/omero-py
2024-03-27 00:33:40,489 [ scc.merge] INFO Excluded PRs:
2024-03-27 00:33:40,489 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-03-27 00:33:40,489 [ scc.merge] INFO - PR 394 jo-mueller 'added `_repr_html_` method for `_ImageWrapper`' (user: jo-mueller)
2024-03-27 00:33:40,489 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-03-27 00:33:40,489 [ scc.merge] INFO - PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
2024-03-27 00:33:40,489 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-03-27 00:33:40,490 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-03-27 00:33:40,490 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-03-27 00:33:40,490 [ scc.merge] INFO Already up to date.
2024-03-27 00:33:40,490 [ scc.merge] INFO
2024-03-27 00:33:40,490 [ scc.merge] INFO Merged PRs:
2024-03-27 00:33:40,490 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-03-27 00:33:40,490 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-03-27 00:33:40,490 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-03-27 00:33:40,490 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-03-27 00:33:40,490 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-03-27 00:33:40,490 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-03-27 00:33:40,490 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-03-27 00:33:40,490 [ scc.merge] INFO - PR 398 will-moore 'getGridSize() handles plates with no Wells'
2024-03-27 00:33:40,490 [ scc.merge] INFO - PR 400 jburel 'Session ID and constructor'
2024-03-27 00:33:40,490 [ scc.merge] INFO - PR 403 sbesson 'Consume pre-build Ice Python wheel packages on Windows builds'
2024-03-27 00:33:40,490 [ scc.merge] INFO
2024-03-27 00:33:40,490 [ scc.merge] INFO Repository: ome/omero-scripts
2024-03-27 00:33:40,490 [ scc.merge] INFO Excluded PRs:
2024-03-27 00:33:40,490 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-03-27 00:33:40,490 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-03-27 00:33:40,490 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-03-27 00:33:40,490 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-03-27 00:33:40,490 [ scc.merge] INFO Already up to date.
2024-03-27 00:33:40,490 [ scc.merge] INFO
2024-03-27 00:33:40,490 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-27 00:33:40,490 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-03-27 00:33:40,490 [ scc.merge] INFO
2024-03-27 00:33:40,490 [ scc.merge] INFO Repository: ome/omero-web
2024-03-27 00:33:40,490 [ scc.merge] INFO Excluded PRs:
2024-03-27 00:33:40,490 [ scc.merge] INFO - PR 543 knabar 'Make long-running tasks like "Save to all" more robust' (stage: draft)
2024-03-27 00:33:40,490 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-03-27 00:33:40,490 [ scc.merge] INFO - PR 399 will-moore 'Handle chgrp dry-run LogicalChannel[ID] to show images' (stage: draft)
2024-03-27 00:33:40,490 [ scc.merge] INFO - PR 225 will-moore 'Query string ids' (exclude comment)
2024-03-27 00:33:40,490 [ scc.merge] INFO - PR 17 will-moore 'Right panel performance fixes' (exclude comment)
2024-03-27 00:33:40,490 [ scc.merge] INFO Already up to date.
2024-03-27 00:33:40,490 [ scc.merge] INFO
2024-03-27 00:33:40,490 [ scc.merge] INFO Merged PRs:
2024-03-27 00:33:40,491 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-03-27 00:33:40,491 [ scc.merge] INFO - PR 533 jburel 'use conda-forge channel'
2024-03-27 00:33:40,491 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-03-27 00:33:40,491 [ scc.merge] INFO - PR 536 will-moore 'imgData JSON with no stateful services'
2024-03-27 00:33:40,491 [ scc.merge] INFO - PR 540 will-moore 'Add 'django.template.context_processors.request' to TEMPLATES'
2024-03-27 00:33:40,491 [ scc.merge] INFO - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-03-27 00:33:40,491 [ scc.merge] INFO - PR 547 asherkhb 'Fix image path resolution in ome.chgrp.js'
2024-03-27 00:33:40,491 [ scc.merge] INFO
2024-03-27 00:33:40,491 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-27 00:33:40,491 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler'
2024-03-27 00:33:40,491 [ scc.merge] INFO
2024-03-27 00:33:40,491 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-03-27 00:33:40,491 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:33:40,494 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-03-27 00:33:40,494 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:33:40,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-03-27 00:33:40,498 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-03-27 00:33:40,498 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:33:40,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-03-27 00:33:40,501 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-03-27 00:33:40,501 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:33:40,504 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-03-27 00:33:40,504 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-03-27 00:33:40,505 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:33:40,508 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-03-27 00:33:40,508 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-03-27 00:33:40,508 [ scc.git] DEBUG Calling 'git remote'
2024-03-27 00:33:40,511 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
Update component versions
Downloading https://BRANCHCI.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 "/usr/lib64/python3.9/urllib/request.py", line 1346, in do_open
h.request(req.get_method(), req.selector, req.data, headers,
File "/usr/lib64/python3.9/http/client.py", line 1285, in request
self._send_request(method, url, body, headers, encode_chunked)
File "/usr/lib64/python3.9/http/client.py", line 1331, in _send_request
self.endheaders(body, encode_chunked=encode_chunked)
File "/usr/lib64/python3.9/http/client.py", line 1280, in endheaders
self._send_output(message_body, encode_chunked=encode_chunked)
File "/usr/lib64/python3.9/http/client.py", line 1040, in _send_output
self.send(msg)
File "/usr/lib64/python3.9/http/client.py", line 980, in send
self.connect()
File "/usr/lib64/python3.9/http/client.py", line 1447, in connect
super().connect()
File "/usr/lib64/python3.9/http/client.py", line 946, in connect
self.sock = self._create_connection(
File "/usr/lib64/python3.9/socket.py", line 823, in create_connection
for res in getaddrinfo(host, port, 0, SOCK_STREAM):
File "/usr/lib64/python3.9/socket.py", line 954, in getaddrinfo
for res in _socket.getaddrinfo(host, port, family, type, proto, flags):
socket.gaierror: [Errno -2] Name or service not known
During handling of the above exception, another exception occurred:
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 517, in open
response = self._open(req, data)
File "/usr/lib64/python3.9/urllib/request.py", line 534, in _open
result = self._call_chain(self.handle_open, protocol, protocol +
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 1389, in https_open
return self.do_open(http.client.HTTPSConnection, req,
File "/usr/lib64/python3.9/urllib/request.py", line 1349, in do_open
raise URLError(err)
urllib.error.URLError: <urlopen error [Errno -2] Name or service not known>
Downloading https://BRANCHCI.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 "/usr/lib64/python3.9/urllib/request.py", line 1346, in do_open
h.request(req.get_method(), req.selector, req.data, headers,
File "/usr/lib64/python3.9/http/client.py", line 1285, in request
self._send_request(method, url, body, headers, encode_chunked)
File "/usr/lib64/python3.9/http/client.py", line 1331, in _send_request
self.endheaders(body, encode_chunked=encode_chunked)
File "/usr/lib64/python3.9/http/client.py", line 1280, in endheaders
self._send_output(message_body, encode_chunked=encode_chunked)
File "/usr/lib64/python3.9/http/client.py", line 1040, in _send_output
self.send(msg)
File "/usr/lib64/python3.9/http/client.py", line 980, in send
self.connect()
File "/usr/lib64/python3.9/http/client.py", line 1447, in connect
super().connect()
File "/usr/lib64/python3.9/http/client.py", line 946, in connect
self.sock = self._create_connection(
File "/usr/lib64/python3.9/socket.py", line 823, in create_connection
for res in getaddrinfo(host, port, 0, SOCK_STREAM):
File "/usr/lib64/python3.9/socket.py", line 954, in getaddrinfo
for res in _socket.getaddrinfo(host, port, family, type, proto, flags):
socket.gaierror: [Errno -2] Name or service not known
During handling of the above exception, another exception occurred:
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 517, in open
response = self._open(req, data)
File "/usr/lib64/python3.9/urllib/request.py", line 534, in _open
result = self._call_chain(self.handle_open, protocol, protocol +
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 1389, in https_open
return self.do_open(http.client.HTTPSConnection, req,
File "/usr/lib64/python3.9/urllib/request.py", line 1349, in do_open
raise URLError(err)
urllib.error.URLError: <urlopen error [Errno -2] Name or service not known>
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 d76e17aa
nothing to commit, working tree clean
Entering 'omero-scripts'
HEAD detached from 2078ac7
nothing to commit, working tree clean
Entering 'omero-web'
HEAD detached from bb3ae5cab
nothing to commit, working tree clean
HEAD detached from 2363a53
nothing to commit, working tree clean
2024-03-27 00:34:10,239 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
