Console Output
+ export BASE_REPO=omero-python-superbuild.git
+ BASE_REPO=omero-python-superbuild.git
+ export BASE_BRANCH=master
+ BASE_BRANCH=master
+ export VERSION_LOG=/home/omero/workspace/OMERO-python-superbuild-push/build/version.tsv
+ VERSION_LOG=/home/omero/workspace/OMERO-python-superbuild-push/build/version.tsv
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ '[' '!' nondestructive = nondestructive ']'
++ VIRTUAL_ENV=/home/omero/workspace/OMERO-python-superbuild-push/build/venv
++ export VIRTUAL_ENV
++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ PATH=/home/omero/workspace/OMERO-python-superbuild-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ export PATH
++ '[' -n '' ']'
++ '[' -z '' ']'
++ _OLD_VIRTUAL_PS1=
++ PS1='(venv) '
++ export PS1
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
+ '[' merge_ci '!=' null ']'
+ export PUSH_BRANCH=merge_ci
+ PUSH_BRANCH=merge_ci
+ '[' null '!=' null ']'
+ export STATUS=success-only 'MERGE_OPTIONS=-vvv --no-ask --reset --comment'
+ STATUS=success-only
+ MERGE_OPTIONS='-vvv --no-ask --reset --comment'
+ bash build/build-infra-master/recursive-merge
Merge base repository (no submodule updates)
2024-04-18 00:31:23,169 [ scc.config] DEBUG Found github.token
2024-04-18 00:31:23,173 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-04-18 00:31:23,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:31:23,830 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:31:24,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-04-18 00:31:24,231 [ scc.gh] DEBUG 4610 remaining from 5000 (Reset at 01:04
2024-04-18 00:31:24,232 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-18 00:31:24,236 [ scc.git] DEBUG Check current status
2024-04-18 00:31:24,236 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-18 00:31:24,240 [ scc.git] DEBUG 2524209 Merge pull request #272 from ome/dependabot/submodules/omero-web-0e4013c
2024-04-18 00:31:24,240 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-18 00:31:24,288 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-04-18 00:31:24,291 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-04-18 00:31:24,295 [ scc.git] DEBUG d76e17aa58ca755d239e9e8005712cd78239c62e omero-py (v5.19.1-1-gd76e17aa)
2024-04-18 00:31:24,299 [ scc.git] DEBUG 2078ac72dbf11f2733e685000a274eff81c2ac2d omero-scripts (v5.8.0-1-g2078ac7)
2024-04-18 00:31:24,302 [ scc.git] DEBUG 0e4013c65acba6525cd5eabf869611c9e1311ba7 omero-web (v5.25.0-5-g0e4013c65)
2024-04-18 00:31:24,308 [ scc.config] DEBUG Found remote.origin.url
2024-04-18 00:31:24,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-04-18 00:31:25,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-18 00:31:25,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-18 00:31:26,001 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-18 00:31:26,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-18 00:31:26,423 [ scc.git] DEBUG Resetting...
2024-04-18 00:31:26,423 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-04-18 00:31:26,429 [ scc.git] DEBUG HEAD is now at 2524209 Merge pull request #272 from ome/dependabot/submodules/omero-web-0e4013c
2024-04-18 00:31:26,429 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-04-18 00:31:26,483 [ scc.git] DEBUG Check current status
2024-04-18 00:31:26,484 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-18 00:31:26,488 [ scc.git] DEBUG 2524209 Merge pull request #272 from ome/dependabot/submodules/omero-web-0e4013c
2024-04-18 00:31:26,488 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-18 00:31:26,531 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-04-18 00:31:26,533 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-04-18 00:31:26,537 [ scc.git] DEBUG d76e17aa58ca755d239e9e8005712cd78239c62e omero-py (v5.19.1-1-gd76e17aa)
2024-04-18 00:31:26,540 [ scc.git] DEBUG 2078ac72dbf11f2733e685000a274eff81c2ac2d omero-scripts (v5.8.0-1-g2078ac7)
2024-04-18 00:31:26,543 [ scc.git] DEBUG 0e4013c65acba6525cd5eabf869611c9e1311ba7 omero-web (v5.25.0-5-g0e4013c65)
2024-04-18 00:31:26,544 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-04-18 00:31:26,544 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-04-18 00:31:26,545 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-04-18 00:31:26,545 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-04-18 00:31:26,545 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-04-18 00:31:26,545 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:31:26,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-04-18 00:31:27,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/273 HTTP/1.1" 200 None
2024-04-18 00:31:27,362 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-18 00:31:27,363 [ scc.repo] DEBUG - PR 273 dependabot[bot] 'Bump omero-web from `0e4013c` to `02bd670`'
2024-04-18 00:31:27,363 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:31:27,363 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:31:27,363 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:31:27,368 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:31:27,372 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:31:27,373 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:31:27,377 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:31:27,382 [ scc.git] DEBUG Already up to date.
2024-04-18 00:31:27,382 [ scc.git] DEBUG Calling 'git fetch origin pull/273/head'
2024-04-18 00:31:27,986 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-04-18 00:31:27,986 [ scc.git] DEBUG * branch refs/pull/273/head -> FETCH_HEAD
2024-04-18 00:31:27,992 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:31:27,992 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:31:27,992 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:31:27,997 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0662e2a8daa446818d06e407980c3b27ef4e41a5'
2024-04-18 00:31:28,002 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:31:28,007 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 273 (Bump omero-web from `0e4013c` to `02bd670`) 0662e2a8daa446818d06e407980c3b27ef4e41a5'
2024-04-18 00:31:28,019 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:31:28,022 [ scc.git] DEBUG omero-web | 2 +-
2024-04-18 00:31:28,022 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-18 00:31:28,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:31:28,200 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:31:28,272 [ scc.git] DEBUG Submodule path 'omero-web': checked out '02bd670ca7628ecb293108f394ef062a66a7beb4'
2024-04-18 00:31:28,273 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:31:28,273 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:31:28,277 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:31:28,428 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f44ef48d460> has no local changes
2024-04-18 00:31:28,428 [ 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 273 dependabot[bot] 'Bump omero-web from `0e4013c` to `02bd670`'
Generated by OMERO-python-superbuild-push#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/36/)'
2024-04-18 00:31:28,458 [ scc.git] DEBUG [detached HEAD e5409d1] merge master -Dorg -Snone
2024-04-18 00:31:28,458 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-04-18 00:31:28,458 [ scc.merge] INFO Already up to date.
2024-04-18 00:31:28,458 [ scc.merge] INFO
2024-04-18 00:31:28,458 [ scc.merge] INFO Merged PRs:
2024-04-18 00:31:28,458 [ scc.merge] INFO - PR 273 dependabot[bot] 'Bump omero-web from `0e4013c` to `02bd670`'
2024-04-18 00:31:28,458 [ scc.merge] INFO
2024-04-18 00:31:28,458 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-18 00:31:28,458 [ 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-04-18 00:31:31,135 [ scc.config] DEBUG Found github.token
2024-04-18 00:31:31,139 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-04-18 00:31:31,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:31:31,798 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:31:32,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-04-18 00:31:32,199 [ scc.gh] DEBUG 4600 remaining from 5000 (Reset at 01:04
2024-04-18 00:31:32,200 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-18 00:31:32,204 [ scc.git] DEBUG Check current status
2024-04-18 00:31:32,204 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-18 00:31:32,208 [ scc.git] DEBUG e5409d1 merge master -Dorg -Snone
2024-04-18 00:31:32,208 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-18 00:31:32,251 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-04-18 00:31:32,254 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-04-18 00:31:32,257 [ scc.git] DEBUG d76e17aa58ca755d239e9e8005712cd78239c62e omero-py (v5.19.1-1-gd76e17aa)
2024-04-18 00:31:32,261 [ scc.git] DEBUG 2078ac72dbf11f2733e685000a274eff81c2ac2d omero-scripts (v5.8.0-1-g2078ac7)
2024-04-18 00:31:32,266 [ scc.git] DEBUG 02bd670ca7628ecb293108f394ef062a66a7beb4 omero-web (v5.25.0-7-g02bd670ca)
2024-04-18 00:31:32,271 [ scc.config] DEBUG Found remote.origin.url
2024-04-18 00:31:32,271 [ scc.git] DEBUG Reading repository configuration from repositories.yml
2024-04-18 00:31:32,274 [ scc.git] DEBUG Repository configuration:
base-branch: master
submodules:
omero-scripts:
base-branch: develop
2024-04-18 00:31:32,721 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild HTTP/1.1" 200 None
2024-04-18 00:31:33,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-18 00:31:33,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-18 00:31:34,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-18 00:31:34,445 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-18 00:31:34,447 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:31:34,496 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-04-18 00:31:34,496 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-18 00:31:34,500 [ scc.git] DEBUG Check current status
2024-04-18 00:31:34,500 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-18 00:31:34,504 [ scc.git] DEBUG 5863350 Merge pull request #22 from sbesson/python311
2024-04-18 00:31:34,504 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-18 00:31:34,550 [ scc.config] DEBUG Found remote.origin.url
2024-04-18 00:31:34,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox HTTP/1.1" 200 None
2024-04-18 00:31:35,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-18 00:31:35,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-18 00:31:36,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-18 00:31:36,615 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-18 00:31:36,617 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:31:36,657 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-18 00:31:36,657 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-04-18 00:31:36,658 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-18 00:31:36,662 [ scc.git] DEBUG Check current status
2024-04-18 00:31:36,662 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-18 00:31:36,666 [ scc.git] DEBUG cca4c2f Merge pull request #80 from sbesson/python312
2024-04-18 00:31:36,666 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-18 00:31:36,712 [ scc.config] DEBUG Found remote.origin.url
2024-04-18 00:31:37,076 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal HTTP/1.1" 200 None
2024-04-18 00:31:37,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-18 00:31:37,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-18 00:31:38,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-18 00:31:38,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-18 00:31:38,796 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:31:38,836 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-18 00:31:38,837 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-04-18 00:31:38,837 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-18 00:31:38,843 [ scc.git] DEBUG Check current status
2024-04-18 00:31:38,843 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-18 00:31:38,847 [ scc.git] DEBUG d76e17aa Bump version: 5.19.1 → 5.19.2.dev0
2024-04-18 00:31:38,848 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-18 00:31:38,890 [ scc.config] DEBUG Found remote.origin.url
2024-04-18 00:31:39,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py HTTP/1.1" 200 None
2024-04-18 00:31:39,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-18 00:31:40,177 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-18 00:31:40,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-18 00:31:41,004 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-18 00:31:41,006 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:31:41,052 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-18 00:31:41,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-04-18 00:31:41,054 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-18 00:31:41,059 [ scc.git] DEBUG Check current status
2024-04-18 00:31:41,059 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-18 00:31:41,064 [ scc.git] DEBUG 2078ac7 Bump version: 5.8.0 → 5.8.1.dev0
2024-04-18 00:31:41,064 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-18 00:31:41,113 [ scc.config] DEBUG Found remote.origin.url
2024-04-18 00:31:41,114 [ scc.git] DEBUG Repository configuration:
base-branch: develop
2024-04-18 00:31:41,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts HTTP/1.1" 200 None
2024-04-18 00:31:41,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-18 00:31:42,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-18 00:31:42,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-18 00:31:43,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-18 00:31:43,214 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:31:43,261 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-18 00:31:43,262 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-04-18 00:31:43,262 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-18 00:31:43,267 [ scc.git] DEBUG Check current status
2024-04-18 00:31:43,267 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-18 00:31:43,271 [ scc.git] DEBUG 02bd670ca Merge pull request #551 from ome/pre-commit-ci-update-config
2024-04-18 00:31:43,271 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-18 00:31:43,317 [ scc.config] DEBUG Found remote.origin.url
2024-04-18 00:31:43,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web HTTP/1.1" 200 None
2024-04-18 00:31:44,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-18 00:31:44,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-18 00:31:44,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-18 00:31:45,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-18 00:31:45,403 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:31:45,454 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-18 00:31:45,455 [ scc.git] DEBUG Resetting...
2024-04-18 00:31:45,455 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-04-18 00:31:45,462 [ scc.git] DEBUG HEAD is now at e5409d1 merge master -Dorg -Snone
2024-04-18 00:31:45,463 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-04-18 00:31:45,518 [ scc.git] DEBUG Check current status
2024-04-18 00:31:45,518 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-18 00:31:45,524 [ scc.git] DEBUG e5409d1 merge master -Dorg -Snone
2024-04-18 00:31:45,524 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-18 00:31:45,570 [ scc.git] DEBUG 586335057cf72cce7df48fd2b99f124a26100deb omero-dropbox (v5.6.0-54-g5863350)
2024-04-18 00:31:45,573 [ scc.git] DEBUG cca4c2f7b6934b48b8ddb0e337c32d32cd4a07f3 omero-marshal (v0.9.0-4-gcca4c2f)
2024-04-18 00:31:45,577 [ scc.git] DEBUG d76e17aa58ca755d239e9e8005712cd78239c62e omero-py (v5.19.1-1-gd76e17aa)
2024-04-18 00:31:45,581 [ scc.git] DEBUG 2078ac72dbf11f2733e685000a274eff81c2ac2d omero-scripts (v5.8.0-1-g2078ac7)
2024-04-18 00:31:45,584 [ scc.git] DEBUG 02bd670ca7628ecb293108f394ef062a66a7beb4 omero-web (v5.25.0-7-g02bd670ca)
2024-04-18 00:31:45,585 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-04-18 00:31:45,586 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-04-18 00:31:45,586 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-04-18 00:31:45,586 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-04-18 00:31:45,586 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-04-18 00:31:45,586 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-04-18 00:31:45,586 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:31:45,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/pulls HTTP/1.1" 200 None
2024-04-18 00:31:46,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/issues/273 HTTP/1.1" 200 None
2024-04-18 00:31:46,488 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-18 00:31:47,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/0662e2a8daa446818d06e407980c3b27ef4e41a5 HTTP/1.1" 200 None
2024-04-18 00:31:47,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/0662e2a8daa446818d06e407980c3b27ef4e41a5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:31:48,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/commits/0662e2a8daa446818d06e407980c3b27ef4e41a5 HTTP/1.1" 200 None
2024-04-18 00:31:48,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-python-superbuild/statuses/0662e2a8daa446818d06e407980c3b27ef4e41a5?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:31:48,470 [ scc.repo] DEBUG - PR 273 dependabot[bot] 'Bump omero-web from `0e4013c` to `02bd670`'
2024-04-18 00:31:48,470 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:31:48,470 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:31:48,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:31:48,474 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:31:48,479 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:31:48,479 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:31:48,485 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:31:48,490 [ scc.git] DEBUG Already up to date.
2024-04-18 00:31:48,491 [ scc.git] DEBUG Calling 'git fetch origin pull/273/head'
2024-04-18 00:31:48,903 [ scc.git] DEBUG From https://github.com/ome/omero-python-superbuild
2024-04-18 00:31:48,903 [ scc.git] DEBUG * branch refs/pull/273/head -> FETCH_HEAD
2024-04-18 00:31:48,909 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:31:48,909 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:31:48,909 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:31:48,914 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0662e2a8daa446818d06e407980c3b27ef4e41a5'
2024-04-18 00:31:48,919 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:31:48,925 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 273 (Bump omero-web from `0e4013c` to `02bd670`) 0662e2a8daa446818d06e407980c3b27ef4e41a5'
2024-04-18 00:31:48,930 [ scc.git] DEBUG Already up to date.
2024-04-18 00:31:49,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:31:49,095 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:31:49,142 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:31:49,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:31:49,148 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:31:49,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/pulls HTTP/1.1" 200 None
2024-04-18 00:31:50,069 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23 HTTP/1.1" 200 None
2024-04-18 00:31:50,583 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/23/comments HTTP/1.1" 200 None
2024-04-18 00:31:51,088 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None
2024-04-18 00:31:51,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:31:52,034 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-18 00:31:52,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8 HTTP/1.1" 200 None
2024-04-18 00:31:52,990 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:31:52,991 [ scc.repo] DEBUG - PR 23 sbesson 'Remove python-future compatibility code'
2024-04-18 00:31:53,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16 HTTP/1.1" 200 None
2024-04-18 00:31:53,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/issues/16/comments HTTP/1.1" 200 None
2024-04-18 00:31:54,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-04-18 00:31:54,915 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:31:55,434 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/commits/f802993eba0b6514d0e31f0f7d5b996ffb54b452 HTTP/1.1" 200 None
2024-04-18 00:31:55,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-dropbox/statuses/f802993eba0b6514d0e31f0f7d5b996ffb54b452?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:31:55,849 [ scc.repo] DEBUG - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-04-18 00:31:55,850 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:31:55,850 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-04-18 00:31:55,850 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:31:55,850 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:31:55,855 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:31:55,859 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:31:55,860 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:31:55,864 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:31:55,868 [ scc.git] DEBUG Already up to date.
2024-04-18 00:31:55,868 [ scc.git] DEBUG Calling 'git fetch origin pull/16/head'
2024-04-18 00:31:56,256 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-04-18 00:31:56,256 [ scc.git] DEBUG * branch refs/pull/16/head -> FETCH_HEAD
2024-04-18 00:31:56,261 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head'
2024-04-18 00:31:56,636 [ scc.git] DEBUG From https://github.com/ome/omero-dropbox
2024-04-18 00:31:56,636 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD
2024-04-18 00:31:56,641 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:31:56,641 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:31:56,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:31:56,646 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-04-18 00:31:56,650 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:31:56,655 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 16 (Review all instances of whitelist/blacklist) f802993eba0b6514d0e31f0f7d5b996ffb54b452'
2024-04-18 00:31:56,676 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:31:56,680 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 6 +++---
2024-04-18 00:31:56,680 [ scc.git] DEBUG src/fsDirectory.py | 46 ++++++++++++++++++++--------------------
2024-04-18 00:31:56,680 [ scc.git] DEBUG src/fsDropBox.py | 24 ++++++++++-----------
2024-04-18 00:31:56,680 [ scc.git] DEBUG src/fsLists.py | 14 ++++++------
2024-04-18 00:31:56,680 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 10 ++++-----
2024-04-18 00:31:56,680 [ scc.git] DEBUG src/fsMonitor.py | 24 ++++++++++-----------
2024-04-18 00:31:56,682 [ scc.git] DEBUG src/fsMonitorServer.py | 10 ++++-----
2024-04-18 00:31:56,682 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 8 +++----
2024-04-18 00:31:56,682 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 20 ++++++++---------
2024-04-18 00:31:56,683 [ scc.git] DEBUG 9 files changed, 81 insertions(+), 81 deletions(-)
2024-04-18 00:31:56,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:31:56,844 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8'
2024-04-18 00:31:56,850 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:31:56,854 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 23 (Remove python-future compatibility code) 9be465b316e0bf0fbbf1b55a89b4dc9d7ecbfab8'
2024-04-18 00:31:56,889 [ scc.git] DEBUG Auto-merging src/fsAbstractPlatformMonitor.py
2024-04-18 00:31:56,889 [ scc.git] DEBUG Auto-merging src/fsDirectory.py
2024-04-18 00:31:56,889 [ scc.git] DEBUG Auto-merging src/fsDropBox.py
2024-04-18 00:31:56,889 [ scc.git] DEBUG Auto-merging src/fsLists.py
2024-04-18 00:31:56,889 [ scc.git] DEBUG Auto-merging src/fsMac-10-5-Monitor.py
2024-04-18 00:31:56,889 [ scc.git] DEBUG Auto-merging src/fsMonitor.py
2024-04-18 00:31:56,889 [ scc.git] DEBUG Auto-merging src/fsMonitorServer.py
2024-04-18 00:31:56,889 [ scc.git] DEBUG Auto-merging src/fsPyinotifyMonitor.py
2024-04-18 00:31:56,889 [ scc.git] DEBUG Auto-merging src/fsWin-XP-Monitor.py
2024-04-18 00:31:56,889 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:31:56,895 [ scc.git] DEBUG .github/workflows/omero_plugin.yml | 2 +-
2024-04-18 00:31:56,895 [ scc.git] DEBUG .github/workflows/publish_pypi.yml | 6 +++--
2024-04-18 00:31:56,895 [ scc.git] DEBUG .github/workflows/tox.yml | 5 ++--
2024-04-18 00:31:56,895 [ scc.git] DEBUG Dockerfile | 32 ----------------------
2024-04-18 00:31:56,895 [ scc.git] DEBUG setup.py | 2 +-
2024-04-18 00:31:56,895 [ scc.git] DEBUG src/fsAbstractPlatformMonitor.py | 1 -
2024-04-18 00:31:56,895 [ scc.git] DEBUG src/fsDirectory.py | 8 +-----
2024-04-18 00:31:56,896 [ scc.git] DEBUG src/fsDropBox.py | 8 +-----
2024-04-18 00:31:56,896 [ scc.git] DEBUG src/fsDropBoxMonitorClient.py | 11 +-------
2024-04-18 00:31:56,896 [ scc.git] DEBUG src/fsFileServer.py | 12 ++-------
2024-04-18 00:31:56,896 [ scc.git] DEBUG src/fsLists.py | 2 --
2024-04-18 00:31:56,896 [ scc.git] DEBUG src/fsMac-10-5-Monitor.py | 9 +------
2024-04-18 00:31:56,896 [ scc.git] DEBUG src/fsMonitor.py | 2 --
2024-04-18 00:31:56,896 [ scc.git] DEBUG src/fsMonitorServer.py | 8 +++---
2024-04-18 00:31:56,896 [ scc.git] DEBUG src/fsNotificationScheduler.py | 3 ---
2024-04-18 00:31:56,896 [ scc.git] DEBUG src/fsPyinotifyMonitor.py | 21 +++++----------
2024-04-18 00:31:56,896 [ scc.git] DEBUG src/fsUtil.py | 9 +++----
2024-04-18 00:31:56,896 [ scc.git] DEBUG src/fsWin-XP-Monitor.py | 8 +-----
2024-04-18 00:31:56,896 [ scc.git] DEBUG test/conftest.py | 2 --
2024-04-18 00:31:56,896 [ scc.git] DEBUG test/drivers.py | 17 +++---------
2024-04-18 00:31:56,896 [ scc.git] DEBUG test/unit/test_drivers.py | 55 ++++++++++++++++----------------------
2024-04-18 00:31:56,896 [ scc.git] DEBUG test/unit/test_monitor.py | 2 --
2024-04-18 00:31:56,896 [ scc.git] DEBUG test/unit/test_replay.py | 8 +-----
2024-04-18 00:31:56,897 [ scc.git] DEBUG test/unit/test_state.py | 1 -
2024-04-18 00:31:56,897 [ scc.git] DEBUG tox.ini | 3 ++-
2024-04-18 00:31:56,897 [ scc.git] DEBUG 25 files changed, 59 insertions(+), 178 deletions(-)
2024-04-18 00:31:56,897 [ scc.git] DEBUG delete mode 100644 Dockerfile
2024-04-18 00:31:57,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:31:57,249 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:31:57,293 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:31:57,293 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:31:57,298 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:31:57,342 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:31:57,351 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f27b154fc10> has no local changes
2024-04-18 00:31:57,351 [ 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#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/36/)'
2024-04-18 00:31:57,360 [ scc.git] DEBUG [detached HEAD a717edc] merge master -Dorg -Ssuccess-only
2024-04-18 00:31:57,361 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-18 00:31:57,361 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:31:57,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/pulls HTTP/1.1" 200 None
2024-04-18 00:31:58,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69 HTTP/1.1" 200 None
2024-04-18 00:31:58,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/69/comments HTTP/1.1" 200 None
2024-04-18 00:31:59,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-04-18 00:31:59,731 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:32:00,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-18 00:32:00,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/commits/1cbe0bebb081ffedb835c966ecb434d33502ceca HTTP/1.1" 200 None
2024-04-18 00:32:01,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/statuses/1cbe0bebb081ffedb835c966ecb434d33502ceca?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:32:01,150 [ scc.repo] DEBUG - PR 69 will-moore 'Roi encoder allows Shape None'
2024-04-18 00:32:01,597 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34 HTTP/1.1" 200 None
2024-04-18 00:32:02,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/34/comments HTTP/1.1" 200 None
2024-04-18 00:32:02,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33 HTTP/1.1" 200 None
2024-04-18 00:32:02,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-marshal/issues/33/comments HTTP/1.1" 200 None
2024-04-18 00:32:02,974 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:32:02,974 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-04-18 00:32:02,974 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:32:02,974 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:32:02,978 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:32:02,983 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:32:02,983 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:32:02,987 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:32:02,997 [ scc.git] DEBUG Already up to date.
2024-04-18 00:32:02,997 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-04-18 00:32:03,460 [ scc.git] DEBUG From https://github.com/ome/omero-marshal
2024-04-18 00:32:03,460 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-04-18 00:32:03,465 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:32:03,465 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:32:03,465 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:32:03,470 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-04-18 00:32:03,476 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:32:03,480 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (Roi encoder allows Shape None) 1cbe0bebb081ffedb835c966ecb434d33502ceca'
2024-04-18 00:32:03,490 [ scc.git] DEBUG Auto-merging tests/unit/conftest.py
2024-04-18 00:32:03,491 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:32:03,494 [ scc.git] DEBUG omero_marshal/encode/encoders/roi.py | 5 +++--
2024-04-18 00:32:03,494 [ scc.git] DEBUG tests/unit/conftest.py | 5 ++++-
2024-04-18 00:32:03,494 [ scc.git] DEBUG 2 files changed, 7 insertions(+), 3 deletions(-)
2024-04-18 00:32:03,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:32:03,705 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:32:03,744 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:32:03,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:32:03,749 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:32:03,787 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:32:03,793 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f27b14ec0d0> has no local changes
2024-04-18 00:32:03,793 [ 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#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/36/)'
2024-04-18 00:32:03,801 [ scc.git] DEBUG [detached HEAD ac45f65] merge master -Dorg -Ssuccess-only
2024-04-18 00:32:03,802 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-18 00:32:03,802 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:32:04,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/pulls HTTP/1.1" 200 None
2024-04-18 00:32:04,981 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/405 HTTP/1.1" 200 None
2024-04-18 00:32:05,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/405/comments HTTP/1.1" 200 None
2024-04-18 00:32:05,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5ad53ebee1b529384752bd13b853b45d14484e4c HTTP/1.1" 200 None
2024-04-18 00:32:06,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5ad53ebee1b529384752bd13b853b45d14484e4c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:32:06,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5ad53ebee1b529384752bd13b853b45d14484e4c/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-18 00:32:07,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5ad53ebee1b529384752bd13b853b45d14484e4c HTTP/1.1" 200 None
2024-04-18 00:32:07,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/5ad53ebee1b529384752bd13b853b45d14484e4c?per_page=1 HTTP/1.1" 200 None
2024-04-18 00:32:08,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5ad53ebee1b529384752bd13b853b45d14484e4c HTTP/1.1" 200 None
2024-04-18 00:32:08,736 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/5ad53ebee1b529384752bd13b853b45d14484e4c/status HTTP/1.1" 200 None
2024-04-18 00:32:08,739 [ scc.repo] DEBUG - PR 405 will-moore 'FilesetWrapper lazy loads Images and UsedFiles'
2024-04-18 00:32:09,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/403 HTTP/1.1" 200 None
2024-04-18 00:32:09,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/403/comments HTTP/1.1" 200 None
2024-04-18 00:32:10,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/61489cddb9009af5f6f914e39ef9b02b4019f13d HTTP/1.1" 200 None
2024-04-18 00:32:10,639 [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-04-18 00:32:11,134 [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-04-18 00:32:11,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/61489cddb9009af5f6f914e39ef9b02b4019f13d HTTP/1.1" 200 None
2024-04-18 00:32:12,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/61489cddb9009af5f6f914e39ef9b02b4019f13d?per_page=1 HTTP/1.1" 200 None
2024-04-18 00:32:12,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/61489cddb9009af5f6f914e39ef9b02b4019f13d HTTP/1.1" 200 None
2024-04-18 00:32:13,114 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/61489cddb9009af5f6f914e39ef9b02b4019f13d/status HTTP/1.1" 200 None
2024-04-18 00:32:13,115 [ scc.repo] DEBUG - PR 403 sbesson 'Consume pre-build Ice Python wheel packages on Windows builds'
2024-04-18 00:32:13,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/400 HTTP/1.1" 200 None
2024-04-18 00:32:14,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/400/comments HTTP/1.1" 200 None
2024-04-18 00:32:14,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/64bf1f9dfd9553a639094f9a6b232218e92d690b HTTP/1.1" 200 None
2024-04-18 00:32:15,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/64bf1f9dfd9553a639094f9a6b232218e92d690b/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:32:15,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/64bf1f9dfd9553a639094f9a6b232218e92d690b/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-18 00:32:16,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/64bf1f9dfd9553a639094f9a6b232218e92d690b HTTP/1.1" 200 None
2024-04-18 00:32:16,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/64bf1f9dfd9553a639094f9a6b232218e92d690b?per_page=1 HTTP/1.1" 200 None
2024-04-18 00:32:16,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/64bf1f9dfd9553a639094f9a6b232218e92d690b HTTP/1.1" 200 None
2024-04-18 00:32:17,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/64bf1f9dfd9553a639094f9a6b232218e92d690b/status HTTP/1.1" 200 None
2024-04-18 00:32:17,397 [ scc.repo] DEBUG - PR 400 jburel 'Session ID and constructor'
2024-04-18 00:32:17,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/398 HTTP/1.1" 200 None
2024-04-18 00:32:18,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/bbf54d740f70baee1e5fd5d3fb396699af5095b3 HTTP/1.1" 200 None
2024-04-18 00:32:18,837 [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-04-18 00:32:19,295 [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-04-18 00:32:19,790 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/bbf54d740f70baee1e5fd5d3fb396699af5095b3 HTTP/1.1" 200 None
2024-04-18 00:32:20,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/bbf54d740f70baee1e5fd5d3fb396699af5095b3?per_page=1 HTTP/1.1" 200 None
2024-04-18 00:32:20,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/bbf54d740f70baee1e5fd5d3fb396699af5095b3 HTTP/1.1" 200 None
2024-04-18 00:32:21,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/bbf54d740f70baee1e5fd5d3fb396699af5095b3/status HTTP/1.1" 200 None
2024-04-18 00:32:21,139 [ scc.repo] DEBUG - PR 398 will-moore 'getGridSize() handles plates with no Wells'
2024-04-18 00:32:21,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396 HTTP/1.1" 200 None
2024-04-18 00:32:22,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/396/comments HTTP/1.1" 200 None
2024-04-18 00:32:22,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573 HTTP/1.1" 200 None
2024-04-18 00:32:23,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:32:23,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c2cf271ef27269131408acb10c7cc1ecaefb0573/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-18 00:32:23,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/394 HTTP/1.1" 200 None
2024-04-18 00:32:24,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/394/comments HTTP/1.1" 200 None
2024-04-18 00:32:24,939 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/391 HTTP/1.1" 200 None
2024-04-18 00:32:25,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-04-18 00:32:25,891 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:32:26,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-18 00:32:26,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-04-18 00:32:27,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/20da2ca68fa40df47b5436887597e9804098f023?per_page=1 HTTP/1.1" 200 None
2024-04-18 00:32:27,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023 HTTP/1.1" 200 None
2024-04-18 00:32:28,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/20da2ca68fa40df47b5436887597e9804098f023/status HTTP/1.1" 200 None
2024-04-18 00:32:28,205 [ scc.repo] DEBUG - PR 391 joshmoore 'Add jstack command'
2024-04-18 00:32:28,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/387 HTTP/1.1" 200 None
2024-04-18 00:32:28,660 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-04-18 00:32:29,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378 HTTP/1.1" 200 None
2024-04-18 00:32:29,603 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/378/comments HTTP/1.1" 200 None
2024-04-18 00:32:30,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337 HTTP/1.1" 200 None
2024-04-18 00:32:30,522 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/337/comments HTTP/1.1" 200 None
2024-04-18 00:32:31,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-04-18 00:32:31,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:32:31,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/0df9ec8000befec36dd85b7ff078ce66603e36a5 HTTP/1.1" 200 None
2024-04-18 00:32:32,405 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/0df9ec8000befec36dd85b7ff078ce66603e36a5?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:32:32,406 [ scc.repo] DEBUG - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-04-18 00:32:32,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332 HTTP/1.1" 200 None
2024-04-18 00:32:33,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/332/comments HTTP/1.1" 200 None
2024-04-18 00:32:33,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-04-18 00:32:34,317 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:32:34,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-18 00:32:35,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-04-18 00:32:35,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/c427fcd99373ad6c0c2d28d322827d0523ba7afc?per_page=1 HTTP/1.1" 200 None
2024-04-18 00:32:36,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc HTTP/1.1" 200 None
2024-04-18 00:32:36,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/c427fcd99373ad6c0c2d28d322827d0523ba7afc/status HTTP/1.1" 200 None
2024-04-18 00:32:36,645 [ scc.repo] DEBUG - PR 332 jburel 'Build conda'
2024-04-18 00:32:37,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325 HTTP/1.1" 200 None
2024-04-18 00:32:37,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/325/comments HTTP/1.1" 200 None
2024-04-18 00:32:38,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299 HTTP/1.1" 200 None
2024-04-18 00:32:38,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/299/comments HTTP/1.1" 200 None
2024-04-18 00:32:38,967 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-04-18 00:32:39,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:32:39,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/09ae8033d77faf0346255eb9644207e02c98709a HTTP/1.1" 200 None
2024-04-18 00:32:40,338 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/09ae8033d77faf0346255eb9644207e02c98709a?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:32:40,339 [ scc.repo] DEBUG - PR 299 joshmoore 'Add parents and children to omero obj'
2024-04-18 00:32:40,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/266 HTTP/1.1" 200 None
2024-04-18 00:32:41,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-04-18 00:32:41,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:32:42,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/df250605e81b3b5f509b4cddc3186a63d7ba364f HTTP/1.1" 200 None
2024-04-18 00:32:42,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/df250605e81b3b5f509b4cddc3186a63d7ba364f?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:32:42,621 [ scc.repo] DEBUG - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-04-18 00:32:43,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207 HTTP/1.1" 200 None
2024-04-18 00:32:43,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/207/comments HTTP/1.1" 200 None
2024-04-18 00:32:44,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-04-18 00:32:44,526 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:32:44,968 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d68e639b52d3b583d12c65164f3edcd0b813a4bb HTTP/1.1" 200 None
2024-04-18 00:32:45,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d68e639b52d3b583d12c65164f3edcd0b813a4bb?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:32:45,388 [ scc.repo] DEBUG - PR 207 manics 'BlitzGateway.connect raise on error'
2024-04-18 00:32:45,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199 HTTP/1.1" 200 None
2024-04-18 00:32:46,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/199/comments HTTP/1.1" 200 None
2024-04-18 00:32:46,837 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-04-18 00:32:47,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:32:47,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/commits/d9df94bbff36ef1f943c9ab1995cd60831e572ec HTTP/1.1" 200 None
2024-04-18 00:32:48,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/statuses/d9df94bbff36ef1f943c9ab1995cd60831e572ec?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:32:48,162 [ scc.repo] DEBUG - PR 199 joshmoore 'user: allow setting default group'
2024-04-18 00:32:48,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194 HTTP/1.1" 200 None
2024-04-18 00:32:49,089 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/194/comments HTTP/1.1" 200 None
2024-04-18 00:32:49,557 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129 HTTP/1.1" 200 None
2024-04-18 00:32:50,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-py/issues/129/comments HTTP/1.1" 200 None
2024-04-18 00:32:50,032 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:32:50,032 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-04-18 00:32:50,032 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:32:50,033 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:32:50,038 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:32:50,043 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:32:50,043 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:32:50,048 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:32:50,053 [ scc.git] DEBUG Already up to date.
2024-04-18 00:32:50,054 [ scc.git] DEBUG Calling 'git fetch origin pull/199/head'
2024-04-18 00:32:50,470 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-18 00:32:50,470 [ scc.git] DEBUG * branch refs/pull/199/head -> FETCH_HEAD
2024-04-18 00:32:50,475 [ scc.git] DEBUG Calling 'git fetch origin pull/207/head'
2024-04-18 00:32:50,883 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-18 00:32:50,883 [ scc.git] DEBUG * branch refs/pull/207/head -> FETCH_HEAD
2024-04-18 00:32:50,890 [ scc.git] DEBUG Calling 'git fetch origin pull/266/head'
2024-04-18 00:32:51,316 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-18 00:32:51,317 [ scc.git] DEBUG * branch refs/pull/266/head -> FETCH_HEAD
2024-04-18 00:32:51,322 [ scc.git] DEBUG Calling 'git fetch origin pull/299/head'
2024-04-18 00:32:51,690 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-18 00:32:51,690 [ scc.git] DEBUG * branch refs/pull/299/head -> FETCH_HEAD
2024-04-18 00:32:51,695 [ scc.git] DEBUG Calling 'git fetch origin pull/332/head'
2024-04-18 00:32:52,137 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-18 00:32:52,137 [ scc.git] DEBUG * branch refs/pull/332/head -> FETCH_HEAD
2024-04-18 00:32:52,144 [ scc.git] DEBUG Calling 'git fetch origin pull/337/head'
2024-04-18 00:32:52,528 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-18 00:32:52,528 [ scc.git] DEBUG * branch refs/pull/337/head -> FETCH_HEAD
2024-04-18 00:32:52,535 [ scc.git] DEBUG Calling 'git fetch origin pull/391/head'
2024-04-18 00:32:52,913 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-18 00:32:52,913 [ scc.git] DEBUG * branch refs/pull/391/head -> FETCH_HEAD
2024-04-18 00:32:52,918 [ scc.git] DEBUG Calling 'git fetch origin pull/398/head'
2024-04-18 00:32:53,385 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-18 00:32:53,385 [ scc.git] DEBUG * branch refs/pull/398/head -> FETCH_HEAD
2024-04-18 00:32:53,396 [ scc.git] DEBUG Calling 'git fetch origin pull/400/head'
2024-04-18 00:32:53,768 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-18 00:32:53,768 [ scc.git] DEBUG * branch refs/pull/400/head -> FETCH_HEAD
2024-04-18 00:32:53,773 [ scc.git] DEBUG Calling 'git fetch origin pull/403/head'
2024-04-18 00:32:54,226 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-18 00:32:54,226 [ scc.git] DEBUG * branch refs/pull/403/head -> FETCH_HEAD
2024-04-18 00:32:54,233 [ scc.git] DEBUG Calling 'git fetch origin pull/405/head'
2024-04-18 00:32:54,772 [ scc.git] DEBUG From https://github.com/ome/omero-py
2024-04-18 00:32:54,772 [ scc.git] DEBUG * branch refs/pull/405/head -> FETCH_HEAD
2024-04-18 00:32:54,777 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:32:54,777 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:32:54,777 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:32:54,782 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-04-18 00:32:54,792 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:32:54,797 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 199 (user: allow setting default group) d9df94bbff36ef1f943c9ab1995cd60831e572ec'
2024-04-18 00:32:54,864 [ scc.git] DEBUG Auto-merging src/omero/cli.py
2024-04-18 00:32:54,864 [ scc.git] DEBUG Auto-merging src/omero/plugins/user.py
2024-04-18 00:32:54,865 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:32:54,869 [ scc.git] DEBUG src/omero/cli.py | 6 ++++++
2024-04-18 00:32:54,869 [ scc.git] DEBUG src/omero/plugins/user.py | 36 +++++++++++++++++++++++++++++++++---
2024-04-18 00:32:54,869 [ scc.git] DEBUG 2 files changed, 39 insertions(+), 3 deletions(-)
2024-04-18 00:32:55,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:32:55,040 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-04-18 00:32:55,051 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:32:55,055 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 207 (BlitzGateway.connect raise on error) d68e639b52d3b583d12c65164f3edcd0b813a4bb'
2024-04-18 00:32:55,178 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-04-18 00:32:55,179 [ scc.git] DEBUG Auto-merging test/unit/test_gateway.py
2024-04-18 00:32:55,179 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:32:55,187 [ scc.git] DEBUG src/omero/gateway/__init__.py | 19 +++++++++++++------
2024-04-18 00:32:55,187 [ scc.git] DEBUG test/unit/test_gateway.py | 16 ++++++++++++++++
2024-04-18 00:32:55,187 [ scc.git] DEBUG 2 files changed, 29 insertions(+), 6 deletions(-)
2024-04-18 00:32:55,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:32:55,457 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-04-18 00:32:55,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:32:55,476 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 266 (errors: use raise_error from cli plugins) df250605e81b3b5f509b4cddc3186a63d7ba364f'
2024-04-18 00:32:55,525 [ scc.git] DEBUG Auto-merging src/omero/plugins/search.py
2024-04-18 00:32:55,526 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:32:55,530 [ scc.git] DEBUG src/omero/plugins/search.py | 13 +++++++++----
2024-04-18 00:32:55,530 [ scc.git] DEBUG 1 file changed, 9 insertions(+), 4 deletions(-)
2024-04-18 00:32:55,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:32:55,864 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...09ae8033d77faf0346255eb9644207e02c98709a'
2024-04-18 00:32:55,875 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:32:55,879 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 299 (Add parents and children to omero obj) 09ae8033d77faf0346255eb9644207e02c98709a'
2024-04-18 00:32:55,935 [ scc.git] DEBUG Auto-merging src/omero/plugins/obj.py
2024-04-18 00:32:55,935 [ scc.git] DEBUG Auto-merging test/unit/clitest/test_obj.py
2024-04-18 00:32:55,936 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:32:55,940 [ scc.git] DEBUG src/omero/plugins/obj.py | 69 ++++++++++++++++++++++++++++++++++++++++++-
2024-04-18 00:32:55,940 [ scc.git] DEBUG test/unit/clitest/test_obj.py | 2 +-
2024-04-18 00:32:55,940 [ scc.git] DEBUG 2 files changed, 69 insertions(+), 2 deletions(-)
2024-04-18 00:32:56,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:32:56,287 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-04-18 00:32:56,298 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:32:56,302 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 332 (Build conda) c427fcd99373ad6c0c2d28d322827d0523ba7afc'
2024-04-18 00:32:56,342 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:32:56,345 [ scc.git] DEBUG .github/workflows/install.yml | 37 +++++++++++++++++++++++++++++++++++++
2024-04-18 00:32:56,345 [ scc.git] DEBUG connect.py | 11 +++++++++++
2024-04-18 00:32:56,345 [ scc.git] DEBUG 2 files changed, 48 insertions(+)
2024-04-18 00:32:56,346 [ scc.git] DEBUG create mode 100644 .github/workflows/install.yml
2024-04-18 00:32:56,346 [ scc.git] DEBUG create mode 100644 connect.py
2024-04-18 00:32:56,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:32:56,687 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-04-18 00:32:56,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:32:56,703 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 337 (bulk.yml depth is passed to xargs) 0df9ec8000befec36dd85b7ff078ce66603e36a5'
2024-04-18 00:32:56,757 [ scc.git] DEBUG Auto-merging src/omero/plugins/import.py
2024-04-18 00:32:56,758 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:32:56,761 [ scc.git] DEBUG src/omero/plugins/import.py | 2 ++
2024-04-18 00:32:56,762 [ scc.git] DEBUG 1 file changed, 2 insertions(+)
2024-04-18 00:32:57,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:32:57,095 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...20da2ca68fa40df47b5436887597e9804098f023'
2024-04-18 00:32:57,106 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:32:57,110 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 391 (Add jstack command) 20da2ca68fa40df47b5436887597e9804098f023'
2024-04-18 00:32:57,158 [ scc.git] DEBUG Auto-merging src/omero/plugins/admin.py
2024-04-18 00:32:57,159 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:32:57,163 [ scc.git] DEBUG src/omero/plugins/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++++++--
2024-04-18 00:32:57,163 [ scc.git] DEBUG 1 file changed, 59 insertions(+), 2 deletions(-)
2024-04-18 00:32:57,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:32:57,499 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bbf54d740f70baee1e5fd5d3fb396699af5095b3'
2024-04-18 00:32:57,510 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:32:57,515 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 398 (getGridSize() handles plates with no Wells) bbf54d740f70baee1e5fd5d3fb396699af5095b3'
2024-04-18 00:32:57,605 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-04-18 00:32:57,606 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:32:57,613 [ scc.git] DEBUG src/omero/gateway/__init__.py | 6 +++++-
2024-04-18 00:32:57,613 [ scc.git] DEBUG 1 file changed, 5 insertions(+), 1 deletion(-)
2024-04-18 00:32:57,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:32:57,913 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...64bf1f9dfd9553a639094f9a6b232218e92d690b'
2024-04-18 00:32:57,925 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:32:57,929 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 400 (Session ID and constructor) 64bf1f9dfd9553a639094f9a6b232218e92d690b'
2024-04-18 00:32:57,994 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-04-18 00:32:57,995 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:32:58,003 [ scc.git] DEBUG src/omero/gateway/__init__.py | 50 +++++++++++++++++++++++++++++++---
2024-04-18 00:32:58,003 [ scc.git] DEBUG src/omero/gateway/scripts/dbhelpers.py | 3 +-
2024-04-18 00:32:58,003 [ scc.git] DEBUG 2 files changed, 48 insertions(+), 5 deletions(-)
2024-04-18 00:32:58,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:32:58,334 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...61489cddb9009af5f6f914e39ef9b02b4019f13d'
2024-04-18 00:32:58,345 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:32:58,350 [ 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-04-18 00:32:58,369 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:32:58,372 [ scc.git] DEBUG .github/workflows/workflow.yml | 3 +--
2024-04-18 00:32:58,372 [ scc.git] DEBUG tox.ini | 5 +++++
2024-04-18 00:32:58,372 [ scc.git] DEBUG 2 files changed, 6 insertions(+), 2 deletions(-)
2024-04-18 00:32:58,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:32:58,749 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5ad53ebee1b529384752bd13b853b45d14484e4c'
2024-04-18 00:32:58,760 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:32:58,765 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 405 (FilesetWrapper lazy loads Images and UsedFiles) 5ad53ebee1b529384752bd13b853b45d14484e4c'
2024-04-18 00:32:58,812 [ scc.git] DEBUG Auto-merging src/omero/gateway/__init__.py
2024-04-18 00:32:58,813 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:32:58,820 [ scc.git] DEBUG src/omero/gateway/__init__.py | 41 +++++++++++++++++++++++++----------------
2024-04-18 00:32:58,820 [ scc.git] DEBUG 1 file changed, 25 insertions(+), 16 deletions(-)
2024-04-18 00:32:59,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:32:59,150 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:32:59,191 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:32:59,191 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:32:59,195 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:32:59,232 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:32:59,241 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f27b048d760> has no local changes
2024-04-18 00:32:59,241 [ 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'
- PR 405 will-moore 'FilesetWrapper lazy loads Images and UsedFiles'
Generated by OMERO-python-superbuild-push#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/36/)'
2024-04-18 00:32:59,249 [ scc.git] DEBUG [detached HEAD 526a7718] merge master -Dorg -Ssuccess-only
2024-04-18 00:32:59,249 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-18 00:32:59,250 [ scc.git] INFO Overriding base-branch from master to develop
2024-04-18 00:32:59,250 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:32:59,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/pulls HTTP/1.1" 200 None
2024-04-18 00:33:00,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216 HTTP/1.1" 200 None
2024-04-18 00:33:00,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/216/comments HTTP/1.1" 200 None
2024-04-18 00:33:01,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206 HTTP/1.1" 200 None
2024-04-18 00:33:01,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/206/comments HTTP/1.1" 200 None
2024-04-18 00:33:02,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202 HTTP/1.1" 200 None
2024-04-18 00:33:02,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/202/comments HTTP/1.1" 200 None
2024-04-18 00:33:03,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-18 00:33:03,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:33:04,291 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/commits/1fd6030669613cdb8879cfe6395db8c820fdcf19 HTTP/1.1" 200 None
2024-04-18 00:33:04,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/statuses/1fd6030669613cdb8879cfe6395db8c820fdcf19?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:33:04,719 [ scc.repo] DEBUG - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-18 00:33:05,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198 HTTP/1.1" 200 None
2024-04-18 00:33:05,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/198/comments HTTP/1.1" 200 None
2024-04-18 00:33:06,170 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103 HTTP/1.1" 200 None
2024-04-18 00:33:06,648 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-scripts/issues/103/comments HTTP/1.1" 200 None
2024-04-18 00:33:06,650 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:33:06,650 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-04-18 00:33:06,650 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:33:06,650 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:33:06,655 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/develop'
2024-04-18 00:33:06,659 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:33:06,659 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/develop'
2024-04-18 00:33:06,664 [ scc.git] DEBUG Calling 'git merge --ff-only origin/develop'
2024-04-18 00:33:06,669 [ scc.git] DEBUG Already up to date.
2024-04-18 00:33:06,670 [ scc.git] DEBUG Calling 'git fetch origin pull/202/head'
2024-04-18 00:33:07,074 [ scc.git] DEBUG From https://github.com/ome/omero-scripts
2024-04-18 00:33:07,074 [ scc.git] DEBUG * branch refs/pull/202/head -> FETCH_HEAD
2024-04-18 00:33:07,078 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:33:07,078 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:33:07,079 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:33:07,083 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-18 00:33:07,088 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:33:07,092 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 202 (Add Plate support to KeyVal_to_csv.py) 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-18 00:33:07,114 [ scc.git] DEBUG Auto-merging omero/annotation_scripts/KeyVal_to_csv.py
2024-04-18 00:33:07,114 [ scc.git] DEBUG CONFLICT (content): Merge conflict in omero/annotation_scripts/KeyVal_to_csv.py
2024-04-18 00:33:07,114 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-18 00:33:07,115 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-18 00:33:07,119 [ scc.git] DEBUG Calling 'git reset --hard 2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-04-18 00:33:07,125 [ scc.git] DEBUG HEAD is now at 2078ac7 Bump version: 5.8.0 → 5.8.1.dev0
2024-04-18 00:33:07,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:33:07,294 [ scc.git] DEBUG Calling 'git merge-base 2078ac72dbf11f2733e685000a274eff81c2ac2d 1fd6030669613cdb8879cfe6395db8c820fdcf19'
2024-04-18 00:33:07,300 [ scc.git] DEBUG Calling 'git diff --name-only a90f59802f6752ad74badec5c0c1d6b0c9c43b15..2078ac72dbf11f2733e685000a274eff81c2ac2d'
2024-04-18 00:33:07,305 [ scc.git] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#36](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/36/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/36/consoleText) for more details.
Possible conflicts:
- Upstream changes
- omero/annotation_scripts/KeyVal_to_csv.py
--conflicts
2024-04-18 00:33:07,309 [ scc.config] DEBUG Found github.token
2024-04-18 00:33:07,309 [ scc.git] DEBUG Not adding comment to issue #202, already --conflicts.
2024-04-18 00:33:07,309 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:33:07,345 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:33:07,346 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:33:07,350 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:33:07,388 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:33:07,393 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f27b049d640> has no local changes
2024-04-18 00:33:07,393 [ 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#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/36/)'
2024-04-18 00:33:07,401 [ scc.git] DEBUG [detached HEAD 7aa53fa] merge master -Dorg -Ssuccess-only
2024-04-18 00:33:07,401 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-18 00:33:07,401 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:33:07,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/pulls HTTP/1.1" 200 None
2024-04-18 00:33:08,406 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549 HTTP/1.1" 200 None
2024-04-18 00:33:08,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/549/comments HTTP/1.1" 200 None
2024-04-18 00:33:09,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ade7fa1b5839e9b17878c38efd4f6404a5857712 HTTP/1.1" 200 None
2024-04-18 00:33:09,812 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ade7fa1b5839e9b17878c38efd4f6404a5857712/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:33:10,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ade7fa1b5839e9b17878c38efd4f6404a5857712/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-18 00:33:10,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/548 HTTP/1.1" 200 None
2024-04-18 00:33:11,193 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543 HTTP/1.1" 200 None
2024-04-18 00:33:11,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/543/comments HTTP/1.1" 200 None
2024-04-18 00:33:12,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3e68b74a9d60bb05a3aa17281f66c6ec41661d34 HTTP/1.1" 200 None
2024-04-18 00:33:12,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3e68b74a9d60bb05a3aa17281f66c6ec41661d34/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:33:13,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3e68b74a9d60bb05a3aa17281f66c6ec41661d34/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-18 00:33:13,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3e68b74a9d60bb05a3aa17281f66c6ec41661d34 HTTP/1.1" 200 None
2024-04-18 00:33:14,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/3e68b74a9d60bb05a3aa17281f66c6ec41661d34?per_page=1 HTTP/1.1" 200 None
2024-04-18 00:33:14,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3e68b74a9d60bb05a3aa17281f66c6ec41661d34 HTTP/1.1" 200 None
2024-04-18 00:33:14,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/3e68b74a9d60bb05a3aa17281f66c6ec41661d34/status HTTP/1.1" 200 None
2024-04-18 00:33:14,962 [ scc.repo] DEBUG - PR 543 knabar 'Block UI for some long running tasks'
2024-04-18 00:33:15,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542 HTTP/1.1" 200 None
2024-04-18 00:33:15,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/542/comments HTTP/1.1" 200 None
2024-04-18 00:33:15,935 [ scc.repo] DEBUG # ... Include label: include
2024-04-18 00:33:16,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-04-18 00:33:16,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:33:17,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-18 00:33:17,780 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-04-18 00:33:18,199 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/977f7b65169e6dee479197a9156993bbadd2d2e2?per_page=1 HTTP/1.1" 200 None
2024-04-18 00:33:18,686 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2 HTTP/1.1" 200 None
2024-04-18 00:33:19,123 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/977f7b65169e6dee479197a9156993bbadd2d2e2/status HTTP/1.1" 200 None
2024-04-18 00:33:19,124 [ scc.repo] DEBUG - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-04-18 00:33:19,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/540 HTTP/1.1" 200 None
2024-04-18 00:33:20,065 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ee785db51c334b1be62c14ab36414993a2319a30 HTTP/1.1" 200 None
2024-04-18 00:33:20,539 [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-04-18 00:33:21,000 [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-04-18 00:33:21,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ee785db51c334b1be62c14ab36414993a2319a30 HTTP/1.1" 200 None
2024-04-18 00:33:21,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/ee785db51c334b1be62c14ab36414993a2319a30?per_page=1 HTTP/1.1" 200 None
2024-04-18 00:33:22,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ee785db51c334b1be62c14ab36414993a2319a30 HTTP/1.1" 200 None
2024-04-18 00:33:22,831 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/ee785db51c334b1be62c14ab36414993a2319a30/status HTTP/1.1" 200 None
2024-04-18 00:33:22,833 [ scc.repo] DEBUG - PR 540 will-moore 'Add 'django.template.context_processors.request' to TEMPLATES'
2024-04-18 00:33:23,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/536 HTTP/1.1" 200 None
2024-04-18 00:33:23,806 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/536/comments HTTP/1.1" 200 None
2024-04-18 00:33:24,300 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2 HTTP/1.1" 200 None
2024-04-18 00:33:24,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:33:25,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-18 00:33:25,750 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2 HTTP/1.1" 200 None
2024-04-18 00:33:26,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/412fa66a52477fb77319a35147313a6f3cf481a2?per_page=1 HTTP/1.1" 200 None
2024-04-18 00:33:26,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2 HTTP/1.1" 200 None
2024-04-18 00:33:27,087 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/412fa66a52477fb77319a35147313a6f3cf481a2/status HTTP/1.1" 200 None
2024-04-18 00:33:27,088 [ scc.repo] DEBUG - PR 536 will-moore 'imgData JSON with no stateful services'
2024-04-18 00:33:27,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/535 HTTP/1.1" 200 None
2024-04-18 00:33:28,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534 HTTP/1.1" 200 None
2024-04-18 00:33:28,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/534/comments HTTP/1.1" 200 None
2024-04-18 00:33:29,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-04-18 00:33:29,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:33:29,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-18 00:33:30,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-04-18 00:33:30,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005?per_page=1 HTTP/1.1" 200 None
2024-04-18 00:33:31,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005 HTTP/1.1" 200 None
2024-04-18 00:33:31,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/d328a0cbb5b49cd63929a8a6c6cf7a89a925d005/status HTTP/1.1" 200 None
2024-04-18 00:33:31,771 [ scc.repo] DEBUG - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-04-18 00:33:32,232 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/533 HTTP/1.1" 200 None
2024-04-18 00:33:32,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-04-18 00:33:33,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:33:33,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-18 00:33:34,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-04-18 00:33:34,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/e335980be1e7197826687f6c322a60c61b4aa545?per_page=1 HTTP/1.1" 200 None
2024-04-18 00:33:34,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545 HTTP/1.1" 200 None
2024-04-18 00:33:35,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/e335980be1e7197826687f6c322a60c61b4aa545/status HTTP/1.1" 200 None
2024-04-18 00:33:35,372 [ scc.repo] DEBUG - PR 533 jburel 'use conda-forge channel'
2024-04-18 00:33:35,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527 HTTP/1.1" 200 None
2024-04-18 00:33:36,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/527/comments HTTP/1.1" 200 None
2024-04-18 00:33:36,782 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-04-18 00:33:37,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:33:37,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-18 00:33:38,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-04-18 00:33:38,680 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/5565fa5d8fdefd1a406a9951f80779817ea35767?per_page=1 HTTP/1.1" 200 None
2024-04-18 00:33:39,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767 HTTP/1.1" 200 None
2024-04-18 00:33:39,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/5565fa5d8fdefd1a406a9951f80779817ea35767/status HTTP/1.1" 200 None
2024-04-18 00:33:39,544 [ scc.repo] DEBUG - PR 527 will-moore 'Add some initial CSP settings to test'
2024-04-18 00:33:39,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/399 HTTP/1.1" 200 None
2024-04-18 00:33:40,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/225 HTTP/1.1" 200 None
2024-04-18 00:33:41,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/225/comments HTTP/1.1" 200 None
2024-04-18 00:33:41,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repositories/200678050/issues/225/comments?page=2 HTTP/1.1" 200 None
2024-04-18 00:33:41,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168 HTTP/1.1" 200 None
2024-04-18 00:33:42,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/168/comments HTTP/1.1" 200 None
2024-04-18 00:33:42,985 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615 HTTP/1.1" 200 None
2024-04-18 00:33:43,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-18 00:33:44,009 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/commits/219d9e721304a4c46b4d73ef9ff3777549d69615 HTTP/1.1" 200 None
2024-04-18 00:33:44,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/statuses/219d9e721304a4c46b4d73ef9ff3777549d69615?per_page=1 HTTP/1.1" 200 2
2024-04-18 00:33:44,434 [ scc.repo] DEBUG - PR 168 stick 'Changes to nginx @maintenance handler'
2024-04-18 00:33:44,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/17 HTTP/1.1" 200 None
2024-04-18 00:33:45,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-web/issues/17/comments HTTP/1.1" 200 None
2024-04-18 00:33:45,385 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:33:45,385 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-04-18 00:33:45,385 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:33:45,385 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:33:45,390 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:33:45,393 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:33:45,394 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:33:45,398 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:33:45,402 [ scc.git] DEBUG Already up to date.
2024-04-18 00:33:45,402 [ scc.git] DEBUG Calling 'git fetch origin pull/168/head'
2024-04-18 00:33:45,945 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-18 00:33:45,945 [ scc.git] DEBUG * branch refs/pull/168/head -> FETCH_HEAD
2024-04-18 00:33:45,949 [ scc.git] DEBUG Calling 'git fetch origin pull/527/head'
2024-04-18 00:33:46,360 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-18 00:33:46,360 [ scc.git] DEBUG * branch refs/pull/527/head -> FETCH_HEAD
2024-04-18 00:33:46,364 [ scc.git] DEBUG Calling 'git fetch origin pull/533/head'
2024-04-18 00:33:46,741 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-18 00:33:46,741 [ scc.git] DEBUG * branch refs/pull/533/head -> FETCH_HEAD
2024-04-18 00:33:46,746 [ scc.git] DEBUG Calling 'git fetch origin pull/534/head'
2024-04-18 00:33:47,171 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-18 00:33:47,171 [ scc.git] DEBUG * branch refs/pull/534/head -> FETCH_HEAD
2024-04-18 00:33:47,175 [ scc.git] DEBUG Calling 'git fetch origin pull/536/head'
2024-04-18 00:33:47,747 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-18 00:33:47,747 [ scc.git] DEBUG * branch refs/pull/536/head -> FETCH_HEAD
2024-04-18 00:33:47,752 [ scc.git] DEBUG Calling 'git fetch origin pull/540/head'
2024-04-18 00:33:48,130 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-18 00:33:48,131 [ scc.git] DEBUG * branch refs/pull/540/head -> FETCH_HEAD
2024-04-18 00:33:48,135 [ scc.git] DEBUG Calling 'git fetch origin pull/542/head'
2024-04-18 00:33:48,694 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-18 00:33:48,694 [ scc.git] DEBUG * branch refs/pull/542/head -> FETCH_HEAD
2024-04-18 00:33:48,699 [ scc.git] DEBUG Calling 'git fetch origin pull/543/head'
2024-04-18 00:33:49,311 [ scc.git] DEBUG From https://github.com/ome/omero-web
2024-04-18 00:33:49,312 [ scc.git] DEBUG * branch refs/pull/543/head -> FETCH_HEAD
2024-04-18 00:33:49,317 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:33:49,317 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:33:49,317 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:33:49,321 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-04-18 00:33:49,336 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:33:49,339 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 168 (Changes to nginx @maintenance handler) 219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-04-18 00:33:49,373 [ scc.git] DEBUG Auto-merging test/unit/test_web.py
2024-04-18 00:33:49,373 [ scc.git] DEBUG CONFLICT (content): Merge conflict in test/unit/test_web.py
2024-04-18 00:33:49,373 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-18 00:33:49,374 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-18 00:33:49,382 [ scc.git] DEBUG Calling 'git reset --hard 02bd670ca7628ecb293108f394ef062a66a7beb4'
2024-04-18 00:33:49,392 [ scc.git] DEBUG HEAD is now at 02bd670ca Merge pull request #551 from ome/pre-commit-ci-update-config
2024-04-18 00:33:49,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:33:49,554 [ scc.git] DEBUG Calling 'git merge-base 02bd670ca7628ecb293108f394ef062a66a7beb4 219d9e721304a4c46b4d73ef9ff3777549d69615'
2024-04-18 00:33:49,569 [ scc.git] DEBUG Calling 'git diff --name-only 632d14a9cab5319c6b1bd9190d441a95e457103b..02bd670ca7628ecb293108f394ef062a66a7beb4'
2024-04-18 00:33:49,638 [ scc.git] INFO - PR 168 stick 'Changes to nginx @maintenance handler'
Conflicting PR. Removed from build [OMERO-python-superbuild-push#36](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/36/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/36/consoleText) for more details.
Possible conflicts:
- Upstream changes
- test/unit/test_web.py
--conflicts
2024-04-18 00:33:49,643 [ scc.config] DEBUG Found github.token
2024-04-18 00:33:49,643 [ scc.git] DEBUG Not adding comment to issue #168, already --conflicts.
2024-04-18 00:33:49,643 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-04-18 00:33:49,649 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:33:49,654 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 527 (Add some initial CSP settings to test) 5565fa5d8fdefd1a406a9951f80779817ea35767'
2024-04-18 00:33:49,694 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-04-18 00:33:49,695 [ scc.git] DEBUG Auto-merging setup.py
2024-04-18 00:33:49,696 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:33:49,699 [ scc.git] DEBUG omeroweb/settings.py | 42 +++++++++++++++++++++++++++++++++++++++++-
2024-04-18 00:33:49,699 [ scc.git] DEBUG setup.py | 1 +
2024-04-18 00:33:49,699 [ scc.git] DEBUG 2 files changed, 42 insertions(+), 1 deletion(-)
2024-04-18 00:33:49,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:33:49,948 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e335980be1e7197826687f6c322a60c61b4aa545'
2024-04-18 00:33:49,954 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:33:49,958 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 533 (use conda-forge channel) e335980be1e7197826687f6c322a60c61b4aa545'
2024-04-18 00:33:49,973 [ scc.git] DEBUG Auto-merging README.rst
2024-04-18 00:33:49,975 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:33:49,977 [ scc.git] DEBUG README.rst | 3 +--
2024-04-18 00:33:49,977 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 2 deletions(-)
2024-04-18 00:33:50,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:33:50,359 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-04-18 00:33:50,365 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:33:50,369 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 534 (get strings from omero.cmd.ERR and omero.CmdError correctly) d328a0cbb5b49cd63929a8a6c6cf7a89a925d005'
2024-04-18 00:33:50,406 [ scc.git] DEBUG Auto-merging omeroweb/webclient/webclient_gateway.py
2024-04-18 00:33:50,406 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-04-18 00:33:50,407 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:33:50,411 [ scc.git] DEBUG omeroweb/webclient/webclient_gateway.py | 2 +-
2024-04-18 00:33:50,411 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 4 ++--
2024-04-18 00:33:50,411 [ scc.git] DEBUG 2 files changed, 3 insertions(+), 3 deletions(-)
2024-04-18 00:33:50,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:33:50,771 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...412fa66a52477fb77319a35147313a6f3cf481a2'
2024-04-18 00:33:50,778 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:33:50,783 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 536 (imgData JSON with no stateful services) 412fa66a52477fb77319a35147313a6f3cf481a2'
2024-04-18 00:33:50,858 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py
2024-04-18 00:33:50,858 [ scc.git] DEBUG Auto-merging omeroweb/webgateway/marshal.py
2024-04-18 00:33:50,859 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:33:50,864 [ scc.git] DEBUG omeroweb/webclient/views.py | 4 +-
2024-04-18 00:33:50,864 [ scc.git] DEBUG omeroweb/webgateway/marshal.py | 135 ++++++++++++++++++++++++++++++++++++++---
2024-04-18 00:33:50,864 [ scc.git] DEBUG omeroweb/webgateway/util.py | 38 ++++++++++++
2024-04-18 00:33:50,864 [ scc.git] DEBUG 3 files changed, 166 insertions(+), 11 deletions(-)
2024-04-18 00:33:51,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:33:51,189 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...ee785db51c334b1be62c14ab36414993a2319a30'
2024-04-18 00:33:51,196 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:33:51,200 [ 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-04-18 00:33:51,232 [ scc.git] DEBUG Auto-merging omeroweb/settings.py
2024-04-18 00:33:51,234 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:33:51,238 [ scc.git] DEBUG omeroweb/settings.py | 1 +
2024-04-18 00:33:51,238 [ scc.git] DEBUG 1 file changed, 1 insertion(+)
2024-04-18 00:33:51,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:33:51,620 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...977f7b65169e6dee479197a9156993bbadd2d2e2'
2024-04-18 00:33:51,628 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:33:51,632 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 542 (PlateAcquisition filtering with plate display) 977f7b65169e6dee479197a9156993bbadd2d2e2'
2024-04-18 00:33:51,669 [ scc.git] DEBUG Auto-merging omeroweb/webclient/views.py
2024-04-18 00:33:51,670 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:33:51,678 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 13 +++-------
2024-04-18 00:33:51,678 [ scc.git] DEBUG .../webclient/templates/webclient/data/plate.html | 10 ++++----
2024-04-18 00:33:51,678 [ scc.git] DEBUG omeroweb/webclient/views.py | 17 ++++++++++++
2024-04-18 00:33:51,678 [ scc.git] DEBUG omeroweb/webgateway/plategrid.py | 30 +++++++++++++++++++---
2024-04-18 00:33:51,678 [ scc.git] DEBUG .../static/webgateway/js/ome.plateview.js | 16 +++++++-----
2024-04-18 00:33:51,678 [ scc.git] DEBUG omeroweb/webgateway/urls.py | 2 +-
2024-04-18 00:33:51,678 [ scc.git] DEBUG omeroweb/webgateway/views.py | 16 ++++++++++--
2024-04-18 00:33:51,679 [ scc.git] DEBUG 7 files changed, 78 insertions(+), 26 deletions(-)
2024-04-18 00:33:52,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:33:52,039 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e68b74a9d60bb05a3aa17281f66c6ec41661d34'
2024-04-18 00:33:52,047 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:33:52,052 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 543 (Block UI for some long running tasks) 3e68b74a9d60bb05a3aa17281f66c6ec41661d34'
2024-04-18 00:33:52,077 [ scc.git] DEBUG Auto-merging omeroweb/webclient/templates/webclient/data/includes/center_plugin.thumbs.js.html
2024-04-18 00:33:52,078 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:33:52,082 [ scc.git] DEBUG .../webclient/javascript/ome.progress_overlay.js | 60 +++++++++++
2024-04-18 00:33:52,083 [ scc.git] DEBUG .../webclient/javascript/ome.webclient.actions.js | 112 ++++++++++++---------
2024-04-18 00:33:52,083 [ scc.git] DEBUG .../webclient/annotations/metadata_preview.html | 51 +++++-----
2024-04-18 00:33:52,083 [ scc.git] DEBUG .../webclient/templates/webclient/base/base.html | 1 +
2024-04-18 00:33:52,083 [ scc.git] DEBUG .../templates/webclient/base/base_container.html | 2 +-
2024-04-18 00:33:52,083 [ scc.git] DEBUG .../data/includes/center_plugin.thumbs.js.html | 16 +--
2024-04-18 00:33:52,083 [ scc.git] DEBUG 6 files changed, 162 insertions(+), 80 deletions(-)
2024-04-18 00:33:52,083 [ scc.git] DEBUG create mode 100644 omeroweb/webclient/static/webclient/javascript/ome.progress_overlay.js
2024-04-18 00:33:52,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:33:52,461 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:33:52,501 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:33:52,501 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:33:52,506 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:33:52,544 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:33:52,555 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f27b04a0910> has no local changes
2024-04-18 00:33:52,555 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-web
Excluded PRs:
- PR 549 knabar 'Remove webgateway cache' (status: failure)
- PR 548 will-moore 'imgData JSON with no stateful services' (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 543 knabar 'Block UI for some long running tasks'
Conflicting PRs (not included):
- PR 168 stick 'Changes to nginx @maintenance handler'
Generated by OMERO-python-superbuild-push#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/36/)'
2024-04-18 00:33:52,568 [ scc.git] DEBUG [detached HEAD 467afe1ec] merge master -Dorg -Ssuccess-only
2024-04-18 00:33:52,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-18 00:33:52,569 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:33:52,619 [ scc.config] DEBUG Found submodule.omero-dropbox.url
2024-04-18 00:33:52,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:33:52,890 [ scc.config] DEBUG Found submodule.omero-marshal.url
2024-04-18 00:33:53,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:33:53,300 [ scc.config] DEBUG Found submodule.omero-py.url
2024-04-18 00:33:53,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:33:53,717 [ scc.config] DEBUG Found submodule.omero-scripts.url
2024-04-18 00:33:54,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:33:54,128 [ scc.config] DEBUG Found submodule.omero-web.url
2024-04-18 00:33:54,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:33:54,532 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:33:54,559 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f27b38fc460> has local changes
2024-04-18 00:33:54,559 [ 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 273 dependabot[bot] 'Bump omero-web from `0e4013c` to `02bd670`'
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'
- PR 405 will-moore 'FilesetWrapper lazy loads Images and UsedFiles'
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 549 knabar 'Remove webgateway cache' (status: failure)
- PR 548 will-moore 'imgData JSON with no stateful services' (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 543 knabar 'Block UI for some long running tasks'
Conflicting PRs (not included):
- PR 168 stick 'Changes to nginx @maintenance handler'
Generated by OMERO-python-superbuild-push#36 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-python-superbuild-push/36/)'
2024-04-18 00:33:54,569 [ scc.git] DEBUG [detached HEAD 765d848] merge master -Dorg -Ssuccess-only
2024-04-18 00:33:54,569 [ scc.merge] INFO Repository: ome/omero-python-superbuild
2024-04-18 00:33:54,570 [ scc.git] DEBUG 6 files changed, 10 insertions(+), 10 deletions(-)
2024-04-18 00:33:54,570 [ scc.merge] INFO Already up to date.
2024-04-18 00:33:54,570 [ scc.merge] INFO
2024-04-18 00:33:54,570 [ scc.merge] INFO Merged PRs:
2024-04-18 00:33:54,570 [ scc.merge] INFO - PR 273 dependabot[bot] 'Bump omero-web from `0e4013c` to `02bd670`'
2024-04-18 00:33:54,570 [ scc.merge] INFO
2024-04-18 00:33:54,570 [ scc.merge] INFO Repository: ome/omero-dropbox
2024-04-18 00:33:54,570 [ scc.merge] INFO Already up to date.
2024-04-18 00:33:54,570 [ scc.merge] INFO
2024-04-18 00:33:54,570 [ scc.merge] INFO Merged PRs:
2024-04-18 00:33:54,570 [ scc.merge] INFO - PR 16 joshmoore 'Review all instances of whitelist/blacklist'
2024-04-18 00:33:54,570 [ scc.merge] INFO - PR 23 sbesson 'Remove python-future compatibility code'
2024-04-18 00:33:54,570 [ scc.merge] INFO
2024-04-18 00:33:54,570 [ scc.merge] INFO Repository: ome/omero-marshal
2024-04-18 00:33:54,570 [ scc.merge] INFO Excluded PRs:
2024-04-18 00:33:54,570 [ scc.merge] INFO - PR 34 chris-allan 'Initial support for Event' (exclude comment)
2024-04-18 00:33:54,570 [ scc.merge] INFO - PR 33 chris-allan 'Encode/Decode Experimenters with ExperimenterGroup' (exclude comment)
2024-04-18 00:33:54,570 [ scc.merge] INFO Already up to date.
2024-04-18 00:33:54,570 [ scc.merge] INFO
2024-04-18 00:33:54,570 [ scc.merge] INFO Merged PRs:
2024-04-18 00:33:54,570 [ scc.merge] INFO - PR 69 will-moore 'Roi encoder allows Shape None'
2024-04-18 00:33:54,570 [ scc.merge] INFO
2024-04-18 00:33:54,570 [ scc.merge] INFO Repository: ome/omero-py
2024-04-18 00:33:54,570 [ scc.merge] INFO Excluded PRs:
2024-04-18 00:33:54,570 [ scc.merge] INFO - PR 396 joshmoore 'Config property for passing environment variables (see #395)' (status: failure)
2024-04-18 00:33:54,570 [ scc.merge] INFO - PR 394 jo-mueller 'added `_repr_html_` method for `_ImageWrapper`' (user: jo-mueller)
2024-04-18 00:33:54,570 [ scc.merge] INFO - PR 387 will-moore 'Numpy pixels type' (label: exclude)
2024-04-18 00:33:54,571 [ scc.merge] INFO - PR 378 ehrenfeu 'Fix UnicodeDecodeError' (user: ehrenfeu)
2024-04-18 00:33:54,571 [ scc.merge] INFO - PR 325 JulianHn 'Addding support for other encodings than utf-8 in DownloadingOriginalFileProvider' (user: JulianHn)
2024-04-18 00:33:54,571 [ scc.merge] INFO - PR 194 manics 'Support Python 3 asyncio concurrency' (stage: draft)
2024-04-18 00:33:54,571 [ scc.merge] INFO - PR 129 dominikl 'Add option to create new ThumbnailStore connection' (exclude comment)
2024-04-18 00:33:54,571 [ scc.merge] INFO Already up to date.
2024-04-18 00:33:54,571 [ scc.merge] INFO
2024-04-18 00:33:54,571 [ scc.merge] INFO Merged PRs:
2024-04-18 00:33:54,571 [ scc.merge] INFO - PR 199 joshmoore 'user: allow setting default group'
2024-04-18 00:33:54,571 [ scc.merge] INFO - PR 207 manics 'BlitzGateway.connect raise on error'
2024-04-18 00:33:54,571 [ scc.merge] INFO - PR 266 joshmoore 'errors: use raise_error from cli plugins'
2024-04-18 00:33:54,571 [ scc.merge] INFO - PR 299 joshmoore 'Add parents and children to omero obj'
2024-04-18 00:33:54,571 [ scc.merge] INFO - PR 332 jburel 'Build conda'
2024-04-18 00:33:54,571 [ scc.merge] INFO - PR 337 will-moore 'bulk.yml depth is passed to xargs'
2024-04-18 00:33:54,571 [ scc.merge] INFO - PR 391 joshmoore 'Add jstack command'
2024-04-18 00:33:54,571 [ scc.merge] INFO - PR 398 will-moore 'getGridSize() handles plates with no Wells'
2024-04-18 00:33:54,571 [ scc.merge] INFO - PR 400 jburel 'Session ID and constructor'
2024-04-18 00:33:54,571 [ scc.merge] INFO - PR 403 sbesson 'Consume pre-build Ice Python wheel packages on Windows builds'
2024-04-18 00:33:54,571 [ scc.merge] INFO - PR 405 will-moore 'FilesetWrapper lazy loads Images and UsedFiles'
2024-04-18 00:33:54,571 [ scc.merge] INFO
2024-04-18 00:33:54,571 [ scc.merge] INFO Repository: ome/omero-scripts
2024-04-18 00:33:54,571 [ scc.merge] INFO Excluded PRs:
2024-04-18 00:33:54,571 [ scc.merge] INFO - PR 216 Tom-TBT 'Key-value pair scripts enhancement' (user: Tom-TBT)
2024-04-18 00:33:54,571 [ scc.merge] INFO - PR 206 Rdornier 'Adding a script that saves data owner as key-value pair' (user: Rdornier)
2024-04-18 00:33:54,571 [ scc.merge] INFO - PR 198 JulianHn 'Adding Support for different CSV Encodings in Import_Scripts/Populate_Metadata.py' (user: JulianHn)
2024-04-18 00:33:54,571 [ scc.merge] INFO - PR 103 joshmoore 'Script for calculating min/max' (exclude comment)
2024-04-18 00:33:54,571 [ scc.merge] INFO Already up to date.
2024-04-18 00:33:54,571 [ scc.merge] INFO
2024-04-18 00:33:54,571 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-18 00:33:54,571 [ scc.merge] INFO - PR 202 will-moore 'Add Plate support to KeyVal_to_csv.py'
2024-04-18 00:33:54,571 [ scc.merge] INFO
2024-04-18 00:33:54,571 [ scc.merge] INFO Repository: ome/omero-web
2024-04-18 00:33:54,571 [ scc.merge] INFO Excluded PRs:
2024-04-18 00:33:54,571 [ scc.merge] INFO - PR 549 knabar 'Remove webgateway cache' (status: failure)
2024-04-18 00:33:54,571 [ scc.merge] INFO - PR 548 will-moore 'imgData JSON with no stateful services' (stage: draft)
2024-04-18 00:33:54,571 [ scc.merge] INFO - PR 535 will-moore 'Initial working browser history' (stage: draft)
2024-04-18 00:33:54,571 [ scc.merge] INFO - PR 399 will-moore 'Handle chgrp dry-run LogicalChannel[ID] to show images' (stage: draft)
2024-04-18 00:33:54,572 [ scc.merge] INFO - PR 225 will-moore 'Query string ids' (exclude comment)
2024-04-18 00:33:54,572 [ scc.merge] INFO - PR 17 will-moore 'Right panel performance fixes' (exclude comment)
2024-04-18 00:33:54,572 [ scc.merge] INFO Already up to date.
2024-04-18 00:33:54,572 [ scc.merge] INFO
2024-04-18 00:33:54,572 [ scc.merge] INFO Merged PRs:
2024-04-18 00:33:54,572 [ scc.merge] INFO - PR 527 will-moore 'Add some initial CSP settings to test'
2024-04-18 00:33:54,572 [ scc.merge] INFO - PR 533 jburel 'use conda-forge channel'
2024-04-18 00:33:54,572 [ scc.merge] INFO - PR 534 will-moore 'get strings from omero.cmd.ERR and omero.CmdError correctly'
2024-04-18 00:33:54,572 [ scc.merge] INFO - PR 536 will-moore 'imgData JSON with no stateful services'
2024-04-18 00:33:54,572 [ scc.merge] INFO - PR 540 will-moore 'Add 'django.template.context_processors.request' to TEMPLATES'
2024-04-18 00:33:54,572 [ scc.merge] INFO - PR 542 Tom-TBT 'PlateAcquisition filtering with plate display'
2024-04-18 00:33:54,572 [ scc.merge] INFO - PR 543 knabar 'Block UI for some long running tasks'
2024-04-18 00:33:54,572 [ scc.merge] INFO
2024-04-18 00:33:54,572 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-18 00:33:54,572 [ scc.merge] INFO - PR 168 stick 'Changes to nginx @maintenance handler'
2024-04-18 00:33:54,572 [ scc.merge] INFO
2024-04-18 00:33:54,572 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-18 00:33:54,572 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:33:54,577 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-dropbox
2024-04-18 00:33:54,577 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:33:54,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-18 00:33:54,582 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-marshal
2024-04-18 00:33:54,582 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:33:54,586 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-18 00:33:54,586 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-py
2024-04-18 00:33:54,586 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:33:54,590 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-18 00:33:54,591 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-scripts
2024-04-18 00:33:54,591 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:33:54,595 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
2024-04-18 00:33:54,595 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push/omero-web
2024-04-18 00:33:54,595 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:33:54,599 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-python-superbuild-push
Update component versions
Downloading https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-build/lastSuccessfulBuild/artifact/omero-blitz/build/distributions/omero-blitz-5.5.5-python.zip ...
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 150, in <module>
download_blitz_target()
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 83, in download_blitz_target
resp = urlopen(loc)
File "/usr/lib64/python3.9/urllib/request.py", line 214, in urlopen
return opener.open(url, data, timeout)
File "/usr/lib64/python3.9/urllib/request.py", line 523, in open
response = meth(req, response)
File "/usr/lib64/python3.9/urllib/request.py", line 632, in http_response
response = self.parent.error(
File "/usr/lib64/python3.9/urllib/request.py", line 561, in error
return self._call_chain(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 494, in _call_chain
result = func(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 641, in http_error_default
raise HTTPError(req.full_url, code, msg, hdrs, fp)
urllib.error.HTTPError: HTTP Error 404: Not Found
Downloading https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-build/lastSuccessfulBuild/artifact/omero-blitz/build/distributions/omero-blitz-5.5.5-python.zip ...
Traceback (most recent call last):
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 150, in <module>
download_blitz_target()
File "/home/omero/workspace/OMERO-python-superbuild-push/omero-py/setup.py", line 83, in download_blitz_target
resp = urlopen(loc)
File "/usr/lib64/python3.9/urllib/request.py", line 214, in urlopen
return opener.open(url, data, timeout)
File "/usr/lib64/python3.9/urllib/request.py", line 523, in open
response = meth(req, response)
File "/usr/lib64/python3.9/urllib/request.py", line 632, in http_response
response = self.parent.error(
File "/usr/lib64/python3.9/urllib/request.py", line 561, in error
return self._call_chain(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 494, in _call_chain
result = func(*args)
File "/usr/lib64/python3.9/urllib/request.py", line 641, in http_error_default
raise HTTPError(req.full_url, code, msg, hdrs, fp)
urllib.error.HTTPError: HTTP Error 404: Not Found
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
grep: build.gradle: No such file or directory
Up-to-date:
Up-to-date:
Commit all component version changes
Entering 'omero-dropbox'
Entering 'omero-marshal'
Entering 'omero-py'
Entering 'omero-scripts'
Entering 'omero-web'
Entering 'omero-dropbox'
HEAD detached from 5863350
nothing to commit, working tree clean
Entering 'omero-marshal'
HEAD detached from cca4c2f
nothing to commit, working tree clean
Entering 'omero-py'
HEAD detached from 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 02bd670ca
nothing to commit, working tree clean
HEAD detached from 2524209
nothing to commit, working tree clean
2024-04-18 00:34:24,310 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-python-superbuild/tree/merge_ci
![[Jenkins]](/jenkins/static/d0200910/images/svgs/logo.svg){kind=logo}
